… | |
… | |
11 | * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> |
11 | * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> |
12 | * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> |
12 | * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> |
13 | * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> |
13 | * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> |
14 | * - extensive modifications |
14 | * - extensive modifications |
15 | * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de> |
15 | * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de> |
|
|
16 | * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it> |
16 | * |
17 | * |
17 | * This program is free software; you can redistribute it and/or modify |
18 | * This program is free software; you can redistribute it and/or modify |
18 | * it under the terms of the GNU General Public License as published by |
19 | * it under the terms of the GNU General Public License as published by |
19 | * the Free Software Foundation; either version 3 of the License, or |
20 | * the Free Software Foundation; either version 3 of the License, or |
20 | * (at your option) any later version. |
21 | * (at your option) any later version. |
… | |
… | |
41 | #include <limits> |
42 | #include <limits> |
42 | |
43 | |
43 | #include <signal.h> |
44 | #include <signal.h> |
44 | |
45 | |
45 | #include <fcntl.h> |
46 | #include <fcntl.h> |
|
|
47 | |
|
|
48 | #ifdef HAVE_XMU |
|
|
49 | # include <X11/Xmu/CurUtil.h> |
|
|
50 | #endif |
46 | |
51 | |
47 | #ifdef HAVE_XSETLOCALE |
52 | #ifdef HAVE_XSETLOCALE |
48 | # define X_LOCALE |
53 | # define X_LOCALE |
49 | # include <X11/Xlocale.h> |
54 | # include <X11/Xlocale.h> |
50 | #else |
55 | #else |
… | |
… | |
1207 | } |
1212 | } |
1208 | |
1213 | |
1209 | void |
1214 | void |
1210 | rxvt_term::set_icon (const char *file) |
1215 | rxvt_term::set_icon (const char *file) |
1211 | { |
1216 | { |
1212 | #if HAVE_PIXBUF |
1217 | #if HAVE_PIXBUF && ENABLE_EWMH |
1213 | GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); |
1218 | GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); |
1214 | if (!pixbuf) |
1219 | if (!pixbuf) |
1215 | { |
1220 | { |
1216 | rxvt_warn ("Loading image icon failed, continuing without.\n"); |
1221 | rxvt_warn ("Loading image icon failed, continuing without.\n"); |
1217 | return; |
1222 | return; |
… | |
… | |
1403 | | ExposureMask | StructureNotifyMask); |
1408 | | ExposureMask | StructureNotifyMask); |
1404 | |
1409 | |
1405 | termwin_ev.start (display, top); |
1410 | termwin_ev.start (display, top); |
1406 | |
1411 | |
1407 | /* vt cursor: Black-on-White is standard, but this is more popular */ |
1412 | /* vt cursor: Black-on-White is standard, but this is more popular */ |
|
|
1413 | unsigned int shape = XC_xterm; |
|
|
1414 | |
|
|
1415 | #ifdef HAVE_XMU |
|
|
1416 | if (rs[Rs_pointerShape]) |
|
|
1417 | { |
|
|
1418 | int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]); |
|
|
1419 | if (stmp >= 0) |
|
|
1420 | shape = stmp; |
|
|
1421 | } |
|
|
1422 | #endif |
|
|
1423 | |
1408 | TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); |
1424 | TermWin_cursor = XCreateFontCursor (dpy, shape); |
1409 | |
1425 | |
1410 | /* the vt window */ |
1426 | /* the vt window */ |
1411 | vt = XCreateSimpleWindow (dpy, top, |
1427 | vt = XCreateSimpleWindow (dpy, top, |
1412 | window_vt_x, window_vt_y, |
1428 | window_vt_x, window_vt_y, |
1413 | vt_width, vt_height, |
1429 | vt_width, vt_height, |