tazweb rev 85
Do NOT place spaces between control statements and their parentheses (follow webkit coding style)
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Wed Apr 27 00:14:00 2011 +0200 (2011-04-27) |
| parents | c32ca77dcded |
| children | bf2ff0574080 |
| files | src/main.c |
line diff
1.1 --- a/src/main.c Wed Apr 27 00:11:58 2011 +0200 1.2 +++ b/src/main.c Wed Apr 27 00:14:00 2011 +0200 1.3 @@ -4,7 +4,7 @@ 1.4 * as a contextual menu, but no menu bar or tabs. Commented line code 1.5 * starts with // and comments are between * * 1.6 * 1.7 - * Copyright (C) 2011 SliTaz GNU/Linux - BSD License 1.8 + * Copyright(C) 2011 SliTaz GNU/Linux - BSD License 1.9 * See AUTHORS and LICENSE for detailed information 1.10 * 1.11 */ 1.12 @@ -12,13 +12,13 @@ 1.13 #include <gtk/gtk.h> 1.14 #include <webkit/webkit.h> 1.15 1.16 -#define CONFIG g_strdup_printf ("%s/.config/tazweb", g_get_home_dir ()) 1.17 +#define CONFIG g_strdup_printf("%s/.config/tazweb", g_get_home_dir()) 1.18 #define START "file:///usr/share/webhome/index.html" 1.19 1.20 /* Needs AppleWebKit/531.2+ to handle all sites ? */ 1.21 -static gchar *useragent = "TazWeb (X11; SliTaz GNU/Linux; U; en_US)"; 1.22 +static gchar *useragent = "TazWeb (X11; SliTaz GNU/Linux; U; en_US)"; 1.23 1.24 -static GtkWidget* create_window (WebKitWebView** newwebview); 1.25 +static GtkWidget* create_window(WebKitWebView** newwebview); 1.26 static GtkWidget *mainwindow, *vbox, *browser, *toolbar; 1.27 static WebKitWebView *webview; 1.28 static WebKitWebFrame* frame; 1.29 @@ -27,375 +27,375 @@ 1.30 1.31 /* Create an icon */ 1.32 static GdkPixbuf* 1.33 -create_pixbuf (const gchar* image) 1.34 +create_pixbuf(const gchar* image) 1.35 { 1.36 GdkPixbuf *pixbuf; 1.37 - pixbuf = gdk_pixbuf_new_from_file (image, NULL); 1.38 + pixbuf = gdk_pixbuf_new_from_file(image, NULL); 1.39 return pixbuf; 1.40 } 1.41 1.42 /* Can be: http://hg.slitaz.org or hg.slitaz.org */ 1.43 static void 1.44 -check_requested_uri () 1.45 +check_requested_uri() 1.46 { 1.47 - uri = g_strrstr (uri, "://") ? g_strdup (uri) 1.48 - : g_strdup_printf ("http://%s", uri); 1.49 + uri = g_strrstr(uri, "://") ? g_strdup(uri) 1.50 + : g_strdup_printf("http://%s", uri); 1.51 } 1.52 1.53 /* Update title */ 1.54 static void 1.55 -update_title (GtkWindow* window, WebKitWebView* webview) 1.56 +update_title(GtkWindow* window, WebKitWebView* webview) 1.57 { 1.58 GString *string; 1.59 gdouble progress; 1.60 gchar *title; 1.61 1.62 - string = g_string_new (webkit_web_view_get_title (webview)); 1.63 - progress = webkit_web_view_get_progress (webview) * 100; 1.64 + string = g_string_new(webkit_web_view_get_title(webview)); 1.65 + progress = webkit_web_view_get_progress(webview) * 100; 1.66 if (progress < 100) 1.67 - g_string_append_printf (string, " [ %f%% ] ", progress); 1.68 + g_string_append_printf(string, " [ %f%% ] ", progress); 1.69 1.70 - title = g_string_free (string, FALSE); 1.71 - gtk_window_set_title (window, title); 1.72 - g_free (title); 1.73 + title = g_string_free(string, FALSE); 1.74 + gtk_window_set_title(window, title); 1.75 + g_free(title); 1.76 } 1.77 1.78 /* Get the page title */ 1.79 static void 1.80 -notify_title_cb (WebKitWebView* webview, GParamSpec* pspec, GtkWidget* window) 1.81 +notify_title_cb(WebKitWebView* webview, GParamSpec* pspec, GtkWidget* window) 1.82 { 1.83 - update_title (GTK_WINDOW (window), webview); 1.84 + update_title(GTK_WINDOW(window), webview); 1.85 } 1.86 1.87 /* Request progress in window title */ 1.88 static void 1.89 -notify_progress_cb (WebKitWebView* webview, GParamSpec* pspec, GtkWidget* window) 1.90 +notify_progress_cb(WebKitWebView* webview, GParamSpec* pspec, GtkWidget* window) 1.91 { 1.92 - update_title (GTK_WINDOW (window), webview); 1.93 + update_title(GTK_WINDOW(window), webview); 1.94 } 1.95 1.96 /* Notify loader and url entry */ 1.97 static void 1.98 -notify_load_status_cb (WebKitWebView* webview, GParamSpec* pspec, GtkWidget* urientry) 1.99 +notify_load_status_cb(WebKitWebView* webview, GParamSpec* pspec, GtkWidget* urientry) 1.100 { 1.101 - if (webkit_web_view_get_load_status (webview) == WEBKIT_LOAD_COMMITTED) { 1.102 - frame = webkit_web_view_get_main_frame (webview); 1.103 - uri = webkit_web_frame_get_uri (frame); 1.104 + if (webkit_web_view_get_load_status(webview) == WEBKIT_LOAD_COMMITTED) { 1.105 + frame = webkit_web_view_get_main_frame(webview); 1.106 + uri = webkit_web_frame_get_uri(frame); 1.107 if (uri) 1.108 - gtk_entry_set_text (GTK_ENTRY (urientry), uri); 1.109 + gtk_entry_set_text(GTK_ENTRY(urientry), uri); 1.110 } 1.111 } 1.112 1.113 /* Destroy the window */ 1.114 static void 1.115 -destroy_cb (GtkWidget* widget, GtkWindow* window) 1.116 +destroy_cb(GtkWidget* widget, GtkWindow* window) 1.117 { 1.118 - if (g_atomic_int_dec_and_test (&count)) 1.119 - gtk_main_quit (); 1.120 + if (g_atomic_int_dec_and_test(&count)) 1.121 + gtk_main_quit(); 1.122 } 1.123 1.124 /* Show page source */ 1.125 static void 1.126 -view_source_cb (GtkWidget* widget, WebKitWebView* webview) 1.127 +view_source_cb(GtkWidget* widget, WebKitWebView* webview) 1.128 { 1.129 gboolean source; 1.130 1.131 - frame = webkit_web_view_get_main_frame (webview); 1.132 - uri = webkit_web_frame_get_uri (frame); 1.133 - source = webkit_web_view_get_view_source_mode (webview); 1.134 + frame = webkit_web_view_get_main_frame(webview); 1.135 + uri = webkit_web_frame_get_uri(frame); 1.136 + source = webkit_web_view_get_view_source_mode(webview); 1.137 1.138 - webkit_web_view_set_view_source_mode (webview, !source); 1.139 - webkit_web_view_reload (webview); 1.140 + webkit_web_view_set_view_source_mode(webview, !source); 1.141 + webkit_web_view_reload(webview); 1.142 } 1.143 1.144 /* URL entry callback function */ 1.145 static void 1.146 -uri_entry_cb (GtkWidget* urientry, WebKitWebView* webview) 1.147 +uri_entry_cb(GtkWidget* urientry, WebKitWebView* webview) 1.148 { 1.149 - uri = gtk_entry_get_text (GTK_ENTRY (urientry)); 1.150 - g_assert (uri); 1.151 - check_requested_uri (); 1.152 - webkit_web_view_load_uri (webview, uri); 1.153 + uri = gtk_entry_get_text(GTK_ENTRY(urientry)); 1.154 + g_assert(uri); 1.155 + check_requested_uri(); 1.156 + webkit_web_view_load_uri(webview, uri); 1.157 } 1.158 1.159 /* Search entry callback function */ 1.160 static void 1.161 -search_entry_cb (GtkWidget* search, WebKitWebView* webview) 1.162 +search_entry_cb(GtkWidget* search, WebKitWebView* webview) 1.163 { 1.164 - uri = g_strdup_printf ("http://www.google.com/search?q=%s", 1.165 - gtk_entry_get_text (GTK_ENTRY (search))); 1.166 - g_assert (uri); 1.167 - webkit_web_view_load_uri (webview, uri); 1.168 + uri = g_strdup_printf("http://www.google.com/search?q=%s", 1.169 + gtk_entry_get_text(GTK_ENTRY(search))); 1.170 + g_assert(uri); 1.171 + webkit_web_view_load_uri(webview, uri); 1.172 } 1.173 1.174 /* Navigation button function */ 1.175 static void 1.176 -go_home_cb (GtkWidget* widget, WebKitWebView* webview) 1.177 +go_home_cb(GtkWidget* widget, WebKitWebView* webview) 1.178 { 1.179 - uri = g_strdup_printf ("file://%s/home.html", CONFIG); 1.180 - g_assert (uri); 1.181 - webkit_web_view_load_uri (webview, uri); 1.182 + uri = g_strdup_printf("file://%s/home.html", CONFIG); 1.183 + g_assert(uri); 1.184 + webkit_web_view_load_uri(webview, uri); 1.185 } 1.186 1.187 static void 1.188 -go_back_cb (GtkWidget* widget, WebKitWebView* webview) 1.189 +go_back_cb(GtkWidget* widget, WebKitWebView* webview) 1.190 { 1.191 - webkit_web_view_go_back (webview); 1.192 + webkit_web_view_go_back(webview); 1.193 } 1.194 1.195 static void 1.196 -go_forward_cb (GtkWidget* widget, WebKitWebView* webview) 1.197 +go_forward_cb(GtkWidget* widget, WebKitWebView* webview) 1.198 { 1.199 - webkit_web_view_go_forward (webview); 1.200 + webkit_web_view_go_forward(webview); 1.201 } 1.202 1.203 /* Fullscreen and unfullscreen callback function */ 1.204 static void 1.205 -fullscreen_cb (GtkWindow* window, gpointer data) 1.206 +fullscreen_cb(GtkWindow* window, gpointer data) 1.207 { 1.208 GdkWindowState state; 1.209 - state = gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (mainwindow))); 1.210 + state = gdk_window_get_state(gtk_widget_get_window(GTK_WIDGET(mainwindow))); 1.211 1.212 - if (state & GDK_WINDOW_STATE_FULLSCREEN) 1.213 - gtk_window_unfullscreen (GTK_WINDOW (mainwindow)); 1.214 + if(state & GDK_WINDOW_STATE_FULLSCREEN) 1.215 + gtk_window_unfullscreen(GTK_WINDOW(mainwindow)); 1.216 else 1.217 - gtk_window_fullscreen (GTK_WINDOW (mainwindow)); 1.218 + gtk_window_fullscreen(GTK_WINDOW(mainwindow)); 1.219 } 1.220 1.221 /* TazWeb doc callback function */ 1.222 static void 1.223 -tazweb_doc_cb (GtkWidget* widget, WebKitWebView *webview) 1.224 +tazweb_doc_cb(GtkWidget* widget, WebKitWebView *webview) 1.225 { 1.226 - uri = ("file:///usr/share/doc/tazweb/tazweb.html"); 1.227 - g_assert (uri); 1.228 - webkit_web_view_load_uri (webview, uri); 1.229 + uri = ("file:///usr/share/doc/tazweb/tazweb.html"); 1.230 + g_assert(uri); 1.231 + webkit_web_view_load_uri(webview, uri); 1.232 } 1.233 1.234 /* Download function */ 1.235 static gboolean 1.236 -download_requested_cb (WebKitWebView *webview, WebKitDownload *download, 1.237 +download_requested_cb(WebKitWebView *webview, WebKitDownload *download, 1.238 gpointer user_data) 1.239 { 1.240 - uri = webkit_download_get_uri (download); 1.241 + uri = webkit_download_get_uri(download); 1.242 const gchar* buffer; 1.243 - asprintf (&buffer, 1.244 + asprintf(&buffer, 1.245 "xterm -T 'Download' -geom 72x10+0-24 -e \ 1.246 'cd $HOME/Downloads && wget -c %s; sleep 2' &", uri); 1.247 - system (buffer); 1.248 + system(buffer); 1.249 } 1.250 1.251 /* Zoom out and in callback function */ 1.252 static void 1.253 -zoom_out_cb (GtkWidget *widget, WebKitWebView* webview) 1.254 +zoom_out_cb(GtkWidget *widget, WebKitWebView* webview) 1.255 { 1.256 - webkit_web_view_zoom_out (webview); 1.257 + webkit_web_view_zoom_out(webview); 1.258 } 1.259 1.260 static void 1.261 -zoom_in_cb (GtkWidget *widget, WebKitWebView* webview) 1.262 +zoom_in_cb(GtkWidget *widget, WebKitWebView* webview) 1.263 { 1.264 - webkit_web_view_zoom_in (webview); 1.265 + webkit_web_view_zoom_in(webview); 1.266 } 1.267 1.268 /* New webview clallbacks */ 1.269 static WebKitWebView* 1.270 -create_web_view_cb (WebKitWebView* webview, WebKitWebFrame* web_frame, 1.271 +create_web_view_cb(WebKitWebView* webview, WebKitWebFrame* web_frame, 1.272 GtkWidget* window) 1.273 { 1.274 WebKitWebView *newview; 1.275 - create_window (&newview); 1.276 + create_window(&newview); 1.277 return newview; 1.278 } 1.279 1.280 static gboolean 1.281 -webview_ready_cb (WebKitWebView* webview, GtkWidget* window) 1.282 +webview_ready_cb(WebKitWebView* webview, GtkWidget* window) 1.283 { 1.284 - gtk_widget_grab_focus (GTK_WIDGET (webview)); 1.285 - gtk_widget_show_all (window); 1.286 + gtk_widget_grab_focus(GTK_WIDGET(webview)); 1.287 + gtk_widget_show_all(window); 1.288 return FALSE; 1.289 } 1.290 1.291 static gboolean 1.292 -close_webview_cb (WebKitWebView* webview, GtkWidget* window) 1.293 +close_webview_cb(WebKitWebView* webview, GtkWidget* window) 1.294 { 1.295 - gtk_widget_destroy (window); 1.296 + gtk_widget_destroy(window); 1.297 return TRUE; 1.298 } 1.299 1.300 /* Add items to WebKit contextual menu */ 1.301 static void 1.302 -populate_menu_cb (WebKitWebView *webview, GtkMenu *menu, gpointer data) 1.303 +populate_menu_cb(WebKitWebView *webview, GtkMenu *menu, gpointer data) 1.304 { 1.305 GtkWidget* item; 1.306 1.307 /* Separator */ 1.308 - item = gtk_separator_menu_item_new (); 1.309 - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); 1.310 + item = gtk_separator_menu_item_new(); 1.311 + gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); 1.312 1.313 /* Zoom in */ 1.314 - item = gtk_image_menu_item_new_with_label ("Zoom in"); 1.315 - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), 1.316 - gtk_image_new_from_stock (GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU)); 1.317 - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); 1.318 - g_signal_connect (item, "activate", G_CALLBACK (zoom_in_cb), webview); 1.319 + item = gtk_image_menu_item_new_with_label("Zoom in"); 1.320 + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), 1.321 + gtk_image_new_from_stock(GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU)); 1.322 + gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); 1.323 + g_signal_connect(item, "activate", G_CALLBACK(zoom_in_cb), webview); 1.324 1.325 /* Zoom out */ 1.326 - item = gtk_image_menu_item_new_with_label ("Zoom out"); 1.327 - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), 1.328 - gtk_image_new_from_stock (GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU)); 1.329 - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); 1.330 - g_signal_connect (item, "activate", G_CALLBACK (zoom_out_cb), webview); 1.331 + item = gtk_image_menu_item_new_with_label("Zoom out"); 1.332 + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), 1.333 + gtk_image_new_from_stock(GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU)); 1.334 + gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); 1.335 + g_signal_connect(item, "activate", G_CALLBACK(zoom_out_cb), webview); 1.336 1.337 /* Separator */ 1.338 - item = gtk_separator_menu_item_new (); 1.339 - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); 1.340 + item = gtk_separator_menu_item_new(); 1.341 + gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); 1.342 1.343 /* TazWeb documentation */ 1.344 - item = gtk_image_menu_item_new_with_label ("TazWeb manual"); 1.345 - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), 1.346 - gtk_image_new_from_stock (GTK_STOCK_INFO, GTK_ICON_SIZE_MENU)); 1.347 - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); 1.348 - g_signal_connect (item, "activate", G_CALLBACK (tazweb_doc_cb), webview); 1.349 + item = gtk_image_menu_item_new_with_label("TazWeb manual"); 1.350 + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), 1.351 + gtk_image_new_from_stock(GTK_STOCK_INFO, GTK_ICON_SIZE_MENU)); 1.352 + gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); 1.353 + g_signal_connect(item, "activate", G_CALLBACK(tazweb_doc_cb), webview); 1.354 1.355 /* View source mode */ 1.356 - item = gtk_image_menu_item_new_with_label ("View source mode"); 1.357 - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), 1.358 - gtk_image_new_from_stock (GTK_STOCK_PROPERTIES, GTK_ICON_SIZE_MENU)); 1.359 - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); 1.360 - g_signal_connect (item, "activate", G_CALLBACK (view_source_cb), webview); 1.361 + item = gtk_image_menu_item_new_with_label("View source mode"); 1.362 + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), 1.363 + gtk_image_new_from_stock(GTK_STOCK_PROPERTIES, GTK_ICON_SIZE_MENU)); 1.364 + gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); 1.365 + g_signal_connect(item, "activate", G_CALLBACK(view_source_cb), webview); 1.366 1.367 - gtk_widget_show_all (GTK_WIDGET (menu)); 1.368 + gtk_widget_show_all(GTK_WIDGET(menu)); 1.369 } 1.370 1.371 /* Scrolled window for the webview */ 1.372 static GtkWidget* 1.373 -create_browser (GtkWidget* window, GtkWidget* urientry, GtkWidget* search, 1.374 +create_browser(GtkWidget* window, GtkWidget* urientry, GtkWidget* search, 1.375 WebKitWebView* webview) 1.376 { 1.377 WebKitWebSettings *settings; 1.378 1.379 - browser = gtk_scrolled_window_new (NULL, NULL); 1.380 - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (browser), 1.381 + browser = gtk_scrolled_window_new(NULL, NULL); 1.382 + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(browser), 1.383 GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); 1.384 1.385 - gtk_container_add (GTK_CONTAINER (browser), GTK_WIDGET (webview)); 1.386 + gtk_container_add(GTK_CONTAINER(browser), GTK_WIDGET(webview)); 1.387 1.388 /* User agent */ 1.389 - settings = webkit_web_view_get_settings (webview); 1.390 - g_object_set (G_OBJECT (settings), "user-agent", useragent, NULL); 1.391 + settings = webkit_web_view_get_settings (webview); 1.392 + g_object_set (G_OBJECT (settings), "user-agent", useragent, NULL); 1.393 1.394 /* Connect WebKit events */ 1.395 - g_signal_connect (webview, "notify::title", 1.396 - G_CALLBACK (notify_title_cb), window); 1.397 - g_signal_connect (webview, "notify::progress", 1.398 - G_CALLBACK (notify_progress_cb), window); 1.399 - g_signal_connect (webview, "notify::load-status", 1.400 - G_CALLBACK (notify_load_status_cb), urientry); 1.401 - g_signal_connect (webview, "download-requested", 1.402 - G_CALLBACK (download_requested_cb), NULL); 1.403 - g_signal_connect (webview, "create-web-view", 1.404 - G_CALLBACK (create_web_view_cb), window); 1.405 - g_signal_connect (webview, "web-view-ready", 1.406 - G_CALLBACK (webview_ready_cb), window); 1.407 - g_signal_connect (webview, "close-web-view", 1.408 - G_CALLBACK (close_webview_cb), window); 1.409 + g_signal_connect(webview, "notify::title", 1.410 + G_CALLBACK(notify_title_cb), window); 1.411 + g_signal_connect(webview, "notify::progress", 1.412 + G_CALLBACK(notify_progress_cb), window); 1.413 + g_signal_connect(webview, "notify::load-status", 1.414 + G_CALLBACK(notify_load_status_cb), urientry); 1.415 + g_signal_connect(webview, "download-requested", 1.416 + G_CALLBACK(download_requested_cb), NULL); 1.417 + g_signal_connect(webview, "create-web-view", 1.418 + G_CALLBACK(create_web_view_cb), window); 1.419 + g_signal_connect(webview, "web-view-ready", 1.420 + G_CALLBACK(webview_ready_cb), window); 1.421 + g_signal_connect(webview, "close-web-view", 1.422 + G_CALLBACK(close_webview_cb), window); 1.423 1.424 /* Connect WebKit contextual menu items */ 1.425 - g_object_connect (G_OBJECT (webview), "signal::populate-popup", 1.426 - G_CALLBACK (populate_menu_cb), webview, NULL); 1.427 + g_object_connect(G_OBJECT(webview), "signal::populate-popup", 1.428 + G_CALLBACK(populate_menu_cb), webview, NULL); 1.429 1.430 return browser; 1.431 } 1.432 1.433 static GtkWidget* 1.434 -create_toolbar (GtkWidget* urientry, GtkWidget* search, WebKitWebView* webview) 1.435 +create_toolbar(GtkWidget* urientry, GtkWidget* search, WebKitWebView* webview) 1.436 { 1.437 GtkToolItem* item; 1.438 1.439 - toolbar = gtk_toolbar_new (); 1.440 - gtk_toolbar_set_orientation (GTK_TOOLBAR (toolbar), 1.441 + toolbar = gtk_toolbar_new(); 1.442 + gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), 1.443 GTK_ORIENTATION_HORIZONTAL); 1.444 - gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), 1.445 + gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), 1.446 GTK_TOOLBAR_BOTH_HORIZ); 1.447 1.448 /* The back button */ 1.449 - item = gtk_tool_button_new_from_stock (GTK_STOCK_GO_BACK); 1.450 - g_signal_connect (G_OBJECT (item), "clicked", 1.451 - G_CALLBACK (go_back_cb), webview); 1.452 - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); 1.453 + item = gtk_tool_button_new_from_stock(GTK_STOCK_GO_BACK); 1.454 + g_signal_connect(G_OBJECT(item), "clicked", 1.455 + G_CALLBACK(go_back_cb), webview); 1.456 + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); 1.457 1.458 /* The forward button */ 1.459 - item = gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD); 1.460 - g_signal_connect (G_OBJECT (item), "clicked", 1.461 - G_CALLBACK (go_forward_cb), webview); 1.462 - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); 1.463 + item = gtk_tool_button_new_from_stock(GTK_STOCK_GO_FORWARD); 1.464 + g_signal_connect(G_OBJECT(item), "clicked", 1.465 + G_CALLBACK(go_forward_cb), webview); 1.466 + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); 1.467 1.468 /* Home button */ 1.469 - item = gtk_tool_button_new_from_stock (GTK_STOCK_HOME); 1.470 - g_signal_connect (G_OBJECT (item), "clicked", 1.471 - G_CALLBACK (go_home_cb), webview); 1.472 - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); 1.473 + item = gtk_tool_button_new_from_stock(GTK_STOCK_HOME); 1.474 + g_signal_connect(G_OBJECT(item), "clicked", 1.475 + G_CALLBACK(go_home_cb), webview); 1.476 + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); 1.477 1.478 /* URL entry */ 1.479 - item = gtk_tool_item_new (); 1.480 - gtk_tool_item_set_expand (item, TRUE); 1.481 - gtk_widget_set_size_request (urientry, 0, 20); 1.482 - gtk_container_add (GTK_CONTAINER (item), urientry); 1.483 - g_signal_connect (G_OBJECT (urientry), "activate", 1.484 - G_CALLBACK (uri_entry_cb), webview); 1.485 - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); 1.486 + item = gtk_tool_item_new(); 1.487 + gtk_tool_item_set_expand(item, TRUE); 1.488 + gtk_widget_set_size_request(urientry, 0, 20); 1.489 + gtk_container_add(GTK_CONTAINER(item), urientry); 1.490 + g_signal_connect(G_OBJECT(urientry), "activate", 1.491 + G_CALLBACK(uri_entry_cb), webview); 1.492 + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); 1.493 1.494 /* Separator */ 1.495 - item = gtk_separator_tool_item_new (); 1.496 - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); 1.497 + item = gtk_separator_tool_item_new(); 1.498 + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); 1.499 1.500 /* Search entry */ 1.501 - item = gtk_tool_item_new (); 1.502 - gtk_widget_set_size_request (search, 150, 20); 1.503 - gtk_container_add (GTK_CONTAINER (item), search); 1.504 - g_signal_connect (G_OBJECT (search), "activate", 1.505 - G_CALLBACK (search_entry_cb), webview); 1.506 - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); 1.507 + item = gtk_tool_item_new(); 1.508 + gtk_widget_set_size_request(search, 150, 20); 1.509 + gtk_container_add(GTK_CONTAINER(item), search); 1.510 + g_signal_connect(G_OBJECT(search), "activate", 1.511 + G_CALLBACK(search_entry_cb), webview); 1.512 + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); 1.513 1.514 /* The Fullscreen button */ 1.515 - item = gtk_tool_button_new_from_stock (GTK_STOCK_FULLSCREEN); 1.516 - g_signal_connect (G_OBJECT (item), "clicked", 1.517 - G_CALLBACK (fullscreen_cb), NULL); 1.518 - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); 1.519 + item = gtk_tool_button_new_from_stock(GTK_STOCK_FULLSCREEN); 1.520 + g_signal_connect(G_OBJECT(item), "clicked", 1.521 + G_CALLBACK(fullscreen_cb), NULL); 1.522 + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); 1.523 1.524 return toolbar; 1.525 } 1.526 1.527 /* Main window */ 1.528 static GtkWidget* 1.529 -create_window (WebKitWebView** newwebview) 1.530 +create_window(WebKitWebView** newwebview) 1.531 { 1.532 GtkWidget* window; 1.533 GtkWidget *urientry; 1.534 GtkWidget *search; 1.535 1.536 - g_atomic_int_inc (&count); 1.537 + g_atomic_int_inc(&count); 1.538 1.539 /* Default TazWeb window */ 1.540 - window = gtk_window_new (GTK_WINDOW_TOPLEVEL); 1.541 - gtk_window_set_default_size (GTK_WINDOW (window), 800, 600); 1.542 - gtk_window_set_icon (GTK_WINDOW (window), 1.543 - create_pixbuf ("/usr/share/pixmaps/tazweb.png")); 1.544 - gtk_widget_set_name (window, "TazWeb"); 1.545 - g_signal_connect (window, "destroy", G_CALLBACK (destroy_cb), NULL); 1.546 + window = gtk_window_new(GTK_WINDOW_TOPLEVEL); 1.547 + gtk_window_set_default_size(GTK_WINDOW(window), 800, 600); 1.548 + gtk_window_set_icon(GTK_WINDOW(window), 1.549 + create_pixbuf("/usr/share/pixmaps/tazweb.png")); 1.550 + gtk_widget_set_name(window, "TazWeb"); 1.551 + g_signal_connect(window, "destroy", G_CALLBACK(destroy_cb), NULL); 1.552 1.553 /* Webview and widgets */ 1.554 - webview = WEBKIT_WEB_VIEW (webkit_web_view_new ()); 1.555 - urientry = gtk_entry_new (); 1.556 - search = gtk_entry_new (); 1.557 - vbox = gtk_vbox_new (FALSE, 0); 1.558 + webview = WEBKIT_WEB_VIEW(webkit_web_view_new()); 1.559 + urientry = gtk_entry_new(); 1.560 + search = gtk_entry_new(); 1.561 + vbox = gtk_vbox_new(FALSE, 0); 1.562 1.563 /* Pack box and container */ 1.564 - gtk_box_pack_start (GTK_BOX (vbox), 1.565 - create_browser (window, urientry, search, webview), TRUE, TRUE, 0); 1.566 - gtk_box_pack_start (GTK_BOX (vbox), 1.567 - create_toolbar (urientry, search, webview), FALSE, FALSE, 0); 1.568 - gtk_container_add (GTK_CONTAINER (window), vbox); 1.569 + gtk_box_pack_start(GTK_BOX(vbox), 1.570 + create_browser(window, urientry, search, webview), TRUE, TRUE, 0); 1.571 + gtk_box_pack_start(GTK_BOX(vbox), 1.572 + create_toolbar(urientry, search, webview), FALSE, FALSE, 0); 1.573 + gtk_container_add(GTK_CONTAINER(window), vbox); 1.574 1.575 if (newwebview) 1.576 *newwebview = webview; 1.577 @@ -404,27 +404,27 @@ 1.578 } 1.579 1.580 int 1.581 -main (int argc, char* argv[]) 1.582 +main(int argc, char* argv[]) 1.583 { 1.584 - gtk_init (NULL, NULL); 1.585 - if (!g_thread_supported ()) 1.586 - g_thread_init (NULL); 1.587 + gtk_init(NULL, NULL); 1.588 + if (!g_thread_supported()) 1.589 + g_thread_init(NULL); 1.590 1.591 /* Get a default home.html if missing */ 1.592 - if (! g_file_test (CONFIG, G_FILE_TEST_EXISTS)) 1.593 - system ("cp -r /usr/share/tazweb $HOME/.config/tazweb"); 1.594 + if (! g_file_test(CONFIG, G_FILE_TEST_EXISTS)) 1.595 + system("cp -r /usr/share/tazweb $HOME/.config/tazweb"); 1.596 1.597 /* Load the start page file or the url in argument */ 1.598 - uri = (char*) (argc > 1 ? argv[1] : START); 1.599 + uri =(char*)(argc > 1 ? argv[1] : START); 1.600 if (argv[1]) 1.601 - check_requested_uri (); 1.602 + check_requested_uri(); 1.603 1.604 - mainwindow = create_window (&webview); 1.605 + mainwindow = create_window(&webview); 1.606 1.607 - gtk_widget_show_all (mainwindow); 1.608 - webkit_web_view_load_uri (webview, uri); 1.609 - gtk_widget_grab_focus (GTK_WIDGET (webview)); 1.610 - gtk_main (); 1.611 + gtk_widget_show_all(mainwindow); 1.612 + webkit_web_view_load_uri(webview, uri); 1.613 + gtk_widget_grab_focus(GTK_WIDGET(webview)); 1.614 + gtk_main(); 1.615 1.616 return 0; 1.617 }