ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvttoolkit.C
(Generate patch)

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.137 by root, Thu Jun 7 16:04:31 2012 UTC vs.
Revision 1.142 by root, Thu May 22 18:54:33 2014 UTC

6 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de> 6 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2011 Emanuele Giaquinta <e.giaquinta@glauco.it> 7 * Copyright (c) 2011 Emanuele Giaquinta <e.giaquinta@glauco.it>
8 * 8 *
9 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 3 of the License, or
12 * (at your option) any later version. 12 * (at your option) any later version.
13 * 13 *
14 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
66#endif 66#endif
67#if USE_XIM 67#if USE_XIM
68 "WM_LOCALE_NAME", 68 "WM_LOCALE_NAME",
69 "XIM_SERVERS", 69 "XIM_SERVERS",
70#endif 70#endif
71#if ENABLE_TRANSPARENCY 71#if HAVE_IMG || ENABLE_PERL
72 "_XROOTPMAP_ID", 72 "_XROOTPMAP_ID",
73 "ESETROOT_PMAP_ID", 73 "ESETROOT_PMAP_ID",
74#endif 74#endif
75#if ENABLE_XEMBED 75#if ENABLE_XEMBED
76 "_XEMBED", 76 "_XEMBED",
490 490
491 flags = 0; 491 flags = 0;
492#if XRENDER 492#if XRENDER
493 int major, minor; 493 int major, minor;
494 if (XRenderQueryVersion (dpy, &major, &minor)) 494 if (XRenderQueryVersion (dpy, &major, &minor))
495 {
496 flags |= DISPLAY_HAS_RENDER;
497
498 if (major > 0 || (major == 0 && minor >= 10)) 495 if (major > 0 || (major == 0 && minor >= 10))
496 {
499 flags |= DISPLAY_HAS_RENDER_10; 497 flags |= DISPLAY_HAS_RENDER;
500 498
499#if 0
501 if (major > 0 || (major == 0 && minor >= 11)) 500 if (major > 0 || (major == 0 && minor >= 11))
502 flags |= DISPLAY_HAS_RENDER_MUL; 501 flags |= DISPLAY_HAS_RENDER_MUL;
502#endif
503 503
504 XFilters *filters = XRenderQueryFilters (dpy, root); 504 if (XFilters *filters = XRenderQueryFilters (dpy, root))
505 if (filters)
506 { 505 {
507 for (int i = 0; i < filters->nfilter; i++) 506 for (int i = 0; i < filters->nfilter; i++)
508 if (!strcmp (filters->filter[i], FilterConvolution)) 507 if (!strcmp (filters->filter [i], FilterConvolution))
509 flags |= DISPLAY_HAS_RENDER_CONV; 508 flags |= DISPLAY_HAS_RENDER_CONV;
510 509
511 XFree (filters); 510 XFree (filters);
512 } 511 }
513 } 512 }
514#endif 513#endif
515 514
516 int fd = XConnectionNumber (dpy); 515 int fd = XConnectionNumber (dpy);
517 516
518 // try to detect whether we have a local connection. 517 // try to detect whether we have a local connection.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines