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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.364 by sf-exg, Mon Jan 9 15:30:17 2012 UTC vs.
Revision 1.392 by sf-exg, Mon Nov 3 09:40:26 2014 UTC

… …
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de> 16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
17 * 17 *
18 * 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
19 * 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
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 3 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
22 * 22 *
23 * This program is distributed in the hope that it will be useful, 23 * This program is distributed in the hope that it will be useful,
24 * but WITHOUT ANY WARRANTY; without even the implied warranty of 24 * but WITHOUT ANY WARRANTY; without even the implied warranty of
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
36#include "keyboard.h" 36#include "keyboard.h"
37#include "rxvtperl.h" 37#include "rxvtperl.h"
38 38
39#include <limits> 39#include <limits>
40 40
41#include <cassert> 41#include <assert.h>
42#include <csignal> 42#include <signal.h>
43#include <cstring> 43#include <string.h>
44 44
45#include <termios.h> 45#include <termios.h>
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 51# include <locale.h>
53# endif
54#endif 52#endif
55 53
56struct termios rxvt_term::def_tio; 54struct termios rxvt_term::def_tio;
57vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
58 56
… …
170 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this); 168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
171#endif 169#endif
172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174#endif 172#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177#endif 175#endif
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#ifdef USE_XIM 177#if USE_XIM
180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
181#endif 179#endif
182#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif 182#endif
… …
228 226
229#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
230 bg_destroy (); 228 bg_destroy ();
231#endif 229#endif
232 230
231#if HAVE_IMG
232 delete bg_img;
233#endif
234
233 if (display) 235 if (display)
234 { 236 {
235 selection_clear (); 237 selection_clear ();
236 selection_clear (true); 238 selection_clear (true);
237 239
238#ifdef USE_XIM 240#if USE_XIM
239 im_destroy (); 241 im_destroy ();
240#endif 242#endif
241 scrollBar.destroy (); 243 scrollBar.destroy ();
244
245 if (gc)
242 if (gc) XFreeGC (dpy, gc); 246 XFreeGC (dpy, gc);
243 247
244 delete drawable; 248 delete drawable;
249
245 // destroy all windows 250 // destroy all windows
246 if (parent) 251 if (parent)
247 XDestroyWindow (dpy, parent); 252 XDestroyWindow (dpy, parent);
248 253
249 for (int i = 0; i < TOTAL_COLORS; i++) 254 for (int i = 0; i < TOTAL_COLORS; i++)
… …
272 free (locale); 277 free (locale);
273 free (v_buffer); 278 free (v_buffer);
274 279
275 delete selection_req; 280 delete selection_req;
276 281
282 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
283 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
284
285 delete env;
286
277 delete envv; 287 delete envv;
278 delete argv; 288 delete argv;
279 289
280#ifdef KEYSYM_RESOURCE 290#ifdef KEYSYM_RESOURCE
281 delete keyboard; 291 delete keyboard;
… …
313 { 323 {
314#if USE_XIM 324#if USE_XIM
315 im_ev.stop (display); 325 im_ev.stop (display);
316#endif 326#endif
317 scrollbar_ev.stop (display); 327 scrollbar_ev.stop (display);
318#if ENABLE_TRANSPARENCY || ENABLE_PERL 328#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
319 rootwin_ev.stop (display); 329 rootwin_ev.stop (display);
320#endif 330#endif
321 termwin_ev.stop (display); 331 termwin_ev.stop (display);
322 vt_ev.stop (display); 332 vt_ev.stop (display);
323 } 333 }
… …
350 360
351 delete this; 361 delete this;
352} 362}
353 363
354void 364void
355rxvt_term::set_option (uint8_t opt, bool set) 365rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
356{ 366{
357 if (!opt) 367 if (!opt)
358 return; 368 return;
359 369
360 uint8_t mask = 1 << (opt & 7); 370 uint8_t mask = 1 << (opt & 7);
… …
364} 374}
365 375
366/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
367/* 377/*
368 * Exit gracefully, clearing the utmp entry and restoring tty attributes 378 * Exit gracefully, clearing the utmp entry and restoring tty attributes
369 * TODO: if debugging, this should free up any known resources if we can
370 */ 379 */
371static XErrorHandler old_xerror_handler; 380static XErrorHandler old_xerror_handler;
372 381
373static void 382static void
374rxvt_emergency_cleanup () 383rxvt_emergency_cleanup ()
… …
376 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 385 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
377 (*t)->emergency_cleanup (); 386 (*t)->emergency_cleanup ();
378} 387}
379 388
380#if !ENABLE_MINIMAL 389#if !ENABLE_MINIMAL
381static void 390static void ecb_cold
382print_x_error (Display *dpy, XErrorEvent *event) 391print_x_error (Display *dpy, XErrorEvent *event)
383{ 392{
384 char buffer[BUFSIZ]; 393 char buffer[BUFSIZ];
385 char mesg[BUFSIZ]; 394 char mesg[BUFSIZ];
386 char number[32]; 395 char number[32];
387 const char mtype[] = "XlibMessage"; 396
388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
390 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 397 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
398
399 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
400 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
401
402 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
403 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
391 rxvt_warn ("%s: %s\n", mesg, buffer); 404 rxvt_warn ("+ %s: %s\n", mesg, buffer);
405
392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 406 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 407 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
394 sprintf(number, "%d", event->request_code); 408
395 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
396 rxvt_warn ("(which is %s)\n", buffer);
397 if (event->request_code >= 128) { 409 if (event->request_code >= 128)
410 {
411#if 0
412 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
413 int nexts;
414 char **exts = XListExtensions (dpy, &nexts);
415
416 while (nexts)
417 {
418 char *extname = exts [nexts - 1];
419 int major, first_event, first_error;
420
421 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
422 {
423 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
424 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
425
426 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
427 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
428 rxvt_warn ("+ (which is %s)\n", buffer);
429
430 break;
431 }
432
433 printf ("nextss %d %s\n", nexts, extname);//D
434 --nexts;
435 ++exts;
436 }
437#else
438 int nexts = 0;
439 char **exts = 0;
440#endif
441
442 if (!nexts)
443 {
444 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
445
398 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 446 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
399 mesg, BUFSIZ); 447 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 448
449#if 0
450 sprintf (number, "RENDER.%d", event->minor_code);
451 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
452 rxvt_warn ("+ (which is %s)\n", buffer);
453#endif
454 }
455
456 XFreeExtensionList (exts);
401 } 457 }
458 else
459 {
460 sprintf (number, "%d", event->request_code);
461 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
462 rxvt_warn ("+ (which is %s)\n", buffer);
463 }
464
402 if ((event->error_code == BadWindow) || 465 if (event->error_code == BadWindow
403 (event->error_code == BadPixmap) || 466 || event->error_code == BadPixmap
404 (event->error_code == BadCursor) || 467 || event->error_code == BadCursor
405 (event->error_code == BadFont) || 468 || event->error_code == BadFont
406 (event->error_code == BadDrawable) || 469 || event->error_code == BadDrawable
407 (event->error_code == BadColor) || 470 || event->error_code == BadColor
408 (event->error_code == BadGC) || 471 || event->error_code == BadGC
409 (event->error_code == BadIDChoice) || 472 || event->error_code == BadIDChoice
410 (event->error_code == BadValue) || 473 || event->error_code == BadValue
411 (event->error_code == BadAtom)) { 474 || event->error_code == BadAtom)
475 {
412 if (event->error_code == BadValue) 476 if (event->error_code == BadValue)
413 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 477 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
414 mesg, BUFSIZ);
415 else if (event->error_code == BadAtom) 478 else if (event->error_code == BadAtom)
416 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 479 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
417 mesg, BUFSIZ);
418 else 480 else
419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 481 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
420 mesg, BUFSIZ);
421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
422 }
423 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
424 mesg, BUFSIZ);
425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
426}
427#endif
428 482
429int 483 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
484 }
485}
486#endif
487
488int ecb_cold
430rxvt_xerror_handler (Display *display, XErrorEvent *event) 489rxvt_xerror_handler (Display *display, XErrorEvent *event)
431{ 490{
432 if (GET_R->allowedxerror == -1) 491 if (GET_R->allowedxerror == -1)
433 GET_R->allowedxerror = event->error_code; 492 GET_R->allowedxerror = event->error_code;
434 else 493 else
… …
443 } 502 }
444 503
445 return 0; 504 return 0;
446} 505}
447 506
448int 507int ecb_cold
449rxvt_xioerror_handler (Display *display) 508rxvt_xioerror_handler (Display *display)
450{ 509{
451 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 510 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
452 DisplayString (display)); 511 DisplayString (display));
453 rxvt_emergency_cleanup (); 512 rxvt_emergency_cleanup ();
… …
573 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 632 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
574 // TODO: handle this with exceptions and tolerate the memory loss 633 // TODO: handle this with exceptions and tolerate the memory loss
575 XSetIOErrorHandler (rxvt_xioerror_handler); 634 XSetIOErrorHandler (rxvt_xioerror_handler);
576 635
577 XrmInitialize (); 636 XrmInitialize ();
637
638#if HAVE_PIXBUF
639 g_type_init ();
640#endif
578} 641}
579 642
580/*----------------------------------------------------------------------*/ 643/*----------------------------------------------------------------------*/
581/* 644/*
582 * window size/position calculations for XSizeHint and other storage. 645 * window size/position calculations for XSizeHint and other storage.
… …
710 // size, i.e., when the wm does not honour our size hints, there are 773 // size, i.e., when the wm does not honour our size hints, there are
711 // extra areas not covered by the terminal screen. Such gaps, when a 774 // extra areas not covered by the terminal screen. Such gaps, when a
712 // bg pixmap is set, would have to be cleared manually to properly 775 // bg pixmap is set, would have to be cleared manually to properly
713 // refresh the background. We take the simpler route and shrink the 776 // refresh the background. We take the simpler route and shrink the
714 // vt window so as to avoid creating gaps. 777 // vt window so as to avoid creating gaps.
715 width = ncol * fwidth; 778 vt_width = ncol * fwidth;
716 height = nrow * fheight; 779 vt_height = nrow * fheight;
717} 780}
718 781
719/*----------------------------------------------------------------------*/ 782/*----------------------------------------------------------------------*/
720/* 783/*
721 * Tell the teletype handler what size the window is. 784 * Tell the teletype handler what size the window is.
… …
729 792
730 struct winsize ws; 793 struct winsize ws;
731 794
732 ws.ws_col = ncol; 795 ws.ws_col = ncol;
733 ws.ws_row = nrow; 796 ws.ws_row = nrow;
734 ws.ws_xpixel = width; 797 ws.ws_xpixel = vt_width;
735 ws.ws_ypixel = height; 798 ws.ws_ypixel = vt_height;
736 ioctl (pty->pty, TIOCSWINSZ, &ws); 799 ioctl (pty->pty, TIOCSWINSZ, &ws);
737 800
738#if 0 801#if 0
739 // TIOCSWINSZ is supposed to do this automatically and correctly 802 // TIOCSWINSZ is supposed to do this automatically and correctly
740 if (cmd_pid) /* force through to the command */ 803 if (cmd_pid) /* force through to the command */
… …
766 829
767 delete fontset[0]; 830 delete fontset[0];
768 fontset[0] = fs; 831 fontset[0] = fs;
769 832
770 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 833 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
771 prop.height += lineSpace; 834 prop.width = max (prop.width + letterSpace, 1);
772 prop.width += letterSpace;
773 835
774 fs->set_prop (prop, false); 836 fs->set_prop (prop, false);
775 837
776 fwidth = prop.width; 838 fwidth = prop.width;
777 fheight = prop.height; 839 fheight = prop.height + lineSpace;
778 fbase = prop.ascent; 840 fbase = prop.ascent;
779 841
780 for (int style = 1; style < 4; style++) 842 for (int style = 1; style < 4; style++)
781 { 843 {
782#if ENABLE_STYLES 844#if ENABLE_STYLES
… …
944 1006
945/*----------------------------------------------------------------------*/ 1007/*----------------------------------------------------------------------*/
946/* 1008/*
947 * find if fg/bg matches any of the normal (low-intensity) colors 1009 * find if fg/bg matches any of the normal (low-intensity) colors
948 */ 1010 */
949void 1011char *
950rxvt_term::set_colorfgbg () 1012rxvt_term::get_colorfgbg ()
951{ 1013{
952 unsigned int i; 1014 unsigned int i;
953 const char *xpmb = ""; 1015 const char *xpmb = "";
954 char fstr[] = "default"; 1016 char fstr[] = "default";
955 char bstr[] = "default"; 1017 char bstr[] = "default";
1018 char *env_colorfgbg;
956 1019
957 for (i = Color_Black; i <= Color_White; i++) 1020 for (i = Color_Black; i <= Color_White; i++)
958 if (pix_colors[Color_fg] == pix_colors[i]) 1021 if (pix_colors[Color_fg] == pix_colors[i])
959 { 1022 {
960 sprintf (fstr, "%d", i - Color_Black); 1023 sprintf (fstr, "%d", i - Color_Black);
… …
963 1026
964 for (i = Color_Black; i <= Color_White; i++) 1027 for (i = Color_Black; i <= Color_White; i++)
965 if (pix_colors[Color_bg] == pix_colors[i]) 1028 if (pix_colors[Color_bg] == pix_colors[i])
966 { 1029 {
967 sprintf (bstr, "%d", i - Color_Black); 1030 sprintf (bstr, "%d", i - Color_Black);
968#ifdef BG_IMAGE_FROM_FILE 1031#if BG_IMAGE_FROM_FILE
969 xpmb = "default;"; 1032 xpmb = "default;";
970#endif 1033#endif
971 break; 1034 break;
972 } 1035 }
973 1036
1037 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
974 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1038 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1039 return env_colorfgbg;
975} 1040}
976 1041
977/*----------------------------------------------------------------------*/ 1042/*----------------------------------------------------------------------*/
978 1043
979bool 1044bool
… …
1072 if (scrollBar.state) 1137 if (scrollBar.state)
1073 scrollBar.resize (); 1138 scrollBar.resize ();
1074 1139
1075 XMoveResizeWindow (dpy, vt, 1140 XMoveResizeWindow (dpy, vt,
1076 window_vt_x, window_vt_y, 1141 window_vt_x, window_vt_y,
1077 width, height); 1142 vt_width, vt_height);
1143
1144 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1078 1145
1079#ifdef HAVE_BG_PIXMAP 1146#ifdef HAVE_BG_PIXMAP
1080 if (bg_window_size_sensitive ()) 1147 if (bg_window_size_sensitive ())
1081 update_background (); 1148 update_background ();
1082#endif 1149#endif
1083 } 1150 }
1084 1151
1085 if (fix_screen || old_height == 0) 1152 if (fix_screen || old_height == 0)
1086 scr_reset (); 1153 scr_reset ();
1087 1154
1088#ifdef USE_XIM 1155#if USE_XIM
1089 im_set_position (); 1156 im_set_position ();
1090#endif 1157#endif
1091} 1158}
1092 1159
1093/* 1160/*
… …
1107 newwidth = wattr.width - szHint.base_width; 1174 newwidth = wattr.width - szHint.base_width;
1108 if (newheight == 0) 1175 if (newheight == 0)
1109 newheight = wattr.height - szHint.base_height; 1176 newheight = wattr.height - szHint.base_height;
1110 } 1177 }
1111 1178
1112 if (newwidth != width || newheight != height) 1179 if (newwidth != vt_width || newheight != vt_height)
1113 { 1180 {
1114 newwidth += szHint.base_width; 1181 newwidth += szHint.base_width;
1115 newheight += szHint.base_height; 1182 newheight += szHint.base_height;
1116 resize_all_windows (newwidth, newheight, 0); 1183 resize_all_windows (newwidth, newheight, 0);
1117 } 1184 }
1118} 1185}
1119 1186
1120/* -------------------------------------------------------------------- * 1187/* -------------------------------------------------------------------- *
1121 * - X INPUT METHOD ROUTINES - * 1188 * - X INPUT METHOD ROUTINES - *
1122 * -------------------------------------------------------------------- */ 1189 * -------------------------------------------------------------------- */
1123#ifdef USE_XIM 1190#if USE_XIM
1124 1191
1125void 1192void
1126rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1193rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1127{ 1194{
1128 fg = pix_colors [Color_fg]; 1195 fg = pix_colors [Color_fg];
… …
1308 unsigned long fg, bg; 1375 unsigned long fg, bg;
1309 const char *p; 1376 const char *p;
1310 char **s; 1377 char **s;
1311 XIMStyles *xim_styles; 1378 XIMStyles *xim_styles;
1312 1379
1313 set_environ (envv); 1380 set_environ (env);
1314 1381
1315 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1382 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1316 return false; 1383 return false;
1317 1384
1318 input_method = display->get_xim (locale, modifiers); 1385 input_method = display->get_xim (locale, modifiers);
1319 if (input_method == NULL) 1386 if (input_method == NULL)
1320 return false; 1387 return false;
… …
1525 im_destroy (); 1592 im_destroy ();
1526 1593
1527 if (Input_Context) 1594 if (Input_Context)
1528 return; 1595 return;
1529 1596
1530#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1531 if (rs[Rs_imLocale]) 1597 if (rs[Rs_imLocale])
1532 SET_LOCALE (rs[Rs_imLocale]); 1598 SET_LOCALE (rs[Rs_imLocale]);
1533#endif
1534 1599
1535 p = rs[Rs_inputMethod]; 1600 p = rs[Rs_inputMethod];
1536 if (p && *p) 1601 if (p && *p)
1537 { 1602 {
1538 bool found = false; 1603 bool found = false;
… …
1566 /* try with no modifiers base IF the user didn't specify an IM */ 1631 /* try with no modifiers base IF the user didn't specify an IM */
1567 if (im_get_ic ("@im=none")) 1632 if (im_get_ic ("@im=none"))
1568 goto done; 1633 goto done;
1569 1634
1570done: 1635done:
1571#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1572 if (rs[Rs_imLocale]) 1636 if (rs[Rs_imLocale])
1573 SET_LOCALE (locale); 1637 SET_LOCALE (locale);
1574#endif
1575} 1638}
1576 1639
1577void 1640void
1578rxvt_term::im_set_position () 1641rxvt_term::im_set_position ()
1579{ 1642{
… …
1624{ 1687{
1625 Window cr; 1688 Window cr;
1626 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr); 1689 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1627} 1690}
1628 1691
1629Pixmap
1630rxvt_term::get_pixmap_property (Atom property)
1631{
1632 Pixmap pixmap = None;
1633
1634 int aformat;
1635 unsigned long nitems, bytes_after;
1636 Atom atype;
1637 unsigned char *prop;
1638 int result = XGetWindowProperty (dpy, display->root, property,
1639 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1640 &nitems, &bytes_after, &prop);
1641 if (result == Success)
1642 {
1643 if (atype == XA_PIXMAP)
1644 pixmap = *(Pixmap *)prop;
1645 XFree (prop);
1646 }
1647
1648 return pixmap;
1649}
1650
1651#ifdef HAVE_BG_PIXMAP 1692#ifdef HAVE_BG_PIXMAP
1652 1693
1653void 1694void
1654rxvt_term::update_background () 1695rxvt_term::update_background ()
1655{ 1696{
1656 if (update_background_ev.is_active ()) 1697 if (update_background_ev.is_active ())
1657 return;
1658
1659 bg_invalidate ();
1660
1661 if (!mapped)
1662 return; 1698 return;
1663 1699
1664 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1700 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1665 1701
1666 if (to_wait <= 0.) 1702 if (to_wait <= 0.)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines