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.312 by root, Tue Nov 4 16:41:12 2008 UTC vs.
Revision 1.344 by root, Fri Jan 7 21:17:08 2011 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <pcg@goof.com>
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 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <cassert>
40#include <csignal> 42#include <csignal>
41#include <cstring> 43#include <cstring>
42 44
43#include <termios.h> 45#include <termios.h>
44 46
… …
49# ifdef HAVE_SETLOCALE 51# ifdef HAVE_SETLOCALE
50# include <clocale> 52# include <clocale>
51# endif 53# endif
52#endif 54#endif
53 55
56struct termios rxvt_term::def_tio;
54vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
55 58
56// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
58 61
… …
93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94{ 97{
95 compose_char *cc; 98 compose_char *cc;
96 99
97 // break compose chains, as stupid readline really likes to duplicate 100 // break compose chains, as stupid readline really likes to duplicate
98 // composing characters for some reason near the end of a line. 101 // composing characters for some reason, near the end of a line.
99 cc = (*this)[c1]; 102 cc = (*this)[c1];
100 while (cc) 103 while (cc)
101 { 104 {
102 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
104 } 107 }
105 108
106 // check to see wether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.end (); cc-- > v.begin (); )
108 {
109 if (cc->c1 == c1 && cc->c2 == c2) 111 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 112 return COMPOSE_LO + (cc - v.begin ());
111 }
112 113
113 // allocate a new combination 114 // allocate a new combination
114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115 { 116 {
116 static int seen; 117 static int seen;
117 118
118 if (!seen++) 119 if (!seen++)
119 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 120 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120 121
121 return REPLACEMENT_CHAR; 122 return REPLACEMENT_CHAR;
122 } 123 }
123 124
124 v.push_back (compose_char (c1, c2)); 125 v.push_back (compose_char (c1, c2));
… …
237#endif 238#endif
238 239
239 if (display) 240 if (display)
240 { 241 {
241 selection_clear (); 242 selection_clear ();
243 selection_clear (true);
242 244
243#ifdef USE_XIM 245#ifdef USE_XIM
244 im_destroy (); 246 im_destroy ();
245#endif 247#endif
246 scrollBar.destroy (); 248 scrollBar.destroy ();
… …
271 /* clear all resources */ 273 /* clear all resources */
272 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
273 free (allocated [i]); 275 free (allocated [i]);
274 276
275 free (selection.text); 277 free (selection.text);
278 free (selection.clip_text);
276 // TODO: manage env vars in child only(!) 279 // TODO: manage env vars in child only(!)
277 free (env_display); 280 free (env_display);
278 free (env_term); 281 free (env_term);
279 free (locale); 282 free (locale);
280 free (v_buffer); 283 free (v_buffer);
… …
356 make_current (); 359 make_current ();
357 360
358 delete this; 361 delete this;
359} 362}
360 363
364void
365rxvt_term::set_option (uint8_t opt, bool set)
366{
367 if (!opt)
368 return;
369
370 uint8_t mask = 1 << (opt & 7);
371 uint8_t &val = options [opt >> 3];
372
373 val = val & ~mask | (set ? mask : 0);
374}
375
361/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
362/* 377/*
363 * Exit gracefully, clearing the utmp entry and restoring tty attributes 378 * Exit gracefully, clearing the utmp entry and restoring tty attributes
364 * TODO: if debugging, this should free up any known resources if we can 379 * TODO: if debugging, this should free up any known resources if we can
365 */ 380 */
… …
377print_x_error (Display *dpy, XErrorEvent *event) 392print_x_error (Display *dpy, XErrorEvent *event)
378{ 393{
379 char buffer[BUFSIZ]; 394 char buffer[BUFSIZ];
380 char mesg[BUFSIZ]; 395 char mesg[BUFSIZ];
381 char number[32]; 396 char number[32];
382 char *mtype = "XlibMessage"; 397 const char mtype[] = "XlibMessage";
383 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 398 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
384 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 399 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
385 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 400 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
386 rxvt_warn ("%s: %s\n", mesg, buffer); 401 rxvt_warn ("%s: %s\n", mesg, buffer);
387 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
388 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
389 sprintf(number, "%d", event->request_code); 404 sprintf(number, "%d", event->request_code);
390 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 405 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
391 rxvt_warn ("(which is %s)\n", buffer); 406 rxvt_warn ("(which is %s)\n", buffer);
392 if (event->request_code >= 128) { 407 if (event->request_code >= 128) {
393 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 408 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
394 mesg, BUFSIZ); 409 mesg, BUFSIZ);
395 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
396 } 411 }
397 if ((event->error_code == BadWindow) || 412 if ((event->error_code == BadWindow) ||
398 (event->error_code == BadPixmap) || 413 (event->error_code == BadPixmap) ||
399 (event->error_code == BadCursor) || 414 (event->error_code == BadCursor) ||
400 (event->error_code == BadFont) || 415 (event->error_code == BadFont) ||
401 (event->error_code == BadDrawable) || 416 (event->error_code == BadDrawable) ||
402 (event->error_code == BadColor) || 417 (event->error_code == BadColor) ||
403 (event->error_code == BadGC) || 418 (event->error_code == BadGC) ||
404 (event->error_code == BadIDChoice) || 419 (event->error_code == BadIDChoice) ||
405 (event->error_code == BadValue) || 420 (event->error_code == BadValue) ||
406 (event->error_code == BadAtom)) { 421 (event->error_code == BadAtom)) {
407 if (event->error_code == BadValue) 422 if (event->error_code == BadValue)
408 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 423 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
409 mesg, BUFSIZ); 424 mesg, BUFSIZ);
410 else if (event->error_code == BadAtom) 425 else if (event->error_code == BadAtom)
411 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 426 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
412 mesg, BUFSIZ); 427 mesg, BUFSIZ);
413 else 428 else
414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
415 mesg, BUFSIZ); 430 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
417 } 432 }
418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
419 mesg, BUFSIZ); 434 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
421} 436}
422#endif 437#endif
423 438
424int 439int
… …
471 rxvt_emergency_cleanup (); 486 rxvt_emergency_cleanup ();
472 w.stop (); 487 w.stop ();
473 kill (getpid (), w.signum); 488 kill (getpid (), w.signum);
474} 489}
475 490
491static void
492rxvt_get_ttymode (struct termios *tio)
493{
494 if (tcgetattr (STDIN_FILENO, tio) < 0)
495 memset (tio, 0, sizeof (struct termios));
496
497 for (int i = 0; i < NCCS; i++)
498 tio->c_cc[i] = VDISABLE;
499
500 tio->c_cc[VINTR] = CINTR;
501 tio->c_cc[VQUIT] = CQUIT;
502 tio->c_cc[VERASE] = CERASE;
503#ifdef VERASE2
504 tio->c_cc[VERASE2] = CERASE2;
505#endif
506 tio->c_cc[VKILL] = CKILL;
507 tio->c_cc[VEOF] = CEOF;
508 tio->c_cc[VSTART] = CSTART;
509 tio->c_cc[VSTOP] = CSTOP;
510 tio->c_cc[VSUSP] = CSUSP;
511# ifdef VDSUSP
512 tio->c_cc[VDSUSP] = CDSUSP;
513# endif
514# ifdef VREPRINT
515 tio->c_cc[VREPRINT] = CRPRNT;
516# endif
517# ifdef VDISCRD
518 tio->c_cc[VDISCRD] = CFLUSH;
519# endif
520# ifdef VWERSE
521 tio->c_cc[VWERSE] = CWERASE;
522# endif
523# ifdef VLNEXT
524 tio->c_cc[VLNEXT] = CLNEXT;
525# endif
526# ifdef VSTATUS
527 tio->c_cc[VSTATUS] = CSTATUS;
528# endif
529
530# if VMIN != VEOF
531 tio->c_cc[VMIN] = 1;
532# endif
533# if VTIME != VEOL
534 tio->c_cc[VTIME] = 0;
535# endif
536
537 /* input modes */
538 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
539# ifdef IMAXBEL
540 | IMAXBEL
541# endif
542 | IXON);
543
544 /* output modes */
545 tio->c_oflag = (OPOST | ONLCR);
546
547 /* control modes */
548 tio->c_cflag = (CS8 | CREAD);
549
550 /* local modes */
551 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
552# if defined (ECHOCTL) && defined (ECHOKE)
553 | ECHOCTL | ECHOKE
554# endif
555 | ECHOE | ECHOK);
556}
557
476char **rxvt_environ; // startup environment 558char **rxvt_environ; // startup environment
477 559
478void 560void
479rxvt_init () 561rxvt_init ()
480{ 562{
481 ptytty::init (); 563 assert (("fontMask must not overlap other RS masks",
564 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
482 565
566 rxvt_get_ttymode (&rxvt_term::def_tio);
567
568 // get rid of stdin/stdout as we don't need them, to free resources
569 dup2 (STDERR_FILENO, STDIN_FILENO);
570 dup2 (STDERR_FILENO, STDOUT_FILENO);
571
483 if (!ev_default_loop (0)) 572 if (!ev_default_loop ())
484 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 573 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
485 574
486 rxvt_environ = environ; 575 rxvt_environ = environ;
487 576
488 signal (SIGHUP, SIG_IGN); 577 signal (SIGHUP, SIG_IGN);
489 signal (SIGPIPE, SIG_IGN); 578 signal (SIGPIPE, SIG_IGN);
490 579
491 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 580 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
492 sig_handlers.sw_int.start (SIGINT); ev_unref (); 581 sig_handlers.sw_int.start (SIGINT); ev_unref ();
493
494 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
495 /* signal (SIGURG, SIG_DFL); */
496 582
497 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 583 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
498 // TODO: handle this with exceptions and tolerate the memory loss 584 // TODO: handle this with exceptions and tolerate the memory loss
499 XSetIOErrorHandler (rxvt_xioerror_handler); 585 XSetIOErrorHandler (rxvt_xioerror_handler);
500 586
… …
646 732
647 ws.ws_col = ncol; 733 ws.ws_col = ncol;
648 ws.ws_row = nrow; 734 ws.ws_row = nrow;
649 ws.ws_xpixel = width; 735 ws.ws_xpixel = width;
650 ws.ws_ypixel = height; 736 ws.ws_ypixel = height;
651 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 737 ioctl (pty->pty, TIOCSWINSZ, &ws);
652 738
653#if 0 739#if 0
654 // TIOCSWINSZ is supposed to do this automatically and correctly 740 // TIOCSWINSZ is supposed to do this automatically and correctly
655 if (cmd_pid) /* force through to the command */ 741 if (cmd_pid) /* force through to the command */
656 kill (-cmd_pid, SIGWINCH); 742 kill (-cmd_pid, SIGWINCH);
… …
686#endif 772#endif
687 773
688 delete fontset[0]; 774 delete fontset[0];
689 fontset[0] = fs; 775 fontset[0] = fs;
690 776
691 prop = (*fs)[1]->properties (); 777 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
692 prop.height += lineSpace; 778 prop.height += lineSpace;
779 prop.width += letterSpace;
693 780
694 fs->set_prop (prop, false); 781 fs->set_prop (prop, false);
695 782
696 fwidth = prop.width; 783 fwidth = prop.width;
697 fheight = prop.height; 784 fheight = prop.height;
… …
747 prop, XA_STRING, 8, PropModeReplace, 834 prop, XA_STRING, 8, PropModeReplace,
748 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 835 (const unsigned char *)str, len >= 0 ? len : strlen (str));
749} 836}
750 837
751void 838void
839rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
840{
841 XTextProperty ct;
842
843 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
844 {
845 XSetTextProperty (dpy, parent[0], &ct, prop);
846 XFree (ct.value);
847 }
848}
849
850void
752rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 851rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
753{ 852{
754 wchar_t *ws = rxvt_mbstowcs (str, len); 853 wchar_t *ws = rxvt_mbstowcs (str, len);
755 char *s = rxvt_wcstoutf8 (ws); 854 char *s = rxvt_wcstoutf8 (ws);
756 855
… …
766/*----------------------------------------------------------------------*/ 865/*----------------------------------------------------------------------*/
767/* xterm sequences - title, iconName, color (exptl) */ 866/* xterm sequences - title, iconName, color (exptl) */
768void 867void
769rxvt_term::set_title (const char *str) 868rxvt_term::set_title (const char *str)
770{ 869{
771 set_string_property (XA_WM_NAME, str); 870 set_mbstring_property (XA_WM_NAME, str);
772#if ENABLE_EWMH 871#if ENABLE_EWMH
773 set_utf8_property (xa[XA_NET_WM_NAME], str); 872 set_utf8_property (xa[XA_NET_WM_NAME], str);
774#endif 873#endif
775} 874}
776 875
777void 876void
778rxvt_term::set_icon_name (const char *str) 877rxvt_term::set_icon_name (const char *str)
779{ 878{
780 set_string_property (XA_WM_ICON_NAME, str); 879 set_mbstring_property (XA_WM_ICON_NAME, str);
781#if ENABLE_EWMH 880#if ENABLE_EWMH
782 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 881 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
783#endif 882#endif
784} 883}
785 884
… …
913 1012
914 window_calc (newwidth, newheight); 1013 window_calc (newwidth, newheight);
915 1014
916 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)); 1015 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
917 1016
1017 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
918 if (set_hint) 1018 if (set_hint)
919 { 1019 {
920 szHint.flags &= ~(PBaseSize | PResizeInc); 1020 szHint.flags &= ~(PBaseSize | PResizeInc);
921 XSetWMNormalHints (dpy, parent[0], &szHint); 1021 XSetWMNormalHints (dpy, parent[0], &szHint);
922 szHint.flags |= PBaseSize | PResizeInc; 1022 szHint.flags |= PBaseSize | PResizeInc;
… …
968#else 1068#else
969 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1069 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
970#endif 1070#endif
971 } 1071 }
972 1072
1073 if (set_hint)
1074 XSetWMNormalHints (dpy, parent[0], &szHint);
1075
973 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1076 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
974 1077
975 if (fix_screen || newwidth != old_width || newheight != old_height) 1078 if (fix_screen || newwidth != old_width || newheight != old_height)
976 { 1079 {
977 if (scrollBar.state) 1080 if (scrollBar.state)
… …
983 1086
984#ifdef HAVE_BG_PIXMAP 1087#ifdef HAVE_BG_PIXMAP
985 if (bgPixmap.window_size_sensitive ()) 1088 if (bgPixmap.window_size_sensitive ())
986 update_background (); 1089 update_background ();
987#endif 1090#endif
988
989 scr_clear ();
990 } 1091 }
991
992 if (set_hint)
993 XSetWMNormalHints (dpy, parent[0], &szHint);
994 1092
995 if (fix_screen || old_height == 0) 1093 if (fix_screen || old_height == 0)
996 scr_reset (); 1094 scr_reset ();
997
998 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
999 //scr_touch (false);
1000 1095
1001#ifdef HAVE_BG_PIXMAP 1096#ifdef HAVE_BG_PIXMAP
1002// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? 1097// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1003// if (bgPixmap.pixmap) 1098// if (bgPixmap.pixmap)
1004// scr_touch (false); 1099// scr_touch (false);
… …
1076 1171
1077/* Checking whether input method is running. */ 1172/* Checking whether input method is running. */
1078bool 1173bool
1079rxvt_term::IMisRunning () 1174rxvt_term::IMisRunning ()
1080{ 1175{
1081 char *p;
1082 Atom atom; 1176 Atom atom;
1083 Window win; 1177 Window win;
1084 char server[IMBUFSIZ]; 1178 char server[IMBUFSIZ];
1085 1179
1086 /* get current locale modifier */ 1180 /* get current locale modifier */
1087 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1181 if (char *p = XSetLocaleModifiers (0))
1088 { 1182 {
1089 strcpy (server, "@server="); 1183 strcpy (server, "@server=");
1090 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1184 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1091 1185
1092 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1186 if (p = strchr (server + 1, '@')) /* first one only */
1093 *p = '\0'; 1187 *p = '\0';
1094 1188
1095 atom = XInternAtom (dpy, server, False); 1189 atom = XInternAtom (dpy, server, False);
1096 win = XGetSelectionOwner (dpy, atom); 1190 win = XGetSelectionOwner (dpy, atom);
1097 1191
… …
1164 1258
1165 term->make_current (); 1259 term->make_current ();
1166 1260
1167 if (text) 1261 if (text)
1168 { 1262 {
1169 void *str; 1263 wchar_t *str;
1170 1264
1171 if (!text->encoding_is_wchar && text->string.multi_byte) 1265 if (!text->encoding_is_wchar && text->string.multi_byte)
1172 { 1266 {
1173 // of course, X makes it ugly again 1267 // of course, X makes it ugly again
1174 if (term->rs[Rs_imLocale]) 1268 if (term->rs[Rs_imLocale])
1175 SET_LOCALE (term->rs[Rs_imLocale]); 1269 SET_LOCALE (term->rs[Rs_imLocale]);
1176 1270
1177 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1271 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1178 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1272 mbstowcs (str, text->string.multi_byte, text->length + 1);
1179 1273
1180 if (term->rs[Rs_imLocale]) 1274 if (term->rs[Rs_imLocale])
1181 SET_LOCALE (term->locale); 1275 SET_LOCALE (term->locale);
1182 } 1276 }
1183 else 1277 else
1184 str = (void *)text->string.wide_char; 1278 str = text->string.wide_char;
1185 1279
1186 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1280 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1187 DT_INT, call_data->caret, 1281 DT_INT, call_data->caret,
1188 DT_INT, call_data->chg_first, 1282 DT_INT, call_data->chg_first,
1189 DT_INT, call_data->chg_length, 1283 DT_INT, call_data->chg_length,
… …
1543void 1637void
1544rxvt_term::get_window_origin (int &x, int &y) 1638rxvt_term::get_window_origin (int &x, int &y)
1545{ 1639{
1546 Window cr; 1640 Window cr;
1547 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1641 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1548/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1549} 1642}
1550 1643
1551Pixmap 1644Pixmap
1552rxvt_term::get_pixmap_property (int prop_id) 1645rxvt_term::get_pixmap_property (Atom property)
1553{ 1646{
1554 if (prop_id > 0 && prop_id < NUM_XA) 1647 Pixmap pixmap = None;
1555 if (xa[prop_id]) 1648
1556 {
1557 int aformat; 1649 int aformat;
1558 unsigned long nitems, bytes_after; 1650 unsigned long nitems, bytes_after;
1559 Atom atype; 1651 Atom atype;
1560 unsigned char *prop = NULL; 1652 unsigned char *prop;
1561 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1653 int result = XGetWindowProperty (dpy, display->root, property,
1562 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1654 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1563 &nitems, &bytes_after, &prop); 1655 &nitems, &bytes_after, &prop);
1564 if (result == Success && prop && atype == XA_PIXMAP) 1656 if (result == Success)
1657 {
1658 if (atype == XA_PIXMAP)
1565 return *(Pixmap *)prop; 1659 pixmap = *(Pixmap *)prop;
1660 XFree (prop);
1566 } 1661 }
1567 1662
1568 return None; 1663 return pixmap;
1569} 1664}
1570 1665
1571#ifdef HAVE_BG_PIXMAP 1666#ifdef HAVE_BG_PIXMAP
1572# if TRACE_PIXMAPS
1573# undef update_background
1574void
1575rxvt_term::trace_update_background (const char *file, int line)
1576{
1577 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1578 update_background ();
1579}
1580# endif
1581 1667
1582void 1668void
1583rxvt_term::update_background () 1669rxvt_term::update_background ()
1584{ 1670{
1585 if (update_background_ev.is_active ()) 1671 if (update_background_ev.is_active ())

Diff Legend

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