X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcwindowbase.C;h=a362095e3405c0084f0e170460465d1248076152;hb=5d8a7826b0f80f00622e46baf75453995a76e343;hp=e9047f29480f2ed73b916a1668cf1de15bdce598;hpb=033efab12586e8086014c814a5360f211d228ac3;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/guicast/bcwindowbase.C b/cinelerra-5.1/guicast/bcwindowbase.C
index e9047f29..a362095e 100644
--- a/cinelerra-5.1/guicast/bcwindowbase.C
+++ b/cinelerra-5.1/guicast/bcwindowbase.C
@@ -2437,6 +2437,8 @@ void BC_WindowBase::init_glyphs()
 //  Not a fix, but much better than nothing.
 	static int inited = 0;
 	if( inited ) return;
+	XGrabServer(display);
+	XSync(display, 0);
 	inited = 1;
 	int cur_font = current_font;
 // locale encodings, needed glyphs to be preloaded
@@ -2449,6 +2451,7 @@ void BC_WindowBase::init_glyphs()
 		draw_text(5,5, text, 0);
 	}
 	set_font(cur_font);
+	XUngrabServer(display);
 }
 
 void BC_WindowBase::init_im()
@@ -4294,6 +4297,26 @@ void BC_WindowBase::set_title(const char *text, int utf8)
 	flush();
 }
 
+// must be RGBA8888
+void BC_WindowBase::set_net_icon(VFrame *data)
+{
+	int width = data->get_w(), height = data->get_h();
+	int size = 2 + width * height;
+	unsigned long *icon_data = new unsigned long[size];
+	unsigned long *lp = icon_data;
+	*lp++ = width;  *lp++ = height;
+	uint8_t **rows = data->get_rows();
+	for( int y=0; y<height; ++y ) {
+		unsigned *up = (unsigned *)rows[y];
+		for( int x=0; x<width; ++x )
+			*lp++ = *(unsigned *)up++;
+	}
+	Atom NetWMIcon = XInternAtom(display, "_NET_WM_ICON", True);
+	XChangeProperty(top_level->display, top_level->win, NetWMIcon,
+                XA_CARDINAL, 32, PropModeReplace, (unsigned char *)icon_data, size);
+	delete [] icon_data;
+}
+
 const char *BC_WindowBase::get_title()
 {
 	return title;
@@ -4315,27 +4338,28 @@ int BC_WindowBase::set_icon(VFrame *data)
 	icon_pixmap = new BC_Pixmap(top_level, data, PIXMAP_ALPHA, 1);
 
 	if(icon_window) delete icon_window;
-	icon_window = new BC_Popup(this,
-		(int)BC_INFINITY,
-		(int)BC_INFINITY,
-		icon_pixmap->get_w(),
-		icon_pixmap->get_h(),
-		-1,
-		1, // All windows are hidden initially
+	icon_window = new BC_Popup(this, 0, 0,
+		icon_pixmap->get_w(), icon_pixmap->get_h(),
+		-1, 1, // All windows are hidden initially
 		icon_pixmap);
 
-	XWMHints wm_hints;
-	wm_hints.flags = WindowGroupHint | IconPixmapHint | IconMaskHint | IconWindowHint;
+	XWMHints wm_hints;  memset(&wm_hints, 0, sizeof(wm_hints));
+	wm_hints.flags = IconPixmapHint; // | IconMaskHint | IconWindowHint;
 	wm_hints.icon_pixmap = icon_pixmap->get_pixmap();
 	wm_hints.icon_mask = icon_pixmap->get_alpha();
 	wm_hints.icon_window = icon_window->win;
-	wm_hints.window_group = XGroupLeader;
+	if( XGroupLeader ) {
+		wm_hints.flags |= WindowGroupHint;
+		wm_hints.window_group = XGroupLeader;
+	}
 
 // for(int i = 0; i < 1000; i++)
 // printf("02x ", icon_pixmap->get_alpha()->get_row_pointers()[0][i]);
 // printf("\n");
 
 	XSetWMHints(top_level->display, top_level->win, &wm_hints);
+
+	set_net_icon(data);
 	XSync(top_level->display, 0);
 	return 0;
 }