Attachment #151625 for bug #216065

View | Details | Raw Unified | Return to bug 216065
Collapse All | Expand All

Lines 21-26 Link Here

(-)orig/wmcliphist-0.6/foodock/foodock.c (-8 / +25 lines)
21	* before calling foo_create_main_icon_window. Returned event box	21	* before calling foo_create_main_icon_window. Returned event box
22	* will be realized by foo_create_main_icon_window. You should to show	22	* will be realized by foo_create_main_icon_window. You should to show
23	* icon window as well as main window before gtk_main().	23	* icon window as well as main window before gtk_main().
		24	*
		25	* Call foo_set_wmhints() after both windows are shown (gtk_widget_show()).
24	*	26	*
25	* Input:	27	* Input:
26	* mw Pointer to main window	28	* mw Pointer to main window
Lines 34-53 Link Here
34	char *margv[]) {	36	char *margv[]) {
35		37
36	GtkWidget foobox; / This will become icon box */	38	GtkWidget foobox; / This will become icon box */
37	Window xmw;
38	XWMHints *wm_hints;
39
40	xmw = GDK_WINDOW_XWINDOW(mw->window);
41		39
42	foobox = gtk_event_box_new();	40	foobox = gtk_event_box_new();
43	gtk_widget_set_usize(foobox, s, s);	41	gtk_widget_set_usize(foobox, s, s);
44	gtk_container_add (GTK_CONTAINER (mw), foobox);	42	gtk_container_add (GTK_CONTAINER (mw), foobox);
45	gtk_widget_realize(foobox);	43	gtk_widget_realize(foobox);
46		44
		45	return foobox;
		46	}
		47
		48	/*
		49	* Set WMHints on the dockapp (icon) window. Needs to be called after
		50	* the main window is shown, due to changes in GTK+ 2.4.
		51	*
		52	* Input:
		53	* mw Pointer to main window
		54	* dw Pointer to icon (dockapp) window
		55	* margc, margv argc and argv of main program for XSetCommand
		56	*/
		57	void foo_set_wmhints(GtkWidget *mw,
		58	GtkWidget *dw,
		59	int margc,
		60	char *margv[]) {
		61	Window xmw;
		62	XWMHints *wm_hints;
		63
		64	xmw = GDK_WINDOW_XWINDOW(mw->window);
		65
47	/* Time for game with Xlib */	66	/* Time for game with Xlib */
48	wm_hints = XAllocWMHints();	67	wm_hints = XAllocWMHints();
49	wm_hints->window_group = xmw;	68	wm_hints->window_group = xmw;
50	wm_hints->icon_window = GDK_WINDOW_XWINDOW(foobox->window);	69	wm_hints->icon_window = GDK_WINDOW_XWINDOW(dw->window);
51	wm_hints->icon_x = 0;	70	wm_hints->icon_x = 0;
52	wm_hints->icon_y = 0;	71	wm_hints->icon_y = 0;
53	wm_hints->initial_state = WithdrawnState;	72	wm_hints->initial_state = WithdrawnState;
Lines 60-65 Link Here
60	XSetCommand(GDK_DISPLAY(), xmw, margv, margc);	79	XSetCommand(GDK_DISPLAY(), xmw, margv, margc);
61		80
62	XFree(wm_hints);	81	XFree(wm_hints);
63
64	return foobox;
65	}	82	}

Lines 15-20 Link Here

(-)orig/wmcliphist-0.6/foodock/foodock.h (+16 lines)
15	* before calling foo_create_main_icon_window. Returned event box	15	* before calling foo_create_main_icon_window. Returned event box
16	* will be realized by foo_create_main_icon_window. You should to show	16	* will be realized by foo_create_main_icon_window. You should to show
17	* icon window as well as main window before gtk_main().	17	* icon window as well as main window before gtk_main().
		18	*
		19	* Call foo_set_wmhints() after both windows are shown (gtk_widget_show()).
18	*	20	*
19	* Input:	21	* Input:
20	* mw Pointer to main window	22	* mw Pointer to main window
Lines 25-27 Link Here
25	unsigned int size,	27	unsigned int size,
26	int main_argc,	28	int main_argc,
27	char *main_argv[]);	29	char *main_argv[]);
		30
		31	/*
		32	* Set WMHints on the dockapp (icon) window. Needs to be called after
		33	* the main window is shown, due to changes in GTK+ 2.4.
		34	*
		35	* Input:
		36	* mw Pointer to main window
		37	* dw Pointer to icon (dockapp) window
		38	* margc, margv argc and argv of main program for XSetCommand
		39	*/
		40	void foo_set_wmhints(GtkWidget *mw,
		41	GtkWidget *dw,
		42	int margc,
		43	char *margv[]);

Lines 333-338 Link Here

(-)orig/wmcliphist-0.6/wmcliphist.c (+4 lines)
333	/* show icon */	333	/* show icon */
334	gtk_widget_show(dock_app);	334	gtk_widget_show(dock_app);
335	gtk_widget_show(main_window);	335	gtk_widget_show(main_window);
		336
		337	/* Set WMHints - after gtk_widget_show() due to changes in GTK+ 2.4 */
		338	foo_set_wmhints(main_window, dock_app, argc, argv);
		339
336	gdk_window_shape_combine_mask(main_window->window, icon_mask, 0, 0);	340	gdk_window_shape_combine_mask(main_window->window, icon_mask, 0, 0);
337	gdk_window_shape_combine_mask(dock_app->window, icon_mask, 0, 0);	341	gdk_window_shape_combine_mask(dock_app->window, icon_mask, 0, 0);
338		342

Return to bug 216065