SliTaz Repositories

     1.1 --- a/src/tazweb.c	Tue Mar 14 04:48:34 2017 +0100
     1.2 +++ b/src/tazweb.c	Tue Mar 14 13:00:25 2017 +0100
     1.3 @@ -47,9 +47,6 @@
     1.4  static gint count		= 0;
     1.5  const gchar*			uri;
     1.6  
     1.7 -/* Turn on/off debug mode */
     1.8 -
     1.9 -
    1.10  /* Create an icon */
    1.11  static GdkPixbuf*
    1.12  create_pixbuf(const gchar* image)
    1.13 @@ -165,10 +162,10 @@
    1.14  	search_web(search, webview);
    1.15  }
    1.16  
    1.17 -/* 
    1.18 - * 
    1.19 +/*
    1.20 + *
    1.21   * Navigation functions
    1.22 - * 
    1.23 + *
    1.24   */
    1.25  
    1.26  static void
    1.27 @@ -223,7 +220,7 @@
    1.28  	const gchar* buffer;
    1.29  	uri = webkit_download_get_uri(download);
    1.30  	asprintf(&buffer, "xterm -T 'TazWeb Download' -geom 72x12+0-24 -e \
    1.31 -				'mkdir -p %s && wget -P %s -c %s; sleep 2' &", 
    1.32 +				'mkdir -p %s && wget -P %s -c %s; sleep 2' &",
    1.33  				DOWNLOADS, DOWNLOADS, uri);
    1.34  	system(buffer);
    1.35  }
    1.36 @@ -314,14 +311,14 @@
    1.37  	/* Separator */
    1.38  	item = gtk_separator_menu_item_new();
    1.39  	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
    1.40 -	
    1.41 +
    1.42  	/* Bookmark */
    1.43  	item = gtk_image_menu_item_new_with_label(_("Bookmarks"));
    1.44  	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
    1.45  	gtk_image_new_from_stock(GTK_STOCK_PROPERTIES, GTK_ICON_SIZE_MENU));
    1.46  	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
    1.47  	g_signal_connect(item, "activate", G_CALLBACK(go_bookmarks_cb), webview);
    1.48 -	
    1.49 +
    1.50  	if (! kiosk) {
    1.51  		/* Add a bookmark */
    1.52  		item = gtk_image_menu_item_new_with_label(_("Add a bookmark"));
    1.53 @@ -329,19 +326,19 @@
    1.54  		gtk_image_new_from_stock(GTK_STOCK_ADD, GTK_ICON_SIZE_MENU));
    1.55  		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
    1.56  		g_signal_connect(item, "activate", G_CALLBACK(add_bookmark_cb), webview);
    1.57 -		
    1.58 +
    1.59  		/* Edit bookmarks */
    1.60  		item = gtk_image_menu_item_new_with_label(_("Edit bookmarks"));
    1.61  		gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
    1.62  		gtk_image_new_from_stock(GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU));
    1.63  		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
    1.64  		g_signal_connect(item, "activate", G_CALLBACK(bookmarks_edit_cb), webview);
    1.65 -		
    1.66 +
    1.67  		/* Separator */
    1.68  		item = gtk_separator_menu_item_new();
    1.69  		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
    1.70  	}
    1.71 -	
    1.72 +
    1.73  	/* Printing */
    1.74  	item = gtk_image_menu_item_new_with_label(_("Print this page"));
    1.75  	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
    1.76 @@ -355,7 +352,7 @@
    1.77  	gtk_image_new_from_stock(GTK_STOCK_PROPERTIES, GTK_ICON_SIZE_MENU));
    1.78  	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
    1.79  	g_signal_connect(item, "activate", G_CALLBACK(view_source_cb), webview);
    1.80 -	
    1.81 +
    1.82  	/* Separator */
    1.83  	item = gtk_separator_menu_item_new();
    1.84  	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
    1.85 @@ -367,13 +364,13 @@
    1.86  		gtk_image_new_from_stock(GTK_STOCK_HELP, GTK_ICON_SIZE_MENU));
    1.87  		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
    1.88  		g_signal_connect(item, "activate", G_CALLBACK(cookies_view_cb), webview);
    1.89 -		
    1.90 +
    1.91  		item = gtk_image_menu_item_new_with_label(_("Clean all cookies"));
    1.92  		gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
    1.93  		gtk_image_new_from_stock(GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU));
    1.94  		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
    1.95  		g_signal_connect(item, "activate", G_CALLBACK(cookies_clean_cb), webview);
    1.96 -		
    1.97 +
    1.98  		/* Separator */
    1.99  		item = gtk_separator_menu_item_new();
   1.100  		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
   1.101 @@ -488,7 +485,7 @@
   1.102  			G_CALLBACK(search_icon_press_cb), webview);
   1.103  	g_signal_connect(G_OBJECT(search), "activate",
   1.104  			G_CALLBACK(search_entry_cb), webview);
   1.105 -	
   1.106 +
   1.107  	/* Home button */
   1.108  	item = gtk_tool_button_new_from_stock(GTK_STOCK_HOME);
   1.109  	g_signal_connect(G_OBJECT(item), "clicked",
   1.110 @@ -543,6 +540,7 @@
   1.111  	return window;
   1.112  }
   1.113  
   1.114 +/* Cmdline Help & usage */
   1.115  void
   1.116  help(void)
   1.117  {
   1.118 @@ -555,8 +553,9 @@
   1.119    -u  --useragent [ua]\n\
   1.120    -k  --kiosk\n\
   1.121    -r  --raw\n\
   1.122 -      --notoolbar\n\
   1.123 -      --nomenu\n\n");
   1.124 +  -s  --small\n\
   1.125 +	  --notoolbar\n\
   1.126 +	  --nomenu\n\n");
   1.127  	printf ("Bookmarks: %s\n\n", BOOKMARKS);
   1.128  	return;
   1.129  }
   1.130 @@ -566,27 +565,27 @@
   1.131  {
   1.132  	textdomain (GETTEXT_PACKAGE);
   1.133  	int c;
   1.134 -	
   1.135 +
   1.136  	/* Cmdline parsing with getopt_long to handle --option or -o */
   1.137  	while (1) {
   1.138  		static struct option long_options[] =
   1.139  		{
   1.140  			/* Set flag */
   1.141 -			{ "notoolbar",  no_argument,       &notoolbar, 1 },
   1.142 -			{ "nomenu",     no_argument,       &nomenu,    1 },
   1.143 -			//{ "width",      required_argument, &width,     'width' },
   1.144 +			{ "notoolbar",  no_argument,		&notoolbar, 1 },
   1.145 +			{ "nomenu",     no_argument,		&nomenu,    1 },
   1.146  			/* No flag */
   1.147 -			{ "help",       no_argument,       0, 'h' },
   1.148 -			{ "private",    no_argument,       0, 'p' },
   1.149 -			{ "useragent",  required_argument, 0, 'u' },
   1.150 -			{ "kiosk",      no_argument,       0, 'k' },
   1.151 -			{ "raw",        no_argument,       0, 'r' },
   1.152 +			{ "help",       no_argument,		0, 'h' },
   1.153 +			{ "private",    no_argument,		0, 'p' },
   1.154 +			{ "useragent",  required_argument,	0, 'u' },
   1.155 +			{ "kiosk",      no_argument,		0, 'k' },
   1.156 +			{ "raw",        no_argument,		0, 'r' },
   1.157 +			{ "small",		no_argument,		0, 's' },
   1.158  			{ 0, 0, 0, 0}
   1.159  		};
   1.160 -		
   1.161 +
   1.162  		int index = 0;
   1.163 -		c = getopt_long (argc, argv, "hpu:kr", long_options, &index);
   1.164 -		
   1.165 +		c = getopt_long (argc, argv, "hpu:krs", long_options, &index);
   1.166 +
   1.167  		/* Detect the end of the options */
   1.168  		if (c == -1)
   1.169  			break;
   1.170 @@ -601,43 +600,44 @@
   1.171  					printf ("\n");
   1.172  				}
   1.173  				break;
   1.174 -				
   1.175 +
   1.176  			case 'h':
   1.177  				help();
   1.178  				return 0;
   1.179 -				
   1.180 +
   1.181  			case 'p':
   1.182  				private++;
   1.183  				break;
   1.184 -				
   1.185 +
   1.186  			case 'u':
   1.187  				if (debug)
   1.188  					printf ("User agent option: %s\n", optarg);
   1.189  				useragent = optarg;
   1.190  				break;
   1.191 -				
   1.192 +
   1.193  			case 'k':
   1.194  				kiosk++;
   1.195  				break;
   1.196 -			
   1.197 +
   1.198  			case 'r':
   1.199  				notoolbar++;
   1.200  				nomenu++;
   1.201  				break;
   1.202 -			
   1.203 -			case 'w':
   1.204 -				//width = optarg;
   1.205 +
   1.206 +			case 's':
   1.207 +				width = 640;
   1.208 +				height = 480;
   1.209  				break;
   1.210 -				
   1.211 +
   1.212  			case '?':
   1.213  				help();
   1.214  				return 0;
   1.215  		}
   1.216  	}
   1.217 -		
   1.218 +
   1.219  	argc -= optind;
   1.220  	argv += optind;
   1.221 -	
   1.222 +
   1.223  
   1.224  	/* Initialize GTK */
   1.225  	gtk_init(NULL, NULL);
   1.226 @@ -656,14 +656,14 @@
   1.227  
   1.228  	tazweb_window = create_window(&webview);
   1.229  	gtk_widget_show_all(tazweb_window);
   1.230 -	
   1.231 +
   1.232  	/* Handle cookies */
   1.233  	if (! private) {
   1.234  		session = webkit_get_default_session();
   1.235  		snprintf(COOKIES, sizeof COOKIES, "%s", COOKIES);
   1.236  		cookies_setup();
   1.237  	}
   1.238 -	
   1.239 +
   1.240  	/* Fullscreen for Kiosk mode */
   1.241  	if (kiosk)
   1.242  		gtk_window_fullscreen(GTK_WINDOW(tazweb_window));