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.355 by sf-exg, Thu Apr 7 12:19:40 2011 UTC vs.
Revision 1.381 by root, Tue Jun 5 12:04:33 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)
… …
174#endif 172#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if ENABLE_TRANSPARENCY || 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
… …
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 sprintf (number, "%d", event->minor_code);
438 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
439 rxvt_warn ("+ (which is %s)\n", buffer);
440 }
441
442 XFreeExtensionList (exts);
404 } 443 }
444 else
445 {
446 sprintf (number, "%d", event->request_code);
447 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
448 rxvt_warn ("+ (which is %s)\n", buffer);
449 }
450
405 if ((event->error_code == BadWindow) || 451 if (event->error_code == BadWindow
406 (event->error_code == BadPixmap) || 452 || event->error_code == BadPixmap
407 (event->error_code == BadCursor) || 453 || event->error_code == BadCursor
408 (event->error_code == BadFont) || 454 || event->error_code == BadFont
409 (event->error_code == BadDrawable) || 455 || event->error_code == BadDrawable
410 (event->error_code == BadColor) || 456 || event->error_code == BadColor
411 (event->error_code == BadGC) || 457 || event->error_code == BadGC
412 (event->error_code == BadIDChoice) || 458 || event->error_code == BadIDChoice
413 (event->error_code == BadValue) || 459 || event->error_code == BadValue
414 (event->error_code == BadAtom)) { 460 || event->error_code == BadAtom)
461 {
415 if (event->error_code == BadValue) 462 if (event->error_code == BadValue)
416 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 463 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
417 mesg, BUFSIZ);
418 else if (event->error_code == BadAtom) 464 else if (event->error_code == BadAtom)
419 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 465 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
420 mesg, BUFSIZ);
421 else 466 else
422 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 467 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 468
432int 469 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
470 }
471}
472#endif
473
474int ecb_cold
433rxvt_xerror_handler (Display *display, XErrorEvent *event) 475rxvt_xerror_handler (Display *display, XErrorEvent *event)
434{ 476{
435 if (GET_R->allowedxerror == -1) 477 if (GET_R->allowedxerror == -1)
436 GET_R->allowedxerror = event->error_code; 478 GET_R->allowedxerror = event->error_code;
437 else 479 else
… …
446 } 488 }
447 489
448 return 0; 490 return 0;
449} 491}
450 492
451int 493int ecb_cold
452rxvt_xioerror_handler (Display *display) 494rxvt_xioerror_handler (Display *display)
453{ 495{
454 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 496 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
455 DisplayString (display)); 497 DisplayString (display));
456 rxvt_emergency_cleanup (); 498 rxvt_emergency_cleanup ();
… …
576 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 618 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
577 // TODO: handle this with exceptions and tolerate the memory loss 619 // TODO: handle this with exceptions and tolerate the memory loss
578 XSetIOErrorHandler (rxvt_xioerror_handler); 620 XSetIOErrorHandler (rxvt_xioerror_handler);
579 621
580 XrmInitialize (); 622 XrmInitialize ();
623
624#if HAVE_PIXBUF
625 g_type_init ();
626#endif
581} 627}
582 628
583/*----------------------------------------------------------------------*/ 629/*----------------------------------------------------------------------*/
584/* 630/*
585 * window size/position calculations for XSizeHint and other storage. 631 * window size/position calculations for XSizeHint and other storage.
… …
706 if (recalc_y) 752 if (recalc_y)
707 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 753 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
708 754
709 ncol = width / fwidth; 755 ncol = width / fwidth;
710 nrow = height / fheight; 756 nrow = height / fheight;
757
758 // When the size of the vt window is not a multiple of the cell
759 // size, i.e., when the wm does not honour our size hints, there are
760 // extra areas not covered by the terminal screen. Such gaps, when a
761 // bg pixmap is set, would have to be cleared manually to properly
762 // refresh the background. We take the simpler route and shrink the
763 // vt window so as to avoid creating gaps.
764 vt_width = ncol * fwidth;
765 vt_height = nrow * fheight;
711} 766}
712 767
713/*----------------------------------------------------------------------*/ 768/*----------------------------------------------------------------------*/
714/* 769/*
715 * Tell the teletype handler what size the window is. 770 * Tell the teletype handler what size the window is.
… …
723 778
724 struct winsize ws; 779 struct winsize ws;
725 780
726 ws.ws_col = ncol; 781 ws.ws_col = ncol;
727 ws.ws_row = nrow; 782 ws.ws_row = nrow;
728 ws.ws_xpixel = width; 783 ws.ws_xpixel = vt_width;
729 ws.ws_ypixel = height; 784 ws.ws_ypixel = vt_height;
730 ioctl (pty->pty, TIOCSWINSZ, &ws); 785 ioctl (pty->pty, TIOCSWINSZ, &ws);
731 786
732#if 0 787#if 0
733 // TIOCSWINSZ is supposed to do this automatically and correctly 788 // TIOCSWINSZ is supposed to do this automatically and correctly
734 if (cmd_pid) /* force through to the command */ 789 if (cmd_pid) /* force through to the command */
735 kill (-cmd_pid, SIGWINCH); 790 kill (-cmd_pid, SIGWINCH);
736#endif 791#endif
737} 792}
738 793
739/*----------------------------------------------------------------------*/ 794/*----------------------------------------------------------------------*/
740/* set_fonts () - load and set the various fonts 795/* load and set the various fonts */
741 *
742 * init = 1 - initialize
743 *
744 * fontname == FONT_UP - switch to bigger font
745 * fontname == FONT_DN - switch to smaller font
746 */
747bool 796bool
748rxvt_term::set_fonts () 797rxvt_term::set_fonts ()
749{ 798{
750 rxvt_fontset *fs = new rxvt_fontset (this); 799 rxvt_fontset *fs = new rxvt_fontset (this);
751 rxvt_fontprop prop; 800 rxvt_fontprop prop;
… …
766 815
767 delete fontset[0]; 816 delete fontset[0];
768 fontset[0] = fs; 817 fontset[0] = fs;
769 818
770 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 819 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
771 prop.height += lineSpace;
772 prop.width += letterSpace; 820 prop.width += letterSpace;
773 821
774 fs->set_prop (prop, false); 822 fs->set_prop (prop, false);
775 823
776 fwidth = prop.width; 824 fwidth = prop.width;
777 fheight = prop.height; 825 fheight = prop.height + lineSpace;
778 fbase = prop.ascent; 826 fbase = prop.ascent;
779 827
780 for (int style = 1; style < 4; style++) 828 for (int style = 1; style < 4; style++)
781 { 829 {
782#if ENABLE_STYLES 830#if ENABLE_STYLES
… …
944 992
945/*----------------------------------------------------------------------*/ 993/*----------------------------------------------------------------------*/
946/* 994/*
947 * find if fg/bg matches any of the normal (low-intensity) colors 995 * find if fg/bg matches any of the normal (low-intensity) colors
948 */ 996 */
949void 997char *
950rxvt_term::set_colorfgbg () 998rxvt_term::get_colorfgbg ()
951{ 999{
952 unsigned int i; 1000 unsigned int i;
953 const char *xpmb = ""; 1001 const char *xpmb = "";
954 char fstr[] = "default"; 1002 char fstr[] = "default";
955 char bstr[] = "default"; 1003 char bstr[] = "default";
1004 char *env_colorfgbg;
956 1005
957 for (i = Color_Black; i <= Color_White; i++) 1006 for (i = Color_Black; i <= Color_White; i++)
958 if (pix_colors[Color_fg] == pix_colors[i]) 1007 if (pix_colors[Color_fg] == pix_colors[i])
959 { 1008 {
960 sprintf (fstr, "%d", i - Color_Black); 1009 sprintf (fstr, "%d", i - Color_Black);
… …
963 1012
964 for (i = Color_Black; i <= Color_White; i++) 1013 for (i = Color_Black; i <= Color_White; i++)
965 if (pix_colors[Color_bg] == pix_colors[i]) 1014 if (pix_colors[Color_bg] == pix_colors[i])
966 { 1015 {
967 sprintf (bstr, "%d", i - Color_Black); 1016 sprintf (bstr, "%d", i - Color_Black);
968#ifdef BG_IMAGE_FROM_FILE 1017#if BG_IMAGE_FROM_FILE
969 xpmb = "default;"; 1018 xpmb = "default;";
970#endif 1019#endif
971 break; 1020 break;
972 } 1021 }
973 1022
1023 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
974 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1024 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1025 return env_colorfgbg;
975} 1026}
976 1027
977/*----------------------------------------------------------------------*/ 1028/*----------------------------------------------------------------------*/
978 1029
979bool 1030bool
… …
1072 if (scrollBar.state) 1123 if (scrollBar.state)
1073 scrollBar.resize (); 1124 scrollBar.resize ();
1074 1125
1075 XMoveResizeWindow (dpy, vt, 1126 XMoveResizeWindow (dpy, vt,
1076 window_vt_x, window_vt_y, 1127 window_vt_x, window_vt_y,
1077 width, height); 1128 vt_width, vt_height);
1129
1130 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1078 1131
1079#ifdef HAVE_BG_PIXMAP 1132#ifdef HAVE_BG_PIXMAP
1080 if (bg_window_size_sensitive ()) 1133 if (bg_window_size_sensitive ())
1081 update_background (); 1134 update_background ();
1082#endif 1135#endif
1083 } 1136 }
1084 1137
1085 if (fix_screen || old_height == 0) 1138 if (fix_screen || old_height == 0)
1086 scr_reset (); 1139 scr_reset ();
1087 1140
1088#ifdef USE_XIM 1141#if USE_XIM
1089 IMSetPosition (); 1142 im_set_position ();
1090#endif 1143#endif
1091} 1144}
1092 1145
1093/* 1146/*
1094 * Set the width/height of the vt window in characters. Units are pixels. 1147 * Set the width/height of the vt window in characters. Units are pixels.
… …
1107 newwidth = wattr.width - szHint.base_width; 1160 newwidth = wattr.width - szHint.base_width;
1108 if (newheight == 0) 1161 if (newheight == 0)
1109 newheight = wattr.height - szHint.base_height; 1162 newheight = wattr.height - szHint.base_height;
1110 } 1163 }
1111 1164
1112 if (newwidth != width || newheight != height) 1165 if (newwidth != vt_width || newheight != vt_height)
1113 { 1166 {
1114 newwidth += szHint.base_width; 1167 newwidth += szHint.base_width;
1115 newheight += szHint.base_height; 1168 newheight += szHint.base_height;
1116 resize_all_windows (newwidth, newheight, 0); 1169 resize_all_windows (newwidth, newheight, 0);
1117 } 1170 }
1118} 1171}
1119 1172
1120/* -------------------------------------------------------------------- * 1173/* -------------------------------------------------------------------- *
1121 * - X INPUT METHOD ROUTINES - * 1174 * - X INPUT METHOD ROUTINES - *
1122 * -------------------------------------------------------------------- */ 1175 * -------------------------------------------------------------------- */
1123#ifdef USE_XIM 1176#if USE_XIM
1124 1177
1125void 1178void
1126rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1179rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1127{ 1180{
1128 fg = pix_colors [Color_fg]; 1181 fg = pix_colors [Color_fg];
… …
1155 status_rect.height = fheight; 1208 status_rect.height = fheight;
1156} 1209}
1157 1210
1158/* Checking whether input method is running. */ 1211/* Checking whether input method is running. */
1159bool 1212bool
1160rxvt_term::IMisRunning () 1213rxvt_term::im_is_running ()
1161{ 1214{
1162 Atom atom; 1215 Atom atom;
1163 Window win; 1216 Window win;
1164 char server[IMBUFSIZ]; 1217 char server[IMBUFSIZ];
1165 1218
… …
1181 1234
1182 return false; 1235 return false;
1183} 1236}
1184 1237
1185void 1238void
1186rxvt_term::IMSendSpot () 1239rxvt_term::im_send_spot ()
1187{ 1240{
1188 XPoint nspot; 1241 XPoint nspot;
1189 XVaNestedList preedit_attr; 1242 XVaNestedList preedit_attr;
1190 1243
1191 if (!Input_Context 1244 if (!Input_Context
… …
1297/* 1350/*
1298 * Try to open a XIM with the current modifiers, then see if we can 1351 * Try to open a XIM with the current modifiers, then see if we can
1299 * open a suitable preedit type 1352 * open a suitable preedit type
1300 */ 1353 */
1301bool 1354bool
1302rxvt_term::IM_get_IC (const char *modifiers) 1355rxvt_term::im_get_ic (const char *modifiers)
1303{ 1356{
1304 int i, j, found; 1357 int i, j, found;
1305 XIM xim; 1358 XIM xim;
1306 XPoint spot; 1359 XPoint spot;
1307 XRectangle rect, status_rect, needed_rect; 1360 XRectangle rect, status_rect, needed_rect;
1308 unsigned long fg, bg; 1361 unsigned long fg, bg;
1309 const char *p; 1362 const char *p;
1310 char **s; 1363 char **s;
1311 XIMStyles *xim_styles; 1364 XIMStyles *xim_styles;
1312#ifdef ENABLE_XIM_ONTHESPOT
1313 XIMCallback xcb[4];
1314#endif
1315 1365
1316 set_environ (envv); 1366 set_environ (envv);
1317 1367
1318 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1368 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1319 return false; 1369 return false;
… …
1459 NULL); 1509 NULL);
1460 } 1510 }
1461#if ENABLE_XIM_ONTHESPOT 1511#if ENABLE_XIM_ONTHESPOT
1462 else if (input_style & XIMPreeditCallbacks) 1512 else if (input_style & XIMPreeditCallbacks)
1463 { 1513 {
1514 XIMCallback xcb[4];
1515
1464 im_set_position (spot); 1516 im_set_position (spot);
1465 1517
1466 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1518 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1467 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1519 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1468 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1520 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1506 // unfortunately, only the focus window is used by XIM, hard to fix 1558 // unfortunately, only the focus window is used by XIM, hard to fix
1507 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1559 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1508 vt_select_input (); 1560 vt_select_input ();
1509#endif 1561#endif
1510 1562
1511 IMSetPosition (); 1563 im_set_position ();
1512 1564
1513 return true; 1565 return true;
1514} 1566}
1515 1567
1516void 1568void
… …
1526 im_destroy (); 1578 im_destroy ();
1527 1579
1528 if (Input_Context) 1580 if (Input_Context)
1529 return; 1581 return;
1530 1582
1531#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1532 if (rs[Rs_imLocale]) 1583 if (rs[Rs_imLocale])
1533 SET_LOCALE (rs[Rs_imLocale]); 1584 SET_LOCALE (rs[Rs_imLocale]);
1534#endif
1535 1585
1536 p = rs[Rs_inputMethod]; 1586 p = rs[Rs_inputMethod];
1537 if (p && *p) 1587 if (p && *p)
1538 { 1588 {
1539 bool found = false; 1589 bool found = false;
… …
1544 { 1594 {
1545 if (*s[i]) 1595 if (*s[i])
1546 { 1596 {
1547 strcpy (buf, "@im="); 1597 strcpy (buf, "@im=");
1548 strncat (buf, s[i], IMBUFSIZ - 5); 1598 strncat (buf, s[i], IMBUFSIZ - 5);
1549 if (IM_get_IC (buf)) 1599 if (im_get_ic (buf))
1550 { 1600 {
1551 found = true; 1601 found = true;
1552 break; 1602 break;
1553 } 1603 }
1554 } 1604 }
… …
1559 if (found) 1609 if (found)
1560 goto done; 1610 goto done;
1561 } 1611 }
1562 1612
1563 /* try with XMODIFIERS env. var. */ 1613 /* try with XMODIFIERS env. var. */
1564 if (IM_get_IC ("")) 1614 if (im_get_ic (""))
1565 goto done; 1615 goto done;
1566 1616
1567 /* try with no modifiers base IF the user didn't specify an IM */ 1617 /* try with no modifiers base IF the user didn't specify an IM */
1568 if (IM_get_IC ("@im=none")) 1618 if (im_get_ic ("@im=none"))
1569 goto done; 1619 goto done;
1570 1620
1571done: 1621done:
1572#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1573 if (rs[Rs_imLocale]) 1622 if (rs[Rs_imLocale])
1574 SET_LOCALE (locale); 1623 SET_LOCALE (locale);
1575#endif
1576} 1624}
1577 1625
1578void 1626void
1579rxvt_term::IMSetPosition () 1627rxvt_term::im_set_position ()
1580{ 1628{
1581 XRectangle preedit_rect, status_rect, *needed_rect; 1629 XRectangle preedit_rect, status_rect, *needed_rect;
1582 XVaNestedList preedit_attr, status_attr; 1630 XVaNestedList preedit_attr, status_attr;
1583 1631
1584 if (!Input_Context 1632 if (!Input_Context
1585 || !focus 1633 || !focus
1586 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1634 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1587 || !IMisRunning ()) 1635 || !im_is_running ())
1588 return; 1636 return;
1589 1637
1590 if (input_style & XIMPreeditPosition) 1638 if (input_style & XIMPreeditPosition)
1591 { 1639 {
1592 im_set_size (preedit_rect); 1640 im_set_size (preedit_rect);
… …
1625{ 1673{
1626 Window cr; 1674 Window cr;
1627 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr); 1675 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1628} 1676}
1629 1677
1630Pixmap
1631rxvt_term::get_pixmap_property (Atom property)
1632{
1633 Pixmap pixmap = None;
1634
1635 int aformat;
1636 unsigned long nitems, bytes_after;
1637 Atom atype;
1638 unsigned char *prop;
1639 int result = XGetWindowProperty (dpy, display->root, property,
1640 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1641 &nitems, &bytes_after, &prop);
1642 if (result == Success)
1643 {
1644 if (atype == XA_PIXMAP)
1645 pixmap = *(Pixmap *)prop;
1646 XFree (prop);
1647 }
1648
1649 return pixmap;
1650}
1651
1652#ifdef HAVE_BG_PIXMAP 1678#ifdef HAVE_BG_PIXMAP
1653 1679
1654void 1680void
1655rxvt_term::update_background () 1681rxvt_term::update_background ()
1656{ 1682{
1657 if (update_background_ev.is_active ()) 1683 if (update_background_ev.is_active ())
1658 return; 1684 return;
1659 1685
1660 bg_invalidate (); 1686 bg_invalidate ();
1687
1688 if (!mapped)
1689 return;
1661 1690
1662 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1691 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1663 1692
1664 if (to_wait <= 0.) 1693 if (to_wait <= 0.)
1665 bg_render (); 1694 bg_render ();

Diff Legend

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