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.379 by root, Tue Jun 5 11:10:58 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);
… …
379 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 374 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
380 (*t)->emergency_cleanup (); 375 (*t)->emergency_cleanup ();
381} 376}
382 377
383#if !ENABLE_MINIMAL 378#if !ENABLE_MINIMAL
384static void 379static void ecb_cold
385print_x_error (Display *dpy, XErrorEvent *event) 380print_x_error (Display *dpy, XErrorEvent *event)
386{ 381{
387 char buffer[BUFSIZ]; 382 char buffer[BUFSIZ];
388 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
389 char number[32]; 384 char number[32];
390 const char mtype[] = "XlibMessage"; 385 const char mtype[] = "XlibMessage";
386
391 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 387 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
392 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 388 XGetErrorDatabaseText (dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
393 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 389 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
394 rxvt_warn ("%s: %s\n", mesg, buffer); 390 rxvt_warn ("%s: %s\n", mesg, buffer);
395 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 391 XGetErrorDatabaseText (dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 392 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
397 sprintf(number, "%d", event->request_code); 393 sprintf (number, "%d", event->request_code);
398 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 394 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
399 rxvt_warn ("(which is %s)\n", buffer); 395 rxvt_warn ("(which is %s)\n", buffer);
396
400 if (event->request_code >= 128) { 397 if (event->request_code >= 128)
398 {
401 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 399 XGetErrorDatabaseText (dpy, mtype, "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
402 mesg, BUFSIZ);
403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
404 } 401 }
402
405 if ((event->error_code == BadWindow) || 403 if (event->error_code == BadWindow
406 (event->error_code == BadPixmap) || 404 || event->error_code == BadPixmap
407 (event->error_code == BadCursor) || 405 || event->error_code == BadCursor
408 (event->error_code == BadFont) || 406 || event->error_code == BadFont
409 (event->error_code == BadDrawable) || 407 || event->error_code == BadDrawable
410 (event->error_code == BadColor) || 408 || event->error_code == BadColor
411 (event->error_code == BadGC) || 409 || event->error_code == BadGC
412 (event->error_code == BadIDChoice) || 410 || event->error_code == BadIDChoice
413 (event->error_code == BadValue) || 411 || event->error_code == BadValue
414 (event->error_code == BadAtom)) { 412 || event->error_code == BadAtom)
413 {
415 if (event->error_code == BadValue) 414 if (event->error_code == BadValue)
416 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 415 XGetErrorDatabaseText (dpy, mtype, "Value", "Value 0x%x", mesg, BUFSIZ);
417 mesg, BUFSIZ);
418 else if (event->error_code == BadAtom) 416 else if (event->error_code == BadAtom)
419 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 417 XGetErrorDatabaseText (dpy, mtype, "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
420 mesg, BUFSIZ);
421 else 418 else
422 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 419 XGetErrorDatabaseText (dpy, mtype, "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
423 mesg, BUFSIZ); 420
424 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
425 } 422 }
423
426 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 424 XGetErrorDatabaseText (dpy, mtype, "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
427 mesg, BUFSIZ);
428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
429} 426}
430#endif 427#endif
431 428
432int 429int ecb_cold
433rxvt_xerror_handler (Display *display, XErrorEvent *event) 430rxvt_xerror_handler (Display *display, XErrorEvent *event)
434{ 431{
435 if (GET_R->allowedxerror == -1) 432 if (GET_R->allowedxerror == -1)
436 GET_R->allowedxerror = event->error_code; 433 GET_R->allowedxerror = event->error_code;
437 else 434 else
… …
446 } 443 }
447 444
448 return 0; 445 return 0;
449} 446}
450 447
451int 448int ecb_cold
452rxvt_xioerror_handler (Display *display) 449rxvt_xioerror_handler (Display *display)
453{ 450{
454 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 451 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
455 DisplayString (display)); 452 DisplayString (display));
456 rxvt_emergency_cleanup (); 453 rxvt_emergency_cleanup ();
… …
576 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 573 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
577 // TODO: handle this with exceptions and tolerate the memory loss 574 // TODO: handle this with exceptions and tolerate the memory loss
578 XSetIOErrorHandler (rxvt_xioerror_handler); 575 XSetIOErrorHandler (rxvt_xioerror_handler);
579 576
580 XrmInitialize (); 577 XrmInitialize ();
578
579#if HAVE_PIXBUF
580 g_type_init ();
581#endif
581} 582}
582 583
583/*----------------------------------------------------------------------*/ 584/*----------------------------------------------------------------------*/
584/* 585/*
585 * window size/position calculations for XSizeHint and other storage. 586 * window size/position calculations for XSizeHint and other storage.
… …
706 if (recalc_y) 707 if (recalc_y)
707 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 708 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
708 709
709 ncol = width / fwidth; 710 ncol = width / fwidth;
710 nrow = height / fheight; 711 nrow = height / fheight;
712
713 // When the size of the vt window is not a multiple of the cell
714 // size, i.e., when the wm does not honour our size hints, there are
715 // extra areas not covered by the terminal screen. Such gaps, when a
716 // bg pixmap is set, would have to be cleared manually to properly
717 // refresh the background. We take the simpler route and shrink the
718 // vt window so as to avoid creating gaps.
719 vt_width = ncol * fwidth;
720 vt_height = nrow * fheight;
711} 721}
712 722
713/*----------------------------------------------------------------------*/ 723/*----------------------------------------------------------------------*/
714/* 724/*
715 * Tell the teletype handler what size the window is. 725 * Tell the teletype handler what size the window is.
… …
723 733
724 struct winsize ws; 734 struct winsize ws;
725 735
726 ws.ws_col = ncol; 736 ws.ws_col = ncol;
727 ws.ws_row = nrow; 737 ws.ws_row = nrow;
728 ws.ws_xpixel = width; 738 ws.ws_xpixel = vt_width;
729 ws.ws_ypixel = height; 739 ws.ws_ypixel = vt_height;
730 ioctl (pty->pty, TIOCSWINSZ, &ws); 740 ioctl (pty->pty, TIOCSWINSZ, &ws);
731 741
732#if 0 742#if 0
733 // TIOCSWINSZ is supposed to do this automatically and correctly 743 // TIOCSWINSZ is supposed to do this automatically and correctly
734 if (cmd_pid) /* force through to the command */ 744 if (cmd_pid) /* force through to the command */
735 kill (-cmd_pid, SIGWINCH); 745 kill (-cmd_pid, SIGWINCH);
736#endif 746#endif
737} 747}
738 748
739/*----------------------------------------------------------------------*/ 749/*----------------------------------------------------------------------*/
740/* set_fonts () - load and set the various fonts 750/* 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 751bool
748rxvt_term::set_fonts () 752rxvt_term::set_fonts ()
749{ 753{
750 rxvt_fontset *fs = new rxvt_fontset (this); 754 rxvt_fontset *fs = new rxvt_fontset (this);
751 rxvt_fontprop prop; 755 rxvt_fontprop prop;
… …
766 770
767 delete fontset[0]; 771 delete fontset[0];
768 fontset[0] = fs; 772 fontset[0] = fs;
769 773
770 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 774 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
771 prop.height += lineSpace;
772 prop.width += letterSpace; 775 prop.width += letterSpace;
773 776
774 fs->set_prop (prop, false); 777 fs->set_prop (prop, false);
775 778
776 fwidth = prop.width; 779 fwidth = prop.width;
777 fheight = prop.height; 780 fheight = prop.height + lineSpace;
778 fbase = prop.ascent; 781 fbase = prop.ascent;
779 782
780 for (int style = 1; style < 4; style++) 783 for (int style = 1; style < 4; style++)
781 { 784 {
782#if ENABLE_STYLES 785#if ENABLE_STYLES
… …
944 947
945/*----------------------------------------------------------------------*/ 948/*----------------------------------------------------------------------*/
946/* 949/*
947 * find if fg/bg matches any of the normal (low-intensity) colors 950 * find if fg/bg matches any of the normal (low-intensity) colors
948 */ 951 */
949void 952char *
950rxvt_term::set_colorfgbg () 953rxvt_term::get_colorfgbg ()
951{ 954{
952 unsigned int i; 955 unsigned int i;
953 const char *xpmb = ""; 956 const char *xpmb = "";
954 char fstr[] = "default"; 957 char fstr[] = "default";
955 char bstr[] = "default"; 958 char bstr[] = "default";
959 char *env_colorfgbg;
956 960
957 for (i = Color_Black; i <= Color_White; i++) 961 for (i = Color_Black; i <= Color_White; i++)
958 if (pix_colors[Color_fg] == pix_colors[i]) 962 if (pix_colors[Color_fg] == pix_colors[i])
959 { 963 {
960 sprintf (fstr, "%d", i - Color_Black); 964 sprintf (fstr, "%d", i - Color_Black);
… …
963 967
964 for (i = Color_Black; i <= Color_White; i++) 968 for (i = Color_Black; i <= Color_White; i++)
965 if (pix_colors[Color_bg] == pix_colors[i]) 969 if (pix_colors[Color_bg] == pix_colors[i])
966 { 970 {
967 sprintf (bstr, "%d", i - Color_Black); 971 sprintf (bstr, "%d", i - Color_Black);
968#ifdef BG_IMAGE_FROM_FILE 972#if BG_IMAGE_FROM_FILE
969 xpmb = "default;"; 973 xpmb = "default;";
970#endif 974#endif
971 break; 975 break;
972 } 976 }
973 977
978 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
974 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 979 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
980 return env_colorfgbg;
975} 981}
976 982
977/*----------------------------------------------------------------------*/ 983/*----------------------------------------------------------------------*/
978 984
979bool 985bool
… …
1072 if (scrollBar.state) 1078 if (scrollBar.state)
1073 scrollBar.resize (); 1079 scrollBar.resize ();
1074 1080
1075 XMoveResizeWindow (dpy, vt, 1081 XMoveResizeWindow (dpy, vt,
1076 window_vt_x, window_vt_y, 1082 window_vt_x, window_vt_y,
1077 width, height); 1083 vt_width, vt_height);
1084
1085 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1078 1086
1079#ifdef HAVE_BG_PIXMAP 1087#ifdef HAVE_BG_PIXMAP
1080 if (bg_window_size_sensitive ()) 1088 if (bg_window_size_sensitive ())
1081 update_background (); 1089 update_background ();
1082#endif 1090#endif
1083 } 1091 }
1084 1092
1085 if (fix_screen || old_height == 0) 1093 if (fix_screen || old_height == 0)
1086 scr_reset (); 1094 scr_reset ();
1087 1095
1088#ifdef USE_XIM 1096#if USE_XIM
1089 IMSetPosition (); 1097 im_set_position ();
1090#endif 1098#endif
1091} 1099}
1092 1100
1093/* 1101/*
1094 * Set the width/height of the vt window in characters. Units are pixels. 1102 * Set the width/height of the vt window in characters. Units are pixels.
… …
1107 newwidth = wattr.width - szHint.base_width; 1115 newwidth = wattr.width - szHint.base_width;
1108 if (newheight == 0) 1116 if (newheight == 0)
1109 newheight = wattr.height - szHint.base_height; 1117 newheight = wattr.height - szHint.base_height;
1110 } 1118 }
1111 1119
1112 if (newwidth != width || newheight != height) 1120 if (newwidth != vt_width || newheight != vt_height)
1113 { 1121 {
1114 newwidth += szHint.base_width; 1122 newwidth += szHint.base_width;
1115 newheight += szHint.base_height; 1123 newheight += szHint.base_height;
1116 resize_all_windows (newwidth, newheight, 0); 1124 resize_all_windows (newwidth, newheight, 0);
1117 } 1125 }
1118} 1126}
1119 1127
1120/* -------------------------------------------------------------------- * 1128/* -------------------------------------------------------------------- *
1121 * - X INPUT METHOD ROUTINES - * 1129 * - X INPUT METHOD ROUTINES - *
1122 * -------------------------------------------------------------------- */ 1130 * -------------------------------------------------------------------- */
1123#ifdef USE_XIM 1131#if USE_XIM
1124 1132
1125void 1133void
1126rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1134rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1127{ 1135{
1128 fg = pix_colors [Color_fg]; 1136 fg = pix_colors [Color_fg];
… …
1155 status_rect.height = fheight; 1163 status_rect.height = fheight;
1156} 1164}
1157 1165
1158/* Checking whether input method is running. */ 1166/* Checking whether input method is running. */
1159bool 1167bool
1160rxvt_term::IMisRunning () 1168rxvt_term::im_is_running ()
1161{ 1169{
1162 Atom atom; 1170 Atom atom;
1163 Window win; 1171 Window win;
1164 char server[IMBUFSIZ]; 1172 char server[IMBUFSIZ];
1165 1173
… …
1181 1189
1182 return false; 1190 return false;
1183} 1191}
1184 1192
1185void 1193void
1186rxvt_term::IMSendSpot () 1194rxvt_term::im_send_spot ()
1187{ 1195{
1188 XPoint nspot; 1196 XPoint nspot;
1189 XVaNestedList preedit_attr; 1197 XVaNestedList preedit_attr;
1190 1198
1191 if (!Input_Context 1199 if (!Input_Context
… …
1297/* 1305/*
1298 * Try to open a XIM with the current modifiers, then see if we can 1306 * Try to open a XIM with the current modifiers, then see if we can
1299 * open a suitable preedit type 1307 * open a suitable preedit type
1300 */ 1308 */
1301bool 1309bool
1302rxvt_term::IM_get_IC (const char *modifiers) 1310rxvt_term::im_get_ic (const char *modifiers)
1303{ 1311{
1304 int i, j, found; 1312 int i, j, found;
1305 XIM xim; 1313 XIM xim;
1306 XPoint spot; 1314 XPoint spot;
1307 XRectangle rect, status_rect, needed_rect; 1315 XRectangle rect, status_rect, needed_rect;
1308 unsigned long fg, bg; 1316 unsigned long fg, bg;
1309 const char *p; 1317 const char *p;
1310 char **s; 1318 char **s;
1311 XIMStyles *xim_styles; 1319 XIMStyles *xim_styles;
1312#ifdef ENABLE_XIM_ONTHESPOT
1313 XIMCallback xcb[4];
1314#endif
1315 1320
1316 set_environ (envv); 1321 set_environ (envv);
1317 1322
1318 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1323 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1319 return false; 1324 return false;
… …
1459 NULL); 1464 NULL);
1460 } 1465 }
1461#if ENABLE_XIM_ONTHESPOT 1466#if ENABLE_XIM_ONTHESPOT
1462 else if (input_style & XIMPreeditCallbacks) 1467 else if (input_style & XIMPreeditCallbacks)
1463 { 1468 {
1469 XIMCallback xcb[4];
1470
1464 im_set_position (spot); 1471 im_set_position (spot);
1465 1472
1466 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1473 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; 1474 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; 1475 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 1513 // unfortunately, only the focus window is used by XIM, hard to fix
1507 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1514 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1508 vt_select_input (); 1515 vt_select_input ();
1509#endif 1516#endif
1510 1517
1511 IMSetPosition (); 1518 im_set_position ();
1512 1519
1513 return true; 1520 return true;
1514} 1521}
1515 1522
1516void 1523void
… …
1526 im_destroy (); 1533 im_destroy ();
1527 1534
1528 if (Input_Context) 1535 if (Input_Context)
1529 return; 1536 return;
1530 1537
1531#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1532 if (rs[Rs_imLocale]) 1538 if (rs[Rs_imLocale])
1533 SET_LOCALE (rs[Rs_imLocale]); 1539 SET_LOCALE (rs[Rs_imLocale]);
1534#endif
1535 1540
1536 p = rs[Rs_inputMethod]; 1541 p = rs[Rs_inputMethod];
1537 if (p && *p) 1542 if (p && *p)
1538 { 1543 {
1539 bool found = false; 1544 bool found = false;
… …
1544 { 1549 {
1545 if (*s[i]) 1550 if (*s[i])
1546 { 1551 {
1547 strcpy (buf, "@im="); 1552 strcpy (buf, "@im=");
1548 strncat (buf, s[i], IMBUFSIZ - 5); 1553 strncat (buf, s[i], IMBUFSIZ - 5);
1549 if (IM_get_IC (buf)) 1554 if (im_get_ic (buf))
1550 { 1555 {
1551 found = true; 1556 found = true;
1552 break; 1557 break;
1553 } 1558 }
1554 } 1559 }
… …
1559 if (found) 1564 if (found)
1560 goto done; 1565 goto done;
1561 } 1566 }
1562 1567
1563 /* try with XMODIFIERS env. var. */ 1568 /* try with XMODIFIERS env. var. */
1564 if (IM_get_IC ("")) 1569 if (im_get_ic (""))
1565 goto done; 1570 goto done;
1566 1571
1567 /* try with no modifiers base IF the user didn't specify an IM */ 1572 /* try with no modifiers base IF the user didn't specify an IM */
1568 if (IM_get_IC ("@im=none")) 1573 if (im_get_ic ("@im=none"))
1569 goto done; 1574 goto done;
1570 1575
1571done: 1576done:
1572#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1573 if (rs[Rs_imLocale]) 1577 if (rs[Rs_imLocale])
1574 SET_LOCALE (locale); 1578 SET_LOCALE (locale);
1575#endif
1576} 1579}
1577 1580
1578void 1581void
1579rxvt_term::IMSetPosition () 1582rxvt_term::im_set_position ()
1580{ 1583{
1581 XRectangle preedit_rect, status_rect, *needed_rect; 1584 XRectangle preedit_rect, status_rect, *needed_rect;
1582 XVaNestedList preedit_attr, status_attr; 1585 XVaNestedList preedit_attr, status_attr;
1583 1586
1584 if (!Input_Context 1587 if (!Input_Context
1585 || !focus 1588 || !focus
1586 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1589 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1587 || !IMisRunning ()) 1590 || !im_is_running ())
1588 return; 1591 return;
1589 1592
1590 if (input_style & XIMPreeditPosition) 1593 if (input_style & XIMPreeditPosition)
1591 { 1594 {
1592 im_set_size (preedit_rect); 1595 im_set_size (preedit_rect);
… …
1625{ 1628{
1626 Window cr; 1629 Window cr;
1627 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr); 1630 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1628} 1631}
1629 1632
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 1633#ifdef HAVE_BG_PIXMAP
1653 1634
1654void 1635void
1655rxvt_term::update_background () 1636rxvt_term::update_background ()
1656{ 1637{
1657 if (update_background_ev.is_active ()) 1638 if (update_background_ev.is_active ())
1658 return; 1639 return;
1659 1640
1660 bg_invalidate (); 1641 bg_invalidate ();
1642
1643 if (!mapped)
1644 return;
1661 1645
1662 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1646 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1663 1647
1664 if (to_wait <= 0.) 1648 if (to_wait <= 0.)
1665 bg_render (); 1649 bg_render ();

Diff Legend

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