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.310 by root, Wed Feb 27 01:05:55 2008 UTC vs.
Revision 1.343 by sf-exg, Tue Dec 21 10:37:42 2010 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
… …
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 { 111 {
109 if (cc->c1 == c1 && cc->c2 == c2) 112 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 113 return COMPOSE_LO + (cc - v.begin ());
111 } 114 }
… …
227 delete fontset[0]; 230 delete fontset[0];
228 231
229#ifdef HAVE_BG_PIXMAP 232#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy (); 233 bgPixmap.destroy ();
231#endif 234#endif
235#ifdef HAVE_AFTERIMAGE
236 if (asv)
237 destroy_asvisual (asv, 0);
238 if (asimman)
239 destroy_image_manager (asimman, 0);
240#endif
232 241
233 if (display) 242 if (display)
234 { 243 {
235 selection_clear (); 244 selection_clear ();
245 selection_clear (true);
236 246
237#ifdef USE_XIM 247#ifdef USE_XIM
238 im_destroy (); 248 im_destroy ();
239#endif 249#endif
240 scrollBar.destroy (); 250 scrollBar.destroy ();
… …
265 /* clear all resources */ 275 /* clear all resources */
266 for (int i = 0; i < allocated.size (); i++) 276 for (int i = 0; i < allocated.size (); i++)
267 free (allocated [i]); 277 free (allocated [i]);
268 278
269 free (selection.text); 279 free (selection.text);
280 free (selection.clip_text);
270 // TODO: manage env vars in child only(!) 281 // TODO: manage env vars in child only(!)
271 free (env_display); 282 free (env_display);
272 free (env_term); 283 free (env_term);
273 free (locale); 284 free (locale);
274 free (v_buffer); 285 free (v_buffer);
… …
350 make_current (); 361 make_current ();
351 362
352 delete this; 363 delete this;
353} 364}
354 365
366void
367rxvt_term::set_option (uint8_t opt, bool set)
368{
369 if (!opt)
370 return;
371
372 uint8_t mask = 1 << (opt & 7);
373 uint8_t &val = options [opt >> 3];
374
375 val = val & ~mask | (set ? mask : 0);
376}
377
355/*----------------------------------------------------------------------*/ 378/*----------------------------------------------------------------------*/
356/* 379/*
357 * Exit gracefully, clearing the utmp entry and restoring tty attributes 380 * Exit gracefully, clearing the utmp entry and restoring tty attributes
358 * TODO: if debugging, this should free up any known resources if we can 381 * TODO: if debugging, this should free up any known resources if we can
359 */ 382 */
… …
371print_x_error (Display *dpy, XErrorEvent *event) 394print_x_error (Display *dpy, XErrorEvent *event)
372{ 395{
373 char buffer[BUFSIZ]; 396 char buffer[BUFSIZ];
374 char mesg[BUFSIZ]; 397 char mesg[BUFSIZ];
375 char number[32]; 398 char number[32];
376 char *mtype = "XlibMessage"; 399 const char mtype[] = "XlibMessage";
377 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 400 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
378 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 401 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
379 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 402 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
380 rxvt_warn ("%s: %s\n", mesg, buffer); 403 rxvt_warn ("%s: %s\n", mesg, buffer);
381 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 404 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
382 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 405 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
383 sprintf(number, "%d", event->request_code); 406 sprintf(number, "%d", event->request_code);
384 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 407 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
385 rxvt_warn ("(which is %s)\n", buffer); 408 rxvt_warn ("(which is %s)\n", buffer);
386 if (event->request_code >= 128) { 409 if (event->request_code >= 128) {
387 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 410 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
388 mesg, BUFSIZ); 411 mesg, BUFSIZ);
389 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
390 } 413 }
391 if ((event->error_code == BadWindow) || 414 if ((event->error_code == BadWindow) ||
392 (event->error_code == BadPixmap) || 415 (event->error_code == BadPixmap) ||
393 (event->error_code == BadCursor) || 416 (event->error_code == BadCursor) ||
394 (event->error_code == BadFont) || 417 (event->error_code == BadFont) ||
395 (event->error_code == BadDrawable) || 418 (event->error_code == BadDrawable) ||
396 (event->error_code == BadColor) || 419 (event->error_code == BadColor) ||
397 (event->error_code == BadGC) || 420 (event->error_code == BadGC) ||
398 (event->error_code == BadIDChoice) || 421 (event->error_code == BadIDChoice) ||
399 (event->error_code == BadValue) || 422 (event->error_code == BadValue) ||
400 (event->error_code == BadAtom)) { 423 (event->error_code == BadAtom)) {
401 if (event->error_code == BadValue) 424 if (event->error_code == BadValue)
402 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 425 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
403 mesg, BUFSIZ); 426 mesg, BUFSIZ);
404 else if (event->error_code == BadAtom) 427 else if (event->error_code == BadAtom)
405 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 428 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
406 mesg, BUFSIZ); 429 mesg, BUFSIZ);
407 else 430 else
408 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
409 mesg, BUFSIZ); 432 mesg, BUFSIZ);
410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
411 } 434 }
412 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 435 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
413 mesg, BUFSIZ); 436 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
415} 438}
416#endif 439#endif
417 440
418int 441int
… …
465 rxvt_emergency_cleanup (); 488 rxvt_emergency_cleanup ();
466 w.stop (); 489 w.stop ();
467 kill (getpid (), w.signum); 490 kill (getpid (), w.signum);
468} 491}
469 492
493static void
494rxvt_get_ttymode (struct termios *tio)
495{
496 if (tcgetattr (STDIN_FILENO, tio) < 0)
497 memset (tio, 0, sizeof (struct termios));
498
499 for (int i = 0; i < NCCS; i++)
500 tio->c_cc[i] = VDISABLE;
501
502 tio->c_cc[VINTR] = CINTR;
503 tio->c_cc[VQUIT] = CQUIT;
504 tio->c_cc[VERASE] = CERASE;
505#ifdef VERASE2
506 tio->c_cc[VERASE2] = CERASE2;
507#endif
508 tio->c_cc[VKILL] = CKILL;
509 tio->c_cc[VEOF] = CEOF;
510 tio->c_cc[VSTART] = CSTART;
511 tio->c_cc[VSTOP] = CSTOP;
512 tio->c_cc[VSUSP] = CSUSP;
513# ifdef VDSUSP
514 tio->c_cc[VDSUSP] = CDSUSP;
515# endif
516# ifdef VREPRINT
517 tio->c_cc[VREPRINT] = CRPRNT;
518# endif
519# ifdef VDISCRD
520 tio->c_cc[VDISCRD] = CFLUSH;
521# endif
522# ifdef VWERSE
523 tio->c_cc[VWERSE] = CWERASE;
524# endif
525# ifdef VLNEXT
526 tio->c_cc[VLNEXT] = CLNEXT;
527# endif
528# ifdef VSTATUS
529 tio->c_cc[VSTATUS] = CSTATUS;
530# endif
531
532# if VMIN != VEOF
533 tio->c_cc[VMIN] = 1;
534# endif
535# if VTIME != VEOL
536 tio->c_cc[VTIME] = 0;
537# endif
538
539 /* input modes */
540 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
541# ifdef IMAXBEL
542 | IMAXBEL
543# endif
544 | IXON);
545
546 /* output modes */
547 tio->c_oflag = (OPOST | ONLCR);
548
549 /* control modes */
550 tio->c_cflag = (CS8 | CREAD);
551
552 /* local modes */
553 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
554# if defined (ECHOCTL) && defined (ECHOKE)
555 | ECHOCTL | ECHOKE
556# endif
557 | ECHOE | ECHOK);
558}
559
470char **rxvt_environ; // startup environment 560char **rxvt_environ; // startup environment
471 561
472void 562void
473rxvt_init () 563rxvt_init ()
474{ 564{
475 ptytty::init (); 565 assert (("fontMask must not overlap other RS masks",
566 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
476 567
568 rxvt_get_ttymode (&rxvt_term::def_tio);
569
570 // get rid of stdin/stdout as we don't need them, to free resources
571 dup2 (STDERR_FILENO, STDIN_FILENO);
572 dup2 (STDERR_FILENO, STDOUT_FILENO);
573
477 if (!ev_default_loop (0)) 574 if (!ev_default_loop ())
478 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 575 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
479 576
480 rxvt_environ = environ; 577 rxvt_environ = environ;
481 578
482 signal (SIGHUP, SIG_IGN); 579 signal (SIGHUP, SIG_IGN);
483 signal (SIGPIPE, SIG_IGN); 580 signal (SIGPIPE, SIG_IGN);
484 581
485 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 582 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
486 sig_handlers.sw_int.start (SIGINT); ev_unref (); 583 sig_handlers.sw_int.start (SIGINT); ev_unref ();
487
488 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
489 /* signal (SIGURG, SIG_DFL); */
490 584
491 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 585 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
492 // TODO: handle this with exceptions and tolerate the memory loss 586 // TODO: handle this with exceptions and tolerate the memory loss
493 XSetIOErrorHandler (rxvt_xioerror_handler); 587 XSetIOErrorHandler (rxvt_xioerror_handler);
494 588
… …
619 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 713 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
620 714
621 if (recalc_y) 715 if (recalc_y)
622 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 716 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
623 717
624 ncol = width / fwidth; 718 ncol = width / fwidth;
625 nrow = height / fheight; 719 nrow = height / fheight;
626} 720}
627 721
628/*----------------------------------------------------------------------*/ 722/*----------------------------------------------------------------------*/
629/* 723/*
… …
640 734
641 ws.ws_col = ncol; 735 ws.ws_col = ncol;
642 ws.ws_row = nrow; 736 ws.ws_row = nrow;
643 ws.ws_xpixel = width; 737 ws.ws_xpixel = width;
644 ws.ws_ypixel = height; 738 ws.ws_ypixel = height;
645 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 739 ioctl (pty->pty, TIOCSWINSZ, &ws);
646 740
647#if 0 741#if 0
648 // TIOCSWINSZ is supposed to do this automatically and correctly 742 // TIOCSWINSZ is supposed to do this automatically and correctly
649 if (cmd_pid) /* force through to the command */ 743 if (cmd_pid) /* force through to the command */
650 kill (-cmd_pid, SIGWINCH); 744 kill (-cmd_pid, SIGWINCH);
… …
680#endif 774#endif
681 775
682 delete fontset[0]; 776 delete fontset[0];
683 fontset[0] = fs; 777 fontset[0] = fs;
684 778
685 prop = (*fs)[1]->properties (); 779 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
686 prop.height += lineSpace; 780 prop.height += lineSpace;
781 prop.width += letterSpace;
687 782
688 fs->set_prop (prop, false); 783 fs->set_prop (prop, false);
689 784
690 fwidth = prop.width; 785 fwidth = prop.width;
691 fheight = prop.height; 786 fheight = prop.height;
… …
741 prop, XA_STRING, 8, PropModeReplace, 836 prop, XA_STRING, 8, PropModeReplace,
742 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 837 (const unsigned char *)str, len >= 0 ? len : strlen (str));
743} 838}
744 839
745void 840void
841rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
842{
843 XTextProperty ct;
844
845 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
846 {
847 XSetTextProperty (dpy, parent[0], &ct, prop);
848 XFree (ct.value);
849 }
850}
851
852void
746rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 853rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
747{ 854{
748 wchar_t *ws = rxvt_mbstowcs (str, len); 855 wchar_t *ws = rxvt_mbstowcs (str, len);
749 char *s = rxvt_wcstoutf8 (ws); 856 char *s = rxvt_wcstoutf8 (ws);
750 857
… …
760/*----------------------------------------------------------------------*/ 867/*----------------------------------------------------------------------*/
761/* xterm sequences - title, iconName, color (exptl) */ 868/* xterm sequences - title, iconName, color (exptl) */
762void 869void
763rxvt_term::set_title (const char *str) 870rxvt_term::set_title (const char *str)
764{ 871{
765 set_string_property (XA_WM_NAME, str); 872 set_mbstring_property (XA_WM_NAME, str);
766#if ENABLE_EWMH 873#if ENABLE_EWMH
767 set_utf8_property (xa[XA_NET_WM_NAME], str); 874 set_utf8_property (xa[XA_NET_WM_NAME], str);
768#endif 875#endif
769} 876}
770 877
771void 878void
772rxvt_term::set_icon_name (const char *str) 879rxvt_term::set_icon_name (const char *str)
773{ 880{
774 set_string_property (XA_WM_ICON_NAME, str); 881 set_mbstring_property (XA_WM_ICON_NAME, str);
775#if ENABLE_EWMH 882#if ENABLE_EWMH
776 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 883 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
777#endif 884#endif
778} 885}
779 886
… …
905 int old_width = szHint.width; 1012 int old_width = szHint.width;
906 int old_height = szHint.height; 1013 int old_height = szHint.height;
907 1014
908 window_calc (newwidth, newheight); 1015 window_calc (newwidth, newheight);
909 1016
910 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1017 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1018
1019 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1020 if (set_hint)
1021 {
1022 szHint.flags &= ~(PBaseSize | PResizeInc);
911 XSetWMNormalHints (dpy, parent[0], &szHint); 1023 XSetWMNormalHints (dpy, parent[0], &szHint);
1024 szHint.flags |= PBaseSize | PResizeInc;
1025 }
912 1026
913 if (!ignoreparent) 1027 if (!ignoreparent)
914 { 1028 {
915#ifdef SMART_RESIZE 1029#ifdef SMART_RESIZE
916 /* 1030 /*
… …
956#else 1070#else
957 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1071 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
958#endif 1072#endif
959 } 1073 }
960 1074
1075 if (set_hint)
1076 XSetWMNormalHints (dpy, parent[0], &szHint);
1077
961 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1078 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
962 1079
963 if (fix_screen || newwidth != old_width || newheight != old_height) 1080 if (fix_screen || newwidth != old_width || newheight != old_height)
964 { 1081 {
965 if (scrollBar.state) 1082 if (scrollBar.state)
… …
971 1088
972#ifdef HAVE_BG_PIXMAP 1089#ifdef HAVE_BG_PIXMAP
973 if (bgPixmap.window_size_sensitive ()) 1090 if (bgPixmap.window_size_sensitive ())
974 update_background (); 1091 update_background ();
975#endif 1092#endif
976
977 scr_clear ();
978 } 1093 }
979 1094
980 if (fix_screen || old_height == 0) 1095 if (fix_screen || old_height == 0)
981 scr_reset (); 1096 scr_reset ();
982
983 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
984 //scr_touch (false);
985 1097
986#ifdef HAVE_BG_PIXMAP 1098#ifdef HAVE_BG_PIXMAP
987// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? 1099// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
988// if (bgPixmap.pixmap) 1100// if (bgPixmap.pixmap)
989// scr_touch (false); 1101// scr_touch (false);
… …
1061 1173
1062/* Checking whether input method is running. */ 1174/* Checking whether input method is running. */
1063bool 1175bool
1064rxvt_term::IMisRunning () 1176rxvt_term::IMisRunning ()
1065{ 1177{
1066 char *p;
1067 Atom atom; 1178 Atom atom;
1068 Window win; 1179 Window win;
1069 char server[IMBUFSIZ]; 1180 char server[IMBUFSIZ];
1070 1181
1071 /* get current locale modifier */ 1182 /* get current locale modifier */
1072 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1183 if (char *p = XSetLocaleModifiers (0))
1073 { 1184 {
1074 strcpy (server, "@server="); 1185 strcpy (server, "@server=");
1075 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1186 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1076 1187
1077 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1188 if (p = strchr (server + 1, '@')) /* first one only */
1078 *p = '\0'; 1189 *p = '\0';
1079 1190
1080 atom = XInternAtom (dpy, server, False); 1191 atom = XInternAtom (dpy, server, False);
1081 win = XGetSelectionOwner (dpy, atom); 1192 win = XGetSelectionOwner (dpy, atom);
1082 1193
… …
1149 1260
1150 term->make_current (); 1261 term->make_current ();
1151 1262
1152 if (text) 1263 if (text)
1153 { 1264 {
1154 void *str; 1265 wchar_t *str;
1155 1266
1156 if (!text->encoding_is_wchar && text->string.multi_byte) 1267 if (!text->encoding_is_wchar && text->string.multi_byte)
1157 { 1268 {
1158 // of course, X makes it ugly again 1269 // of course, X makes it ugly again
1159 if (term->rs[Rs_imLocale]) 1270 if (term->rs[Rs_imLocale])
1160 SET_LOCALE (term->rs[Rs_imLocale]); 1271 SET_LOCALE (term->rs[Rs_imLocale]);
1161 1272
1162 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1273 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1163 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1274 mbstowcs (str, text->string.multi_byte, text->length + 1);
1164 1275
1165 if (term->rs[Rs_imLocale]) 1276 if (term->rs[Rs_imLocale])
1166 SET_LOCALE (term->locale); 1277 SET_LOCALE (term->locale);
1167 } 1278 }
1168 else 1279 else
1169 str = (void *)text->string.wide_char; 1280 str = text->string.wide_char;
1170 1281
1171 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1282 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1172 DT_INT, call_data->caret, 1283 DT_INT, call_data->caret,
1173 DT_INT, call_data->chg_first, 1284 DT_INT, call_data->chg_first,
1174 DT_INT, call_data->chg_length, 1285 DT_INT, call_data->chg_length,
… …
1528void 1639void
1529rxvt_term::get_window_origin (int &x, int &y) 1640rxvt_term::get_window_origin (int &x, int &y)
1530{ 1641{
1531 Window cr; 1642 Window cr;
1532 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1643 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1533/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1534} 1644}
1535 1645
1536Pixmap 1646Pixmap
1537rxvt_term::get_pixmap_property (int prop_id) 1647rxvt_term::get_pixmap_property (Atom property)
1538{ 1648{
1539 if (prop_id > 0 && prop_id < NUM_XA) 1649 Pixmap pixmap = None;
1540 if (xa[prop_id]) 1650
1541 {
1542 int aformat; 1651 int aformat;
1543 unsigned long nitems, bytes_after; 1652 unsigned long nitems, bytes_after;
1544 Atom atype; 1653 Atom atype;
1545 unsigned char *prop = NULL; 1654 unsigned char *prop;
1546 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1655 int result = XGetWindowProperty (dpy, display->root, property,
1547 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1656 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1548 &nitems, &bytes_after, &prop); 1657 &nitems, &bytes_after, &prop);
1549 if (result == Success && prop && atype == XA_PIXMAP) 1658 if (result == Success)
1659 {
1660 if (atype == XA_PIXMAP)
1550 return *(Pixmap *)prop; 1661 pixmap = *(Pixmap *)prop;
1662 XFree (prop);
1551 } 1663 }
1552 1664
1553 return None; 1665 return pixmap;
1554} 1666}
1555 1667
1556#ifdef HAVE_BG_PIXMAP 1668#ifdef HAVE_BG_PIXMAP
1557# if TRACE_PIXMAPS
1558# undef update_background
1559void
1560rxvt_term::trace_update_background (const char *file, int line)
1561{
1562 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1563 update_background ();
1564}
1565# endif
1566 1669
1567void 1670void
1568rxvt_term::update_background () 1671rxvt_term::update_background ()
1569{ 1672{
1570 if (update_background_ev.is_active ()) 1673 if (update_background_ev.is_active ())

Diff Legend

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