1 | /*--------------------------------*-C-*---------------------------------* |
1 | /*----------------------------------------------------------------------* |
2 | * File: rxvttoolkit.C |
2 | * File: rxvttoolkit.C |
3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
4 | * |
4 | * |
5 | * All portions of code are copyright by their respective author/s. |
5 | * All portions of code are copyright by their respective author/s. |
6 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
6 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
7 | * |
7 | * |
8 | * This program is free software; you can redistribute it and/or modify |
8 | * This program is free software; you can redistribute it and/or modify |
9 | * it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
10 | * the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
11 | * (at your option) any later version. |
11 | * (at your option) any later version. |
… | |
… | |
345 | #if XLIB_ILLEGAL_ACCESS |
345 | #if XLIB_ILLEGAL_ACCESS |
346 | if (dpy->xdefaults) |
346 | if (dpy->xdefaults) |
347 | XFree (dpy->xdefaults); |
347 | XFree (dpy->xdefaults); |
348 | #endif |
348 | #endif |
349 | |
349 | |
350 | if (XGetWindowProperty (dpy, root, XA_RESOURCE_MANAGER, |
350 | if (XGetWindowProperty (dpy, RootWindow (dpy, 0), XA_RESOURCE_MANAGER, |
351 | 0L, 100000000L, False, |
351 | 0L, 100000000L, False, |
352 | XA_STRING, &actual_type, &actual_format, |
352 | XA_STRING, &actual_type, &actual_format, |
353 | &nitems, &nremaining, |
353 | &nitems, &nremaining, |
354 | (unsigned char **)&val) == Success |
354 | (unsigned char **)&val) == Success |
355 | && actual_type == XA_STRING |
355 | && actual_type == XA_STRING |
… | |
… | |
833 | } |
833 | } |
834 | |
834 | |
835 | void |
835 | void |
836 | rxvt_color::free (rxvt_screen *screen) |
836 | rxvt_color::free (rxvt_screen *screen) |
837 | { |
837 | { |
|
|
838 | if (screen->visual->c_class == TrueColor) |
|
|
839 | return; // nothing to do |
|
|
840 | |
838 | #if XFT |
841 | #if XFT |
839 | XftColorFree (screen->dpy, screen->visual, screen->cmap, &c); |
842 | XftColorFree (screen->dpy, screen->visual, screen->cmap, &c); |
840 | #else |
843 | #else |
841 | XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes); |
844 | XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes); |
842 | #endif |
845 | #endif |