tazweb rev 84
Place spaces between control statements and their parentheses (follow webkit coding style)
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Wed Apr 27 00:11:58 2011 +0200 (2011-04-27) |
| parents | 694a52b21b06 |
| children | b996219a1a5a |
| files | README src/main.c |
line diff
1.1 --- a/README Mon Apr 25 03:17:02 2011 +0200 1.2 +++ b/README Wed Apr 27 00:11:58 2011 +0200 1.3 @@ -60,6 +60,9 @@ 1.4 1.5 * Append a string 1.6 g_string_append(string, " - TazWeb"); 1.7 + 1.8 + * Editable webview 1.9 + webkit_web_view_set_editable (webview, TRUE); 1.10 1.11 1.12 ================================================================================
2.1 --- a/src/main.c Mon Apr 25 03:17:02 2011 +0200 2.2 +++ b/src/main.c Wed Apr 27 00:11:58 2011 +0200 2.3 @@ -4,7 +4,7 @@ 2.4 * as a contextual menu, but no menu bar or tabs. Commented line code 2.5 * starts with // and comments are between * * 2.6 * 2.7 - * Copyright(C) 2011 SliTaz GNU/Linux - BSD License 2.8 + * Copyright (C) 2011 SliTaz GNU/Linux - BSD License 2.9 * See AUTHORS and LICENSE for detailed information 2.10 * 2.11 */ 2.12 @@ -12,13 +12,13 @@ 2.13 #include <gtk/gtk.h> 2.14 #include <webkit/webkit.h> 2.15 2.16 -#define CONFIG g_strdup_printf("%s/.config/tazweb", g_get_home_dir()) 2.17 +#define CONFIG g_strdup_printf ("%s/.config/tazweb", g_get_home_dir ()) 2.18 #define START "file:///usr/share/webhome/index.html" 2.19 2.20 /* Needs AppleWebKit/531.2+ to handle all sites ? */ 2.21 -static gchar *useragent = "TazWeb (X11; SliTaz GNU/Linux; U; en_US)"; 2.22 +static gchar *useragent = "TazWeb (X11; SliTaz GNU/Linux; U; en_US)"; 2.23 2.24 -static GtkWidget* create_window(WebKitWebView** newwebview); 2.25 +static GtkWidget* create_window (WebKitWebView** newwebview); 2.26 static GtkWidget *mainwindow, *vbox, *browser, *toolbar; 2.27 static WebKitWebView *webview; 2.28 static WebKitWebFrame* frame; 2.29 @@ -27,375 +27,375 @@ 2.30 2.31 /* Create an icon */ 2.32 static GdkPixbuf* 2.33 -create_pixbuf(const gchar* image) 2.34 +create_pixbuf (const gchar* image) 2.35 { 2.36 GdkPixbuf *pixbuf; 2.37 - pixbuf = gdk_pixbuf_new_from_file(image, NULL); 2.38 + pixbuf = gdk_pixbuf_new_from_file (image, NULL); 2.39 return pixbuf; 2.40 } 2.41 2.42 /* Can be: http://hg.slitaz.org or hg.slitaz.org */ 2.43 static void 2.44 -check_requested_uri() 2.45 +check_requested_uri () 2.46 { 2.47 - uri = g_strrstr(uri, "://") ? g_strdup(uri) 2.48 - : g_strdup_printf("http://%s", uri); 2.49 + uri = g_strrstr (uri, "://") ? g_strdup (uri) 2.50 + : g_strdup_printf ("http://%s", uri); 2.51 } 2.52 2.53 /* Update title */ 2.54 static void 2.55 -update_title(GtkWindow* window, WebKitWebView* webview) 2.56 +update_title (GtkWindow* window, WebKitWebView* webview) 2.57 { 2.58 GString *string; 2.59 gdouble progress; 2.60 gchar *title; 2.61 2.62 - string = g_string_new(webkit_web_view_get_title(webview)); 2.63 - progress = webkit_web_view_get_progress(webview) * 100; 2.64 + string = g_string_new (webkit_web_view_get_title (webview)); 2.65 + progress = webkit_web_view_get_progress (webview) * 100; 2.66 if (progress < 100) 2.67 - g_string_append_printf(string, " [ %f%% ] ", progress); 2.68 + g_string_append_printf (string, " [ %f%% ] ", progress); 2.69 2.70 - title = g_string_free(string, FALSE); 2.71 - gtk_window_set_title(window, title); 2.72 - g_free(title); 2.73 + title = g_string_free (string, FALSE); 2.74 + gtk_window_set_title (window, title); 2.75 + g_free (title); 2.76 } 2.77 2.78 /* Get the page title */ 2.79 static void 2.80 -notify_title_cb(WebKitWebView* webview, GParamSpec* pspec, GtkWidget* window) 2.81 +notify_title_cb (WebKitWebView* webview, GParamSpec* pspec, GtkWidget* window) 2.82 { 2.83 - update_title(GTK_WINDOW(window), webview); 2.84 + update_title (GTK_WINDOW (window), webview); 2.85 } 2.86 2.87 /* Request progress in window title */ 2.88 static void 2.89 -notify_progress_cb(WebKitWebView* webview, GParamSpec* pspec, GtkWidget* window) 2.90 +notify_progress_cb (WebKitWebView* webview, GParamSpec* pspec, GtkWidget* window) 2.91 { 2.92 - update_title(GTK_WINDOW(window), webview); 2.93 + update_title (GTK_WINDOW (window), webview); 2.94 } 2.95 2.96 /* Notify loader and url entry */ 2.97 static void 2.98 -notify_load_status_cb(WebKitWebView* webview, GParamSpec* pspec, GtkWidget* urientry) 2.99 +notify_load_status_cb (WebKitWebView* webview, GParamSpec* pspec, GtkWidget* urientry) 2.100 { 2.101 - if (webkit_web_view_get_load_status(webview) == WEBKIT_LOAD_COMMITTED) { 2.102 - frame = webkit_web_view_get_main_frame(webview); 2.103 - uri = webkit_web_frame_get_uri(frame); 2.104 + if (webkit_web_view_get_load_status (webview) == WEBKIT_LOAD_COMMITTED) { 2.105 + frame = webkit_web_view_get_main_frame (webview); 2.106 + uri = webkit_web_frame_get_uri (frame); 2.107 if (uri) 2.108 - gtk_entry_set_text(GTK_ENTRY(urientry), uri); 2.109 + gtk_entry_set_text (GTK_ENTRY (urientry), uri); 2.110 } 2.111 } 2.112 2.113 /* Destroy the window */ 2.114 static void 2.115 -destroy_cb(GtkWidget* widget, GtkWindow* window) 2.116 +destroy_cb (GtkWidget* widget, GtkWindow* window) 2.117 { 2.118 - if (g_atomic_int_dec_and_test(&count)) 2.119 - gtk_main_quit(); 2.120 + if (g_atomic_int_dec_and_test (&count)) 2.121 + gtk_main_quit (); 2.122 } 2.123 2.124 /* Show page source */ 2.125 static void 2.126 -view_source_cb(GtkWidget* widget, WebKitWebView* webview) 2.127 +view_source_cb (GtkWidget* widget, WebKitWebView* webview) 2.128 { 2.129 gboolean source; 2.130 2.131 - frame = webkit_web_view_get_main_frame(webview); 2.132 - uri = webkit_web_frame_get_uri(frame); 2.133 - source = webkit_web_view_get_view_source_mode(webview); 2.134 + frame = webkit_web_view_get_main_frame (webview); 2.135 + uri = webkit_web_frame_get_uri (frame); 2.136 + source = webkit_web_view_get_view_source_mode (webview); 2.137 2.138 - webkit_web_view_set_view_source_mode(webview, !source); 2.139 - webkit_web_view_reload(webview); 2.140 + webkit_web_view_set_view_source_mode (webview, !source); 2.141 + webkit_web_view_reload (webview); 2.142 } 2.143 2.144 /* URL entry callback function */ 2.145 static void 2.146 -uri_entry_cb(GtkWidget* urientry, WebKitWebView* webview) 2.147 +uri_entry_cb (GtkWidget* urientry, WebKitWebView* webview) 2.148 { 2.149 - uri = gtk_entry_get_text(GTK_ENTRY(urientry)); 2.150 - g_assert(uri); 2.151 - check_requested_uri(); 2.152 - webkit_web_view_load_uri(webview, uri); 2.153 + uri = gtk_entry_get_text (GTK_ENTRY (urientry)); 2.154 + g_assert (uri); 2.155 + check_requested_uri (); 2.156 + webkit_web_view_load_uri (webview, uri); 2.157 } 2.158 2.159 /* Search entry callback function */ 2.160 static void 2.161 -search_entry_cb(GtkWidget* search, WebKitWebView* webview) 2.162 +search_entry_cb (GtkWidget* search, WebKitWebView* webview) 2.163 { 2.164 - uri = g_strdup_printf("http://www.google.com/search?q=%s", 2.165 - gtk_entry_get_text(GTK_ENTRY(search))); 2.166 - g_assert(uri); 2.167 - webkit_web_view_load_uri(webview, uri); 2.168 + uri = g_strdup_printf ("http://www.google.com/search?q=%s", 2.169 + gtk_entry_get_text (GTK_ENTRY (search))); 2.170 + g_assert (uri); 2.171 + webkit_web_view_load_uri (webview, uri); 2.172 } 2.173 2.174 /* Navigation button function */ 2.175 static void 2.176 -go_home_cb(GtkWidget* widget, WebKitWebView* webview) 2.177 +go_home_cb (GtkWidget* widget, WebKitWebView* webview) 2.178 { 2.179 - uri = g_strdup_printf("file://%s/home.html", CONFIG); 2.180 - g_assert(uri); 2.181 - webkit_web_view_load_uri(webview, uri); 2.182 + uri = g_strdup_printf ("file://%s/home.html", CONFIG); 2.183 + g_assert (uri); 2.184 + webkit_web_view_load_uri (webview, uri); 2.185 } 2.186 2.187 static void 2.188 -go_back_cb(GtkWidget* widget, WebKitWebView* webview) 2.189 +go_back_cb (GtkWidget* widget, WebKitWebView* webview) 2.190 { 2.191 - webkit_web_view_go_back(webview); 2.192 + webkit_web_view_go_back (webview); 2.193 } 2.194 2.195 static void 2.196 -go_forward_cb(GtkWidget* widget, WebKitWebView* webview) 2.197 +go_forward_cb (GtkWidget* widget, WebKitWebView* webview) 2.198 { 2.199 - webkit_web_view_go_forward(webview); 2.200 + webkit_web_view_go_forward (webview); 2.201 } 2.202 2.203 /* Fullscreen and unfullscreen callback function */ 2.204 static void 2.205 -fullscreen_cb(GtkWindow* window, gpointer data) 2.206 +fullscreen_cb (GtkWindow* window, gpointer data) 2.207 { 2.208 GdkWindowState state; 2.209 - state = gdk_window_get_state(gtk_widget_get_window(GTK_WIDGET(mainwindow))); 2.210 + state = gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (mainwindow))); 2.211 2.212 - if(state & GDK_WINDOW_STATE_FULLSCREEN) 2.213 - gtk_window_unfullscreen(GTK_WINDOW(mainwindow)); 2.214 + if (state & GDK_WINDOW_STATE_FULLSCREEN) 2.215 + gtk_window_unfullscreen (GTK_WINDOW (mainwindow)); 2.216 else 2.217 - gtk_window_fullscreen(GTK_WINDOW(mainwindow)); 2.218 + gtk_window_fullscreen (GTK_WINDOW (mainwindow)); 2.219 } 2.220 2.221 /* TazWeb doc callback function */ 2.222 static void 2.223 -tazweb_doc_cb(GtkWidget* widget, WebKitWebView *webview) 2.224 +tazweb_doc_cb (GtkWidget* widget, WebKitWebView *webview) 2.225 { 2.226 - uri = ("file:///usr/share/doc/tazweb/tazweb.html"); 2.227 - g_assert(uri); 2.228 - webkit_web_view_load_uri(webview, uri); 2.229 + uri = ("file:///usr/share/doc/tazweb/tazweb.html"); 2.230 + g_assert (uri); 2.231 + webkit_web_view_load_uri (webview, uri); 2.232 } 2.233 2.234 /* Download function */ 2.235 static gboolean 2.236 -download_requested_cb(WebKitWebView *webview, WebKitDownload *download, 2.237 +download_requested_cb (WebKitWebView *webview, WebKitDownload *download, 2.238 gpointer user_data) 2.239 { 2.240 - uri = webkit_download_get_uri(download); 2.241 + uri = webkit_download_get_uri (download); 2.242 const gchar* buffer; 2.243 - asprintf(&buffer, 2.244 + asprintf (&buffer, 2.245 "xterm -T 'Download' -geom 72x10+0-24 -e \ 2.246 'cd $HOME/Downloads && wget -c %s; sleep 2' &", uri); 2.247 - system(buffer); 2.248 + system (buffer); 2.249 } 2.250 2.251 /* Zoom out and in callback function */ 2.252 static void 2.253 -zoom_out_cb(GtkWidget *widget, WebKitWebView* webview) 2.254 +zoom_out_cb (GtkWidget *widget, WebKitWebView* webview) 2.255 { 2.256 - webkit_web_view_zoom_out(webview); 2.257 + webkit_web_view_zoom_out (webview); 2.258 } 2.259 2.260 static void 2.261 -zoom_in_cb(GtkWidget *widget, WebKitWebView* webview) 2.262 +zoom_in_cb (GtkWidget *widget, WebKitWebView* webview) 2.263 { 2.264 - webkit_web_view_zoom_in(webview); 2.265 + webkit_web_view_zoom_in (webview); 2.266 } 2.267 2.268 /* New webview clallbacks */ 2.269 static WebKitWebView* 2.270 -create_web_view_cb(WebKitWebView* webview, WebKitWebFrame* web_frame, 2.271 +create_web_view_cb (WebKitWebView* webview, WebKitWebFrame* web_frame, 2.272 GtkWidget* window) 2.273 { 2.274 WebKitWebView *newview; 2.275 - create_window(&newview); 2.276 + create_window (&newview); 2.277 return newview; 2.278 } 2.279 2.280 static gboolean 2.281 -webview_ready_cb(WebKitWebView* webview, GtkWidget* window) 2.282 +webview_ready_cb (WebKitWebView* webview, GtkWidget* window) 2.283 { 2.284 - gtk_widget_grab_focus(GTK_WIDGET(webview)); 2.285 - gtk_widget_show_all(window); 2.286 + gtk_widget_grab_focus (GTK_WIDGET (webview)); 2.287 + gtk_widget_show_all (window); 2.288 return FALSE; 2.289 } 2.290 2.291 static gboolean 2.292 -close_webview_cb(WebKitWebView* webview, GtkWidget* window) 2.293 +close_webview_cb (WebKitWebView* webview, GtkWidget* window) 2.294 { 2.295 - gtk_widget_destroy(window); 2.296 + gtk_widget_destroy (window); 2.297 return TRUE; 2.298 } 2.299 2.300 /* Add items to WebKit contextual menu */ 2.301 static void 2.302 -populate_menu_cb(WebKitWebView *webview, GtkMenu *menu, gpointer data) 2.303 +populate_menu_cb (WebKitWebView *webview, GtkMenu *menu, gpointer data) 2.304 { 2.305 GtkWidget* item; 2.306 2.307 /* Separator */ 2.308 - item = gtk_separator_menu_item_new(); 2.309 - gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); 2.310 + item = gtk_separator_menu_item_new (); 2.311 + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); 2.312 2.313 /* Zoom in */ 2.314 - item = gtk_image_menu_item_new_with_label("Zoom in"); 2.315 - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), 2.316 - gtk_image_new_from_stock(GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU)); 2.317 - gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); 2.318 - g_signal_connect(item, "activate", G_CALLBACK(zoom_in_cb), webview); 2.319 + item = gtk_image_menu_item_new_with_label ("Zoom in"); 2.320 + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), 2.321 + gtk_image_new_from_stock (GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU)); 2.322 + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); 2.323 + g_signal_connect (item, "activate", G_CALLBACK (zoom_in_cb), webview); 2.324 2.325 /* Zoom out */ 2.326 - item = gtk_image_menu_item_new_with_label("Zoom out"); 2.327 - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), 2.328 - gtk_image_new_from_stock(GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU)); 2.329 - gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); 2.330 - g_signal_connect(item, "activate", G_CALLBACK(zoom_out_cb), webview); 2.331 + item = gtk_image_menu_item_new_with_label ("Zoom out"); 2.332 + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), 2.333 + gtk_image_new_from_stock (GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU)); 2.334 + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); 2.335 + g_signal_connect (item, "activate", G_CALLBACK (zoom_out_cb), webview); 2.336 2.337 /* Separator */ 2.338 - item = gtk_separator_menu_item_new(); 2.339 - gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); 2.340 + item = gtk_separator_menu_item_new (); 2.341 + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); 2.342 2.343 /* TazWeb documentation */ 2.344 - item = gtk_image_menu_item_new_with_label("TazWeb manual"); 2.345 - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), 2.346 - gtk_image_new_from_stock(GTK_STOCK_INFO, GTK_ICON_SIZE_MENU)); 2.347 - gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); 2.348 - g_signal_connect(item, "activate", G_CALLBACK(tazweb_doc_cb), webview); 2.349 + item = gtk_image_menu_item_new_with_label ("TazWeb manual"); 2.350 + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), 2.351 + gtk_image_new_from_stock (GTK_STOCK_INFO, GTK_ICON_SIZE_MENU)); 2.352 + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); 2.353 + g_signal_connect (item, "activate", G_CALLBACK (tazweb_doc_cb), webview); 2.354 2.355 /* View source mode */ 2.356 - item = gtk_image_menu_item_new_with_label("View source mode"); 2.357 - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), 2.358 - gtk_image_new_from_stock(GTK_STOCK_PROPERTIES, GTK_ICON_SIZE_MENU)); 2.359 - gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); 2.360 - g_signal_connect(item, "activate", G_CALLBACK(view_source_cb), webview); 2.361 + item = gtk_image_menu_item_new_with_label ("View source mode"); 2.362 + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), 2.363 + gtk_image_new_from_stock (GTK_STOCK_PROPERTIES, GTK_ICON_SIZE_MENU)); 2.364 + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); 2.365 + g_signal_connect (item, "activate", G_CALLBACK (view_source_cb), webview); 2.366 2.367 - gtk_widget_show_all(GTK_WIDGET(menu)); 2.368 + gtk_widget_show_all (GTK_WIDGET (menu)); 2.369 } 2.370 2.371 /* Scrolled window for the webview */ 2.372 static GtkWidget* 2.373 -create_browser(GtkWidget* window, GtkWidget* urientry, GtkWidget* search, 2.374 +create_browser (GtkWidget* window, GtkWidget* urientry, GtkWidget* search, 2.375 WebKitWebView* webview) 2.376 { 2.377 WebKitWebSettings *settings; 2.378 2.379 - browser = gtk_scrolled_window_new(NULL, NULL); 2.380 - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(browser), 2.381 + browser = gtk_scrolled_window_new (NULL, NULL); 2.382 + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (browser), 2.383 GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); 2.384 2.385 - gtk_container_add(GTK_CONTAINER(browser), GTK_WIDGET(webview)); 2.386 + gtk_container_add (GTK_CONTAINER (browser), GTK_WIDGET (webview)); 2.387 2.388 /* User agent */ 2.389 - settings = webkit_web_view_get_settings (webview); 2.390 - g_object_set (G_OBJECT (settings), "user-agent", useragent, NULL); 2.391 + settings = webkit_web_view_get_settings (webview); 2.392 + g_object_set (G_OBJECT (settings), "user-agent", useragent, NULL); 2.393 2.394 /* Connect WebKit events */ 2.395 - g_signal_connect(webview, "notify::title", 2.396 - G_CALLBACK(notify_title_cb), window); 2.397 - g_signal_connect(webview, "notify::progress", 2.398 - G_CALLBACK(notify_progress_cb), window); 2.399 - g_signal_connect(webview, "notify::load-status", 2.400 - G_CALLBACK(notify_load_status_cb), urientry); 2.401 - g_signal_connect(webview, "download-requested", 2.402 - G_CALLBACK(download_requested_cb), NULL); 2.403 - g_signal_connect(webview, "create-web-view", 2.404 - G_CALLBACK(create_web_view_cb), window); 2.405 - g_signal_connect(webview, "web-view-ready", 2.406 - G_CALLBACK(webview_ready_cb), window); 2.407 - g_signal_connect(webview, "close-web-view", 2.408 - G_CALLBACK(close_webview_cb), window); 2.409 + g_signal_connect (webview, "notify::title", 2.410 + G_CALLBACK (notify_title_cb), window); 2.411 + g_signal_connect (webview, "notify::progress", 2.412 + G_CALLBACK (notify_progress_cb), window); 2.413 + g_signal_connect (webview, "notify::load-status", 2.414 + G_CALLBACK (notify_load_status_cb), urientry); 2.415 + g_signal_connect (webview, "download-requested", 2.416 + G_CALLBACK (download_requested_cb), NULL); 2.417 + g_signal_connect (webview, "create-web-view", 2.418 + G_CALLBACK (create_web_view_cb), window); 2.419 + g_signal_connect (webview, "web-view-ready", 2.420 + G_CALLBACK (webview_ready_cb), window); 2.421 + g_signal_connect (webview, "close-web-view", 2.422 + G_CALLBACK (close_webview_cb), window); 2.423 2.424 /* Connect WebKit contextual menu items */ 2.425 - g_object_connect(G_OBJECT(webview), "signal::populate-popup", 2.426 - G_CALLBACK(populate_menu_cb), webview, NULL); 2.427 + g_object_connect (G_OBJECT (webview), "signal::populate-popup", 2.428 + G_CALLBACK (populate_menu_cb), webview, NULL); 2.429 2.430 return browser; 2.431 } 2.432 2.433 static GtkWidget* 2.434 -create_toolbar(GtkWidget* urientry, GtkWidget* search, WebKitWebView* webview) 2.435 +create_toolbar (GtkWidget* urientry, GtkWidget* search, WebKitWebView* webview) 2.436 { 2.437 GtkToolItem* item; 2.438 2.439 - toolbar = gtk_toolbar_new(); 2.440 - gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), 2.441 + toolbar = gtk_toolbar_new (); 2.442 + gtk_toolbar_set_orientation (GTK_TOOLBAR (toolbar), 2.443 GTK_ORIENTATION_HORIZONTAL); 2.444 - gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), 2.445 + gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), 2.446 GTK_TOOLBAR_BOTH_HORIZ); 2.447 2.448 /* The back button */ 2.449 - item = gtk_tool_button_new_from_stock(GTK_STOCK_GO_BACK); 2.450 - g_signal_connect(G_OBJECT(item), "clicked", 2.451 - G_CALLBACK(go_back_cb), webview); 2.452 - gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); 2.453 + item = gtk_tool_button_new_from_stock (GTK_STOCK_GO_BACK); 2.454 + g_signal_connect (G_OBJECT (item), "clicked", 2.455 + G_CALLBACK (go_back_cb), webview); 2.456 + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); 2.457 2.458 /* The forward button */ 2.459 - item = gtk_tool_button_new_from_stock(GTK_STOCK_GO_FORWARD); 2.460 - g_signal_connect(G_OBJECT(item), "clicked", 2.461 - G_CALLBACK(go_forward_cb), webview); 2.462 - gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); 2.463 + item = gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD); 2.464 + g_signal_connect (G_OBJECT (item), "clicked", 2.465 + G_CALLBACK (go_forward_cb), webview); 2.466 + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); 2.467 2.468 /* Home button */ 2.469 - item = gtk_tool_button_new_from_stock(GTK_STOCK_HOME); 2.470 - g_signal_connect(G_OBJECT(item), "clicked", 2.471 - G_CALLBACK(go_home_cb), webview); 2.472 - gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); 2.473 + item = gtk_tool_button_new_from_stock (GTK_STOCK_HOME); 2.474 + g_signal_connect (G_OBJECT (item), "clicked", 2.475 + G_CALLBACK (go_home_cb), webview); 2.476 + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); 2.477 2.478 /* URL entry */ 2.479 - item = gtk_tool_item_new(); 2.480 - gtk_tool_item_set_expand(item, TRUE); 2.481 - gtk_widget_set_size_request(urientry, 0, 20); 2.482 - gtk_container_add(GTK_CONTAINER(item), urientry); 2.483 - g_signal_connect(G_OBJECT(urientry), "activate", 2.484 - G_CALLBACK(uri_entry_cb), webview); 2.485 - gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); 2.486 + item = gtk_tool_item_new (); 2.487 + gtk_tool_item_set_expand (item, TRUE); 2.488 + gtk_widget_set_size_request (urientry, 0, 20); 2.489 + gtk_container_add (GTK_CONTAINER (item), urientry); 2.490 + g_signal_connect (G_OBJECT (urientry), "activate", 2.491 + G_CALLBACK (uri_entry_cb), webview); 2.492 + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); 2.493 2.494 /* Separator */ 2.495 - item = gtk_separator_tool_item_new(); 2.496 - gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); 2.497 + item = gtk_separator_tool_item_new (); 2.498 + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); 2.499 2.500 /* Search entry */ 2.501 - item = gtk_tool_item_new(); 2.502 - gtk_widget_set_size_request(search, 150, 20); 2.503 - gtk_container_add(GTK_CONTAINER(item), search); 2.504 - g_signal_connect(G_OBJECT(search), "activate", 2.505 - G_CALLBACK(search_entry_cb), webview); 2.506 - gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); 2.507 + item = gtk_tool_item_new (); 2.508 + gtk_widget_set_size_request (search, 150, 20); 2.509 + gtk_container_add (GTK_CONTAINER (item), search); 2.510 + g_signal_connect (G_OBJECT (search), "activate", 2.511 + G_CALLBACK (search_entry_cb), webview); 2.512 + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); 2.513 2.514 /* The Fullscreen button */ 2.515 - item = gtk_tool_button_new_from_stock(GTK_STOCK_FULLSCREEN); 2.516 - g_signal_connect(G_OBJECT(item), "clicked", 2.517 - G_CALLBACK(fullscreen_cb), NULL); 2.518 - gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); 2.519 + item = gtk_tool_button_new_from_stock (GTK_STOCK_FULLSCREEN); 2.520 + g_signal_connect (G_OBJECT (item), "clicked", 2.521 + G_CALLBACK (fullscreen_cb), NULL); 2.522 + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); 2.523 2.524 return toolbar; 2.525 } 2.526 2.527 /* Main window */ 2.528 static GtkWidget* 2.529 -create_window(WebKitWebView** newwebview) 2.530 +create_window (WebKitWebView** newwebview) 2.531 { 2.532 GtkWidget* window; 2.533 GtkWidget *urientry; 2.534 GtkWidget *search; 2.535 2.536 - g_atomic_int_inc(&count); 2.537 + g_atomic_int_inc (&count); 2.538 2.539 /* Default TazWeb window */ 2.540 - window = gtk_window_new(GTK_WINDOW_TOPLEVEL); 2.541 - gtk_window_set_default_size(GTK_WINDOW(window), 800, 600); 2.542 - gtk_window_set_icon(GTK_WINDOW(window), 2.543 - create_pixbuf("/usr/share/pixmaps/tazweb.png")); 2.544 - gtk_widget_set_name(window, "TazWeb"); 2.545 - g_signal_connect(window, "destroy", G_CALLBACK(destroy_cb), NULL); 2.546 + window = gtk_window_new (GTK_WINDOW_TOPLEVEL); 2.547 + gtk_window_set_default_size (GTK_WINDOW (window), 800, 600); 2.548 + gtk_window_set_icon (GTK_WINDOW (window), 2.549 + create_pixbuf ("/usr/share/pixmaps/tazweb.png")); 2.550 + gtk_widget_set_name (window, "TazWeb"); 2.551 + g_signal_connect (window, "destroy", G_CALLBACK (destroy_cb), NULL); 2.552 2.553 /* Webview and widgets */ 2.554 - webview = WEBKIT_WEB_VIEW(webkit_web_view_new()); 2.555 - urientry = gtk_entry_new(); 2.556 - search = gtk_entry_new(); 2.557 - vbox = gtk_vbox_new(FALSE, 0); 2.558 + webview = WEBKIT_WEB_VIEW (webkit_web_view_new ()); 2.559 + urientry = gtk_entry_new (); 2.560 + search = gtk_entry_new (); 2.561 + vbox = gtk_vbox_new (FALSE, 0); 2.562 2.563 /* Pack box and container */ 2.564 - gtk_box_pack_start(GTK_BOX(vbox), 2.565 - create_browser(window, urientry, search, webview), TRUE, TRUE, 0); 2.566 - gtk_box_pack_start(GTK_BOX(vbox), 2.567 - create_toolbar(urientry, search, webview), FALSE, FALSE, 0); 2.568 - gtk_container_add(GTK_CONTAINER(window), vbox); 2.569 + gtk_box_pack_start (GTK_BOX (vbox), 2.570 + create_browser (window, urientry, search, webview), TRUE, TRUE, 0); 2.571 + gtk_box_pack_start (GTK_BOX (vbox), 2.572 + create_toolbar (urientry, search, webview), FALSE, FALSE, 0); 2.573 + gtk_container_add (GTK_CONTAINER (window), vbox); 2.574 2.575 if (newwebview) 2.576 *newwebview = webview; 2.577 @@ -404,27 +404,27 @@ 2.578 } 2.579 2.580 int 2.581 -main(int argc, char* argv[]) 2.582 +main (int argc, char* argv[]) 2.583 { 2.584 - gtk_init(NULL, NULL); 2.585 - if (!g_thread_supported()) 2.586 - g_thread_init(NULL); 2.587 + gtk_init (NULL, NULL); 2.588 + if (!g_thread_supported ()) 2.589 + g_thread_init (NULL); 2.590 2.591 /* Get a default home.html if missing */ 2.592 - if (! g_file_test(CONFIG, G_FILE_TEST_EXISTS)) 2.593 - system("cp -r /usr/share/tazweb $HOME/.config/tazweb"); 2.594 + if (! g_file_test (CONFIG, G_FILE_TEST_EXISTS)) 2.595 + system ("cp -r /usr/share/tazweb $HOME/.config/tazweb"); 2.596 2.597 /* Load the start page file or the url in argument */ 2.598 - uri =(char*)(argc > 1 ? argv[1] : START); 2.599 + uri = (char*) (argc > 1 ? argv[1] : START); 2.600 if (argv[1]) 2.601 - check_requested_uri(); 2.602 + check_requested_uri (); 2.603 2.604 - mainwindow = create_window(&webview); 2.605 + mainwindow = create_window (&webview); 2.606 2.607 - gtk_widget_show_all(mainwindow); 2.608 - webkit_web_view_load_uri(webview, uri); 2.609 - gtk_widget_grab_focus(GTK_WIDGET(webview)); 2.610 - gtk_main(); 2.611 + gtk_widget_show_all (mainwindow); 2.612 + webkit_web_view_load_uri (webview, uri); 2.613 + gtk_widget_grab_focus (GTK_WIDGET (webview)); 2.614 + gtk_main (); 2.615 2.616 return 0; 2.617 }