nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improve the colormap setting code

Browse source
This commit is contained in:
Dana Jansens 2007-05-27 22:38:48 +00:00
parent 35889c2854
commit a59540f25a
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
openbox/screen.c
View file

@ -1026,17 +1026,16 @@ void screen_show_desktop(gboolean show, ObClient *show_only)
void screen_install_colormap(ObClient *client, gboolean install) void screen_install_colormap(ObClient *client, gboolean install)
{ {
if (client == NULL) { if (client == NULL || client->colormap == None) {
if (install) if (install)
XInstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst)); XInstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst));
else else
XUninstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst)); XUninstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst));
} else { } else {
xerror_set_ignore(TRUE); xerror_set_ignore(TRUE);
if (install) { if (install)
if (client->colormap != None)
XInstallColormap(RrDisplay(ob_rr_inst), client->colormap); XInstallColormap(RrDisplay(ob_rr_inst), client->colormap);
} else else
XUninstallColormap(RrDisplay(ob_rr_inst), client->colormap); XUninstallColormap(RrDisplay(ob_rr_inst), client->colormap);
xerror_set_ignore(FALSE); xerror_set_ignore(FALSE);
} }