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.357 by sf-exg, Sat Jul 9 13:14:47 2011 UTC vs.
Revision 1.384 by sf-exg, Sat Dec 29 14:23:35 2012 UTC

… …
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
… …
105 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
106 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
107 } 105 }
108 106
109 // check to see whether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
110 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
111 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
113 111
114 // allocate a new combination 112 // allocate a new combination
115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
… …
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
… …
233 if (display) 231 if (display)
234 { 232 {
235 selection_clear (); 233 selection_clear ();
236 selection_clear (true); 234 selection_clear (true);
237 235
238#ifdef USE_XIM 236#if USE_XIM
239 im_destroy (); 237 im_destroy ();
240#endif 238#endif
241 scrollBar.destroy (); 239 scrollBar.destroy ();
242 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
243 241
… …
267 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
268 free (allocated [i]); 266 free (allocated [i]);
269 267
270 free (selection.text); 268 free (selection.text);
271 free (selection.clip_text); 269 free (selection.clip_text);
272 // TODO: manage env vars in child only(!)
273 free (env_display);
274 free (env_term);
275 free (locale); 270 free (locale);
276 free (v_buffer); 271 free (v_buffer);
277 272
278 delete selection_req; 273 delete selection_req;
279 274
… …
316 { 311 {
317#if USE_XIM 312#if USE_XIM
318 im_ev.stop (display); 313 im_ev.stop (display);
319#endif 314#endif
320 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
321#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
322 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
323#endif 318#endif
324 termwin_ev.stop (display); 319 termwin_ev.stop (display);
325 vt_ev.stop (display); 320 vt_ev.stop (display);
326 } 321 }
… …
353 348
354 delete this; 349 delete this;
355} 350}
356 351
357void 352void
358rxvt_term::set_option (uint8_t opt, bool set) 353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
359{ 354{
360 if (!opt) 355 if (!opt)
361 return; 356 return;
362 357
363 uint8_t mask = 1 << (opt & 7); 358 uint8_t mask = 1 << (opt & 7);
… …
367} 362}
368 363
369/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
370/* 365/*
371 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
372 * TODO: if debugging, this should free up any known resources if we can
373 */ 367 */
374static XErrorHandler old_xerror_handler; 368static XErrorHandler old_xerror_handler;
375 369
376static void 370static void
377rxvt_emergency_cleanup () 371rxvt_emergency_cleanup ()
… …
379 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 373 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
380 (*t)->emergency_cleanup (); 374 (*t)->emergency_cleanup ();
381} 375}
382 376
383#if !ENABLE_MINIMAL 377#if !ENABLE_MINIMAL
384static void 378static void ecb_cold
385print_x_error (Display *dpy, XErrorEvent *event) 379print_x_error (Display *dpy, XErrorEvent *event)
386{ 380{
387 char buffer[BUFSIZ]; 381 char buffer[BUFSIZ];
388 char mesg[BUFSIZ]; 382 char mesg[BUFSIZ];
389 char number[32]; 383 char number[32];
390 const char mtype[] = "XlibMessage"; 384
391 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
392 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
393 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 385 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
386
387 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
388 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
389
390 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
391 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
394 rxvt_warn ("%s: %s\n", mesg, buffer); 392 rxvt_warn ("+ %s: %s\n", mesg, buffer);
393
395 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 394 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 395 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
397 sprintf(number, "%d", event->request_code); 396
398 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
399 rxvt_warn ("(which is %s)\n", buffer);
400 if (event->request_code >= 128) { 397 if (event->request_code >= 128)
398 {
399#if 0
400 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
401 int nexts;
402 char **exts = XListExtensions (dpy, &nexts);
403
404 while (nexts)
405 {
406 char *extname = exts [nexts - 1];
407 int major, first_event, first_error;
408
409 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
410 {
411 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
412 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
413
414 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
415 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
416 rxvt_warn ("+ (which is %s)\n", buffer);
417
418 break;
419 }
420
421 printf ("nextss %d %s\n", nexts, extname);//D
422 --nexts;
423 ++exts;
424 }
425#else
426 int nexts = 0;
427 char **exts = 0;
428#endif
429
430 if (!nexts)
431 {
432 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
433
401 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 434 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
402 mesg, BUFSIZ); 435 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 436
437#if 0
438 sprintf (number, "RENDER.%d", event->minor_code);
439 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
440 rxvt_warn ("+ (which is %s)\n", buffer);
441#endif
442 }
443
444 XFreeExtensionList (exts);
404 } 445 }
446 else
447 {
448 sprintf (number, "%d", event->request_code);
449 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
450 rxvt_warn ("+ (which is %s)\n", buffer);
451 }
452
405 if ((event->error_code == BadWindow) || 453 if (event->error_code == BadWindow
406 (event->error_code == BadPixmap) || 454 || event->error_code == BadPixmap
407 (event->error_code == BadCursor) || 455 || event->error_code == BadCursor
408 (event->error_code == BadFont) || 456 || event->error_code == BadFont
409 (event->error_code == BadDrawable) || 457 || event->error_code == BadDrawable
410 (event->error_code == BadColor) || 458 || event->error_code == BadColor
411 (event->error_code == BadGC) || 459 || event->error_code == BadGC
412 (event->error_code == BadIDChoice) || 460 || event->error_code == BadIDChoice
413 (event->error_code == BadValue) || 461 || event->error_code == BadValue
414 (event->error_code == BadAtom)) { 462 || event->error_code == BadAtom)
463 {
415 if (event->error_code == BadValue) 464 if (event->error_code == BadValue)
416 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 465 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
417 mesg, BUFSIZ);
418 else if (event->error_code == BadAtom) 466 else if (event->error_code == BadAtom)
419 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 467 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
420 mesg, BUFSIZ);
421 else 468 else
422 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 469 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
423 mesg, BUFSIZ);
424 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
425 }
426 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
427 mesg, BUFSIZ);
428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
429}
430#endif
431 470
432int 471 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
472 }
473}
474#endif
475
476int ecb_cold
433rxvt_xerror_handler (Display *display, XErrorEvent *event) 477rxvt_xerror_handler (Display *display, XErrorEvent *event)
434{ 478{
435 if (GET_R->allowedxerror == -1) 479 if (GET_R->allowedxerror == -1)
436 GET_R->allowedxerror = event->error_code; 480 GET_R->allowedxerror = event->error_code;
437 else 481 else
… …
446 } 490 }
447 491
448 return 0; 492 return 0;
449} 493}
450 494
451int 495int ecb_cold
452rxvt_xioerror_handler (Display *display) 496rxvt_xioerror_handler (Display *display)
453{ 497{
454 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 498 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
455 DisplayString (display)); 499 DisplayString (display));
456 rxvt_emergency_cleanup (); 500 rxvt_emergency_cleanup ();
… …
576 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 620 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
577 // TODO: handle this with exceptions and tolerate the memory loss 621 // TODO: handle this with exceptions and tolerate the memory loss
578 XSetIOErrorHandler (rxvt_xioerror_handler); 622 XSetIOErrorHandler (rxvt_xioerror_handler);
579 623
580 XrmInitialize (); 624 XrmInitialize ();
625
626#if HAVE_PIXBUF
627 g_type_init ();
628#endif
581} 629}
582 630
583/*----------------------------------------------------------------------*/ 631/*----------------------------------------------------------------------*/
584/* 632/*
585 * window size/position calculations for XSizeHint and other storage. 633 * window size/position calculations for XSizeHint and other storage.
… …
706 if (recalc_y) 754 if (recalc_y)
707 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 755 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
708 756
709 ncol = width / fwidth; 757 ncol = width / fwidth;
710 nrow = height / fheight; 758 nrow = height / fheight;
759
760 // When the size of the vt window is not a multiple of the cell
761 // size, i.e., when the wm does not honour our size hints, there are
762 // extra areas not covered by the terminal screen. Such gaps, when a
763 // bg pixmap is set, would have to be cleared manually to properly
764 // refresh the background. We take the simpler route and shrink the
765 // vt window so as to avoid creating gaps.
766 vt_width = ncol * fwidth;
767 vt_height = nrow * fheight;
711} 768}
712 769
713/*----------------------------------------------------------------------*/ 770/*----------------------------------------------------------------------*/
714/* 771/*
715 * Tell the teletype handler what size the window is. 772 * Tell the teletype handler what size the window is.
… …
723 780
724 struct winsize ws; 781 struct winsize ws;
725 782
726 ws.ws_col = ncol; 783 ws.ws_col = ncol;
727 ws.ws_row = nrow; 784 ws.ws_row = nrow;
728 ws.ws_xpixel = width; 785 ws.ws_xpixel = vt_width;
729 ws.ws_ypixel = height; 786 ws.ws_ypixel = vt_height;
730 ioctl (pty->pty, TIOCSWINSZ, &ws); 787 ioctl (pty->pty, TIOCSWINSZ, &ws);
731 788
732#if 0 789#if 0
733 // TIOCSWINSZ is supposed to do this automatically and correctly 790 // TIOCSWINSZ is supposed to do this automatically and correctly
734 if (cmd_pid) /* force through to the command */ 791 if (cmd_pid) /* force through to the command */
… …
760 817
761 delete fontset[0]; 818 delete fontset[0];
762 fontset[0] = fs; 819 fontset[0] = fs;
763 820
764 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 821 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
765 prop.height += lineSpace; 822 prop.width = max (prop.width + letterSpace, 1);
766 prop.width += letterSpace;
767 823
768 fs->set_prop (prop, false); 824 fs->set_prop (prop, false);
769 825
770 fwidth = prop.width; 826 fwidth = prop.width;
771 fheight = prop.height; 827 fheight = prop.height + lineSpace;
772 fbase = prop.ascent; 828 fbase = prop.ascent;
773 829
774 for (int style = 1; style < 4; style++) 830 for (int style = 1; style < 4; style++)
775 { 831 {
776#if ENABLE_STYLES 832#if ENABLE_STYLES
… …
938 994
939/*----------------------------------------------------------------------*/ 995/*----------------------------------------------------------------------*/
940/* 996/*
941 * find if fg/bg matches any of the normal (low-intensity) colors 997 * find if fg/bg matches any of the normal (low-intensity) colors
942 */ 998 */
943void 999char *
944rxvt_term::set_colorfgbg () 1000rxvt_term::get_colorfgbg ()
945{ 1001{
946 unsigned int i; 1002 unsigned int i;
947 const char *xpmb = ""; 1003 const char *xpmb = "";
948 char fstr[] = "default"; 1004 char fstr[] = "default";
949 char bstr[] = "default"; 1005 char bstr[] = "default";
1006 char *env_colorfgbg;
950 1007
951 for (i = Color_Black; i <= Color_White; i++) 1008 for (i = Color_Black; i <= Color_White; i++)
952 if (pix_colors[Color_fg] == pix_colors[i]) 1009 if (pix_colors[Color_fg] == pix_colors[i])
953 { 1010 {
954 sprintf (fstr, "%d", i - Color_Black); 1011 sprintf (fstr, "%d", i - Color_Black);
… …
957 1014
958 for (i = Color_Black; i <= Color_White; i++) 1015 for (i = Color_Black; i <= Color_White; i++)
959 if (pix_colors[Color_bg] == pix_colors[i]) 1016 if (pix_colors[Color_bg] == pix_colors[i])
960 { 1017 {
961 sprintf (bstr, "%d", i - Color_Black); 1018 sprintf (bstr, "%d", i - Color_Black);
962#ifdef BG_IMAGE_FROM_FILE 1019#if BG_IMAGE_FROM_FILE
963 xpmb = "default;"; 1020 xpmb = "default;";
964#endif 1021#endif
965 break; 1022 break;
966 } 1023 }
967 1024
1025 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
968 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1026 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1027 return env_colorfgbg;
969} 1028}
970 1029
971/*----------------------------------------------------------------------*/ 1030/*----------------------------------------------------------------------*/
972 1031
973bool 1032bool
… …
1066 if (scrollBar.state) 1125 if (scrollBar.state)
1067 scrollBar.resize (); 1126 scrollBar.resize ();
1068 1127
1069 XMoveResizeWindow (dpy, vt, 1128 XMoveResizeWindow (dpy, vt,
1070 window_vt_x, window_vt_y, 1129 window_vt_x, window_vt_y,
1071 width, height); 1130 vt_width, vt_height);
1131
1132 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1072 1133
1073#ifdef HAVE_BG_PIXMAP 1134#ifdef HAVE_BG_PIXMAP
1074 if (bg_window_size_sensitive ()) 1135 if (bg_window_size_sensitive ())
1075 update_background (); 1136 update_background ();
1076#endif 1137#endif
1077 } 1138 }
1078 1139
1079 if (fix_screen || old_height == 0) 1140 if (fix_screen || old_height == 0)
1080 scr_reset (); 1141 scr_reset ();
1081 1142
1082#ifdef USE_XIM 1143#if USE_XIM
1083 IMSetPosition (); 1144 im_set_position ();
1084#endif 1145#endif
1085} 1146}
1086 1147
1087/* 1148/*
1088 * Set the width/height of the vt window in characters. Units are pixels. 1149 * Set the width/height of the vt window in characters. Units are pixels.
… …
1101 newwidth = wattr.width - szHint.base_width; 1162 newwidth = wattr.width - szHint.base_width;
1102 if (newheight == 0) 1163 if (newheight == 0)
1103 newheight = wattr.height - szHint.base_height; 1164 newheight = wattr.height - szHint.base_height;
1104 } 1165 }
1105 1166
1106 if (newwidth != width || newheight != height) 1167 if (newwidth != vt_width || newheight != vt_height)
1107 { 1168 {
1108 newwidth += szHint.base_width; 1169 newwidth += szHint.base_width;
1109 newheight += szHint.base_height; 1170 newheight += szHint.base_height;
1110 resize_all_windows (newwidth, newheight, 0); 1171 resize_all_windows (newwidth, newheight, 0);
1111 } 1172 }
1112} 1173}
1113 1174
1114/* -------------------------------------------------------------------- * 1175/* -------------------------------------------------------------------- *
1115 * - X INPUT METHOD ROUTINES - * 1176 * - X INPUT METHOD ROUTINES - *
1116 * -------------------------------------------------------------------- */ 1177 * -------------------------------------------------------------------- */
1117#ifdef USE_XIM 1178#if USE_XIM
1118 1179
1119void 1180void
1120rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1181rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1121{ 1182{
1122 fg = pix_colors [Color_fg]; 1183 fg = pix_colors [Color_fg];
… …
1149 status_rect.height = fheight; 1210 status_rect.height = fheight;
1150} 1211}
1151 1212
1152/* Checking whether input method is running. */ 1213/* Checking whether input method is running. */
1153bool 1214bool
1154rxvt_term::IMisRunning () 1215rxvt_term::im_is_running ()
1155{ 1216{
1156 Atom atom; 1217 Atom atom;
1157 Window win; 1218 Window win;
1158 char server[IMBUFSIZ]; 1219 char server[IMBUFSIZ];
1159 1220
… …
1175 1236
1176 return false; 1237 return false;
1177} 1238}
1178 1239
1179void 1240void
1180rxvt_term::IMSendSpot () 1241rxvt_term::im_send_spot ()
1181{ 1242{
1182 XPoint nspot; 1243 XPoint nspot;
1183 XVaNestedList preedit_attr; 1244 XVaNestedList preedit_attr;
1184 1245
1185 if (!Input_Context 1246 if (!Input_Context
… …
1291/* 1352/*
1292 * Try to open a XIM with the current modifiers, then see if we can 1353 * Try to open a XIM with the current modifiers, then see if we can
1293 * open a suitable preedit type 1354 * open a suitable preedit type
1294 */ 1355 */
1295bool 1356bool
1296rxvt_term::IM_get_IC (const char *modifiers) 1357rxvt_term::im_get_ic (const char *modifiers)
1297{ 1358{
1298 int i, j, found; 1359 int i, j, found;
1299 XIM xim; 1360 XIM xim;
1300 XPoint spot; 1361 XPoint spot;
1301 XRectangle rect, status_rect, needed_rect; 1362 XRectangle rect, status_rect, needed_rect;
… …
1499 // unfortunately, only the focus window is used by XIM, hard to fix 1560 // unfortunately, only the focus window is used by XIM, hard to fix
1500 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1561 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1501 vt_select_input (); 1562 vt_select_input ();
1502#endif 1563#endif
1503 1564
1504 IMSetPosition (); 1565 im_set_position ();
1505 1566
1506 return true; 1567 return true;
1507} 1568}
1508 1569
1509void 1570void
… …
1519 im_destroy (); 1580 im_destroy ();
1520 1581
1521 if (Input_Context) 1582 if (Input_Context)
1522 return; 1583 return;
1523 1584
1524#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1525 if (rs[Rs_imLocale]) 1585 if (rs[Rs_imLocale])
1526 SET_LOCALE (rs[Rs_imLocale]); 1586 SET_LOCALE (rs[Rs_imLocale]);
1527#endif
1528 1587
1529 p = rs[Rs_inputMethod]; 1588 p = rs[Rs_inputMethod];
1530 if (p && *p) 1589 if (p && *p)
1531 { 1590 {
1532 bool found = false; 1591 bool found = false;
… …
1537 { 1596 {
1538 if (*s[i]) 1597 if (*s[i])
1539 { 1598 {
1540 strcpy (buf, "@im="); 1599 strcpy (buf, "@im=");
1541 strncat (buf, s[i], IMBUFSIZ - 5); 1600 strncat (buf, s[i], IMBUFSIZ - 5);
1542 if (IM_get_IC (buf)) 1601 if (im_get_ic (buf))
1543 { 1602 {
1544 found = true; 1603 found = true;
1545 break; 1604 break;
1546 } 1605 }
1547 } 1606 }
… …
1552 if (found) 1611 if (found)
1553 goto done; 1612 goto done;
1554 } 1613 }
1555 1614
1556 /* try with XMODIFIERS env. var. */ 1615 /* try with XMODIFIERS env. var. */
1557 if (IM_get_IC ("")) 1616 if (im_get_ic (""))
1558 goto done; 1617 goto done;
1559 1618
1560 /* try with no modifiers base IF the user didn't specify an IM */ 1619 /* try with no modifiers base IF the user didn't specify an IM */
1561 if (IM_get_IC ("@im=none")) 1620 if (im_get_ic ("@im=none"))
1562 goto done; 1621 goto done;
1563 1622
1564done: 1623done:
1565#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1566 if (rs[Rs_imLocale]) 1624 if (rs[Rs_imLocale])
1567 SET_LOCALE (locale); 1625 SET_LOCALE (locale);
1568#endif
1569} 1626}
1570 1627
1571void 1628void
1572rxvt_term::IMSetPosition () 1629rxvt_term::im_set_position ()
1573{ 1630{
1574 XRectangle preedit_rect, status_rect, *needed_rect; 1631 XRectangle preedit_rect, status_rect, *needed_rect;
1575 XVaNestedList preedit_attr, status_attr; 1632 XVaNestedList preedit_attr, status_attr;
1576 1633
1577 if (!Input_Context 1634 if (!Input_Context
1578 || !focus 1635 || !focus
1579 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1636 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1580 || !IMisRunning ()) 1637 || !im_is_running ())
1581 return; 1638 return;
1582 1639
1583 if (input_style & XIMPreeditPosition) 1640 if (input_style & XIMPreeditPosition)
1584 { 1641 {
1585 im_set_size (preedit_rect); 1642 im_set_size (preedit_rect);
… …
1618{ 1675{
1619 Window cr; 1676 Window cr;
1620 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr); 1677 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1621} 1678}
1622 1679
1623Pixmap
1624rxvt_term::get_pixmap_property (Atom property)
1625{
1626 Pixmap pixmap = None;
1627
1628 int aformat;
1629 unsigned long nitems, bytes_after;
1630 Atom atype;
1631 unsigned char *prop;
1632 int result = XGetWindowProperty (dpy, display->root, property,
1633 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1634 &nitems, &bytes_after, &prop);
1635 if (result == Success)
1636 {
1637 if (atype == XA_PIXMAP)
1638 pixmap = *(Pixmap *)prop;
1639 XFree (prop);
1640 }
1641
1642 return pixmap;
1643}
1644
1645#ifdef HAVE_BG_PIXMAP 1680#ifdef HAVE_BG_PIXMAP
1646 1681
1647void 1682void
1648rxvt_term::update_background () 1683rxvt_term::update_background ()
1649{ 1684{
1650 if (update_background_ev.is_active ()) 1685 if (update_background_ev.is_active ())
1651 return; 1686 return;
1652 1687
1653 bg_invalidate (); 1688 bg_invalidate ();
1689
1690 if (!mapped)
1691 return;
1654 1692
1655 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1693 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1656 1694
1657 if (to_wait <= 0.) 1695 if (to_wait <= 0.)
1658 bg_render (); 1696 bg_render ();

Diff Legend

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