diff options
| author | Joakim Verona | 2013-04-06 00:41:37 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-04-06 00:41:37 +0200 |
| commit | c1a5b51f2bb636d87d2315a68a074da113d82177 (patch) | |
| tree | d61158eab59df986a691a24d37829c5f1602d7f3 /src | |
| parent | 9639da1e26683b6a54d255bb07a24dd6e0fae354 (diff) | |
| download | emacs-c1a5b51f2bb636d87d2315a68a074da113d82177.tar.gz emacs-c1a5b51f2bb636d87d2315a68a074da113d82177.zip | |
some cleanups
Diffstat (limited to 'src')
| -rw-r--r-- | src/xwidget.c | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/src/xwidget.c b/src/xwidget.c index c6714ad40a5..8a88a596163 100644 --- a/src/xwidget.c +++ b/src/xwidget.c | |||
| @@ -238,11 +238,6 @@ DEFUN ("make-xwidget", Fmake_xwidget, Smake_xwidget, 7, 7, 0, | |||
| 238 | xw->widget_osr = xwgir_create( SDATA(Fcar(Fcdr(Fget(xw->type, Qcxwgir_class)))), | 238 | xw->widget_osr = xwgir_create( SDATA(Fcar(Fcdr(Fget(xw->type, Qcxwgir_class)))), |
| 239 | SDATA(Fcar(Fget(xw->type, Qcxwgir_class)))); | 239 | SDATA(Fcar(Fget(xw->type, Qcxwgir_class)))); |
| 240 | 240 | ||
| 241 | ///debug xwgir | ||
| 242 | /* gdk_offscreen_window_set_embedder ( gtk_widget_get_window (xw->widget_osr), */ | ||
| 243 | /* gtk_widget_get_window (GTK_WIDGET (xw->widgetwindow_osr)) */ | ||
| 244 | /* ); */ | ||
| 245 | /// | ||
| 246 | gtk_widget_set_size_request (GTK_WIDGET (xw->widget_osr), xw->width, xw->height); | 241 | gtk_widget_set_size_request (GTK_WIDGET (xw->widget_osr), xw->width, xw->height); |
| 247 | gtk_container_add (xw->widgetwindow_osr, xw->widget_osr); | 242 | gtk_container_add (xw->widgetwindow_osr, xw->widget_osr); |
| 248 | 243 | ||
| @@ -254,9 +249,6 @@ DEFUN ("make-xwidget", Fmake_xwidget, Smake_xwidget, 7, 7, 0, | |||
| 254 | /* signals */ | 249 | /* signals */ |
| 255 | g_signal_connect (G_OBJECT ( xw->widgetwindow_osr), "damage-event", G_CALLBACK (xwidget_osr_damage_event_callback), NULL); | 250 | g_signal_connect (G_OBJECT ( xw->widgetwindow_osr), "damage-event", G_CALLBACK (xwidget_osr_damage_event_callback), NULL); |
| 256 | 251 | ||
| 257 | //TODO these were just a test hack | ||
| 258 | /* g_signal_connect (G_OBJECT ( xw->widget_osr), "key-press-event", G_CALLBACK (webkit_osr_key_event_callback), NULL); */ | ||
| 259 | /* g_signal_connect (G_OBJECT ( xw->widget_osr), "key-release-event", G_CALLBACK (webkit_osr_key_event_callback), NULL); */ | ||
| 260 | 252 | ||
| 261 | if (EQ(xw->type, Qwebkit_osr)){ | 253 | if (EQ(xw->type, Qwebkit_osr)){ |
| 262 | g_signal_connect (G_OBJECT ( xw->widget_osr), | 254 | g_signal_connect (G_OBJECT ( xw->widget_osr), |
| @@ -303,56 +295,6 @@ DEFUN ("make-xwidget", Fmake_xwidget, Smake_xwidget, 7, 7, 0, | |||
| 303 | } | 295 | } |
| 304 | #endif | 296 | #endif |
| 305 | 297 | ||
| 306 | /* if (EQ(xw->type, Qsocket_osr)){ */ | ||
| 307 | /* printf("init socket osr\n"); */ | ||
| 308 | /* block_input(); */ | ||
| 309 | /* xw->widgetwindow_osr = GTK_CONTAINER (gtk_offscreen_window_new ()); */ | ||
| 310 | /* gtk_window_resize( GTK_WINDOW(xw->widgetwindow_osr), xw->width, xw->height); */ | ||
| 311 | |||
| 312 | /* //////////////////// */ | ||
| 313 | /* //xw->widget_osr = webkit_web_view_new(); */ | ||
| 314 | /* xw->widget_osr = gtk_socket_new(); */ | ||
| 315 | /* //g_signal_connect_after(xv->widget, "plug-added", G_CALLBACK(xwidget_plug_added), "plug added"); */ | ||
| 316 | /* //g_signal_connect_after(xv->widget, "plug-removed", G_CALLBACK(xwidget_plug_removed), "plug removed"); */ | ||
| 317 | /* /////////////////// */ | ||
| 318 | |||
| 319 | /* gtk_widget_set_size_request (GTK_WIDGET (xw->widget_osr), xw->width, xw->height); */ | ||
| 320 | /* gtk_container_add (xw->widgetwindow_osr, xw->widget_osr); */ | ||
| 321 | |||
| 322 | /* gtk_widget_show_all (GTK_WIDGET (xw->widgetwindow_osr)); */ | ||
| 323 | |||
| 324 | /* /\* store some xwidget data in the gtk widgets for convenient retrieval in the event handlers. *\/ */ | ||
| 325 | /* g_object_set_data (G_OBJECT (xw->widget_osr), XG_XWIDGET, (gpointer) (xw)); */ | ||
| 326 | /* g_object_set_data (G_OBJECT (xw->widgetwindow_osr), XG_XWIDGET, (gpointer) (xw)); */ | ||
| 327 | /* g_signal_connect (G_OBJECT ( xw->widgetwindow_osr), "damage-event", G_CALLBACK (xwidget_osr_damage_event_callback), NULL); */ | ||
| 328 | |||
| 329 | /* //webkit_web_view_load_uri(WEBKIT_WEB_VIEW(xw->widget_osr), "http://www.fsf.org"); */ | ||
| 330 | /* unblock_input(); */ | ||
| 331 | |||
| 332 | /* } */ | ||
| 333 | |||
| 334 | |||
| 335 | /* ////////////////////////////// */ | ||
| 336 | /* gtk_widget_set_size_request (GTK_WIDGET (xw->widget_osr), xw->width, xw->height); */ | ||
| 337 | /* gtk_container_add (xw->widgetwindow_osr, xw->widget_osr); */ | ||
| 338 | |||
| 339 | /* gtk_widget_show_all (GTK_WIDGET (xw->widgetwindow_osr)); */ | ||
| 340 | |||
| 341 | /* /\* store some xwidget data in the gtk widgets for convenient retrieval in the event handlers. *\/ */ | ||
| 342 | /* g_object_set_data (G_OBJECT (xw->widget_osr), XG_XWIDGET, (gpointer) (xw)); */ | ||
| 343 | /* g_object_set_data (G_OBJECT (xw->widgetwindow_osr), XG_XWIDGET, (gpointer) (xw)); */ | ||
| 344 | /* /\* signals *\/ */ | ||
| 345 | /* g_signal_connect (G_OBJECT ( xw->widgetwindow_osr), "damage-event", G_CALLBACK (xwidget_osr_damage_event_callback), NULL); */ | ||
| 346 | /* g_signal_connect (G_OBJECT ( xw->widget_osr), "button-press-event", G_CALLBACK (xwgir_event_callback), xw); */ | ||
| 347 | |||
| 348 | |||
| 349 | /* unblock_input(); */ | ||
| 350 | /* } */ | ||
| 351 | |||
| 352 | //////////////////////////////////////////////////////// | ||
| 353 | |||
| 354 | |||
| 355 | |||
| 356 | UNGCPRO; | 298 | UNGCPRO; |
| 357 | return val; | 299 | return val; |
| 358 | } | 300 | } |