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.329 by sf-exg, Wed Jul 21 11:02:14 2010 UTC vs.
Revision 1.357 by sf-exg, Sat Jul 9 13:14:47 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 <schmorp@schmorp.de>
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
… …
50# ifdef HAVE_SETLOCALE 51# ifdef HAVE_SETLOCALE
51# include <clocale> 52# include <clocale>
52# endif 53# endif
53#endif 54#endif
54 55
56struct termios rxvt_term::def_tio;
55vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
56 58
57// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
58rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
59 61
… …
94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
95{ 97{
96 compose_char *cc; 98 compose_char *cc;
97 99
98 // break compose chains, as stupid readline really likes to duplicate 100 // break compose chains, as stupid readline really likes to duplicate
99 // composing characters for some reason near the end of a line. 101 // composing characters for some reason, near the end of a line.
100 cc = (*this)[c1]; 102 cc = (*this)[c1];
101 while (cc) 103 while (cc)
102 { 104 {
103 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
104 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
105 } 107 }
106 108
107 // check to see whether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
108 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.end (); cc-- > v.begin (); )
109 {
110 if (cc->c1 == c1 && cc->c2 == c2) 111 if (cc->c1 == c1 && cc->c2 == c2)
111 return COMPOSE_LO + (cc - v.begin ()); 112 return COMPOSE_LO + (cc - v.begin ());
112 }
113 113
114 // allocate a new combination 114 // allocate a new combination
115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
116 { 116 {
117 static int seen; 117 static int seen;
118 118
119 if (!seen++) 119 if (!seen++)
120 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 120 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
121 121
122 return REPLACEMENT_CHAR; 122 return REPLACEMENT_CHAR;
123 } 123 }
124 124
125 v.push_back (compose_char (c1, c2)); 125 v.push_back (compose_char (c1, c2));
… …
187#endif 187#endif
188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
192 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
193 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195 194
196 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
197 196
… …
226 delete fontset[i]; 225 delete fontset[i];
227#endif 226#endif
228 delete fontset[0]; 227 delete fontset[0];
229 228
230#ifdef HAVE_BG_PIXMAP 229#ifdef HAVE_BG_PIXMAP
231 bgPixmap.destroy (); 230 bg_destroy ();
232#endif
233#ifdef HAVE_AFTERIMAGE
234 if (asv)
235 destroy_asvisual (asv, 0);
236 if (asimman)
237 destroy_image_manager (asimman, 0);
238#endif 231#endif
239 232
240 if (display) 233 if (display)
241 { 234 {
242 selection_clear (); 235 selection_clear ();
… …
248 scrollBar.destroy (); 241 scrollBar.destroy ();
249 if (gc) XFreeGC (dpy, gc); 242 if (gc) XFreeGC (dpy, gc);
250 243
251 delete drawable; 244 delete drawable;
252 // destroy all windows 245 // destroy all windows
253 if (parent[0]) 246 if (parent)
254 XDestroyWindow (dpy, parent[0]); 247 XDestroyWindow (dpy, parent);
255 248
256 for (int i = 0; i < TOTAL_COLORS; i++) 249 for (int i = 0; i < TOTAL_COLORS; i++)
257 if (ISSET_PIXCOLOR (i)) 250 if (ISSET_PIXCOLOR (i))
258 { 251 {
259 pix_colors_focused [i].free (this); 252 pix_colors_focused [i].free (this);
… …
279 // TODO: manage env vars in child only(!) 272 // TODO: manage env vars in child only(!)
280 free (env_display); 273 free (env_display);
281 free (env_term); 274 free (env_term);
282 free (locale); 275 free (locale);
283 free (v_buffer); 276 free (v_buffer);
284 free (incr_buf); 277
278 delete selection_req;
285 279
286 delete envv; 280 delete envv;
287 delete argv; 281 delete argv;
288 282
289#ifdef KEYSYM_RESOURCE 283#ifdef KEYSYM_RESOURCE
… …
325#endif 319#endif
326 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
327#if ENABLE_TRANSPARENCY || ENABLE_PERL 321#if ENABLE_TRANSPARENCY || ENABLE_PERL
328 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
329#endif 323#endif
330 incr_ev.stop ();
331 termwin_ev.stop (display); 324 termwin_ev.stop (display);
332 vt_ev.stop (display); 325 vt_ev.stop (display);
333 } 326 }
334 327
335 flush_ev.stop (); 328 flush_ev.stop ();
… …
357rxvt_term::destroy_cb (ev::idle &w, int revents) 350rxvt_term::destroy_cb (ev::idle &w, int revents)
358{ 351{
359 make_current (); 352 make_current ();
360 353
361 delete this; 354 delete this;
355}
356
357void
358rxvt_term::set_option (uint8_t opt, bool set)
359{
360 if (!opt)
361 return;
362
363 uint8_t mask = 1 << (opt & 7);
364 uint8_t &val = options [opt >> 3];
365
366 val = val & ~mask | (set ? mask : 0);
362} 367}
363 368
364/*----------------------------------------------------------------------*/ 369/*----------------------------------------------------------------------*/
365/* 370/*
366 * Exit gracefully, clearing the utmp entry and restoring tty attributes 371 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
380print_x_error (Display *dpy, XErrorEvent *event) 385print_x_error (Display *dpy, XErrorEvent *event)
381{ 386{
382 char buffer[BUFSIZ]; 387 char buffer[BUFSIZ];
383 char mesg[BUFSIZ]; 388 char mesg[BUFSIZ];
384 char number[32]; 389 char number[32];
385 char *mtype = "XlibMessage"; 390 const char mtype[] = "XlibMessage";
386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 391 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
388 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 393 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
389 rxvt_warn ("%s: %s\n", mesg, buffer); 394 rxvt_warn ("%s: %s\n", mesg, buffer);
390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 395 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
392 sprintf(number, "%d", event->request_code); 397 sprintf(number, "%d", event->request_code);
393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 398 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
… …
474 rxvt_emergency_cleanup (); 479 rxvt_emergency_cleanup ();
475 w.stop (); 480 w.stop ();
476 kill (getpid (), w.signum); 481 kill (getpid (), w.signum);
477} 482}
478 483
484static void
485rxvt_get_ttymode (struct termios *tio)
486{
487 if (tcgetattr (STDIN_FILENO, tio) < 0)
488 memset (tio, 0, sizeof (struct termios));
489
490 for (int i = 0; i < NCCS; i++)
491 tio->c_cc[i] = VDISABLE;
492
493 tio->c_cc[VINTR] = CINTR;
494 tio->c_cc[VQUIT] = CQUIT;
495 tio->c_cc[VERASE] = CERASE;
496#ifdef VERASE2
497 tio->c_cc[VERASE2] = CERASE2;
498#endif
499 tio->c_cc[VKILL] = CKILL;
500 tio->c_cc[VEOF] = CEOF;
501 tio->c_cc[VSTART] = CSTART;
502 tio->c_cc[VSTOP] = CSTOP;
503 tio->c_cc[VSUSP] = CSUSP;
504# ifdef VDSUSP
505 tio->c_cc[VDSUSP] = CDSUSP;
506# endif
507# ifdef VREPRINT
508 tio->c_cc[VREPRINT] = CRPRNT;
509# endif
510# ifdef VDISCRD
511 tio->c_cc[VDISCRD] = CFLUSH;
512# endif
513# ifdef VWERSE
514 tio->c_cc[VWERSE] = CWERASE;
515# endif
516# ifdef VLNEXT
517 tio->c_cc[VLNEXT] = CLNEXT;
518# endif
519# ifdef VSTATUS
520 tio->c_cc[VSTATUS] = CSTATUS;
521# endif
522
523# if VMIN != VEOF
524 tio->c_cc[VMIN] = 1;
525# endif
526# if VTIME != VEOL
527 tio->c_cc[VTIME] = 0;
528# endif
529
530 /* input modes */
531 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
532# ifdef IMAXBEL
533 | IMAXBEL
534# endif
535 | IXON);
536
537 /* output modes */
538 tio->c_oflag = (OPOST | ONLCR);
539
540 /* control modes */
541 tio->c_cflag = (CS8 | CREAD);
542
543 /* local modes */
544 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
545# if defined (ECHOCTL) && defined (ECHOKE)
546 | ECHOCTL | ECHOKE
547# endif
548 | ECHOE | ECHOK);
549}
550
479char **rxvt_environ; // startup environment 551char **rxvt_environ; // startup environment
480 552
481void 553void
482rxvt_init () 554rxvt_init ()
483{ 555{
484 assert (("fontMask must not overlap other RS masks", 556 assert (("fontMask must not overlap other RS masks",
485 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask)))); 557 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
486 558
487 ptytty::init (); 559 rxvt_get_ttymode (&rxvt_term::def_tio);
488 560
561 // get rid of stdin/stdout as we don't need them, to free resources
562 dup2 (STDERR_FILENO, STDIN_FILENO);
563 dup2 (STDERR_FILENO, STDOUT_FILENO);
564
489 if (!ev_default_loop (0)) 565 if (!ev_default_loop ())
490 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 566 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
491 567
492 rxvt_environ = environ; 568 rxvt_environ = environ;
493 569
494 signal (SIGHUP, SIG_IGN); 570 signal (SIGHUP, SIG_IGN);
… …
659 kill (-cmd_pid, SIGWINCH); 735 kill (-cmd_pid, SIGWINCH);
660#endif 736#endif
661} 737}
662 738
663/*----------------------------------------------------------------------*/ 739/*----------------------------------------------------------------------*/
664/* set_fonts () - load and set the various fonts 740/* load and set the various fonts */
665 *
666 * init = 1 - initialize
667 *
668 * fontname == FONT_UP - switch to bigger font
669 * fontname == FONT_DN - switch to smaller font
670 */
671bool 741bool
672rxvt_term::set_fonts () 742rxvt_term::set_fonts ()
673{ 743{
674 rxvt_fontset *fs = new rxvt_fontset (this); 744 rxvt_fontset *fs = new rxvt_fontset (this);
675 rxvt_fontprop prop; 745 rxvt_fontprop prop;
… …
732#else 802#else
733 fontset[style] = fontset[0]; 803 fontset[style] = fontset[0];
734#endif 804#endif
735 } 805 }
736 806
737 if (parent[0]) 807 if (parent)
738 { 808 {
739 resize_all_windows (0, 0, 0); 809 resize_all_windows (0, 0, 0);
740 scr_remap_chars (); 810 scr_remap_chars ();
741 scr_touch (true); 811 scr_touch (true);
742 } 812 }
… …
745} 815}
746 816
747void 817void
748rxvt_term::set_string_property (Atom prop, const char *str, int len) 818rxvt_term::set_string_property (Atom prop, const char *str, int len)
749{ 819{
750 XChangeProperty (dpy, parent[0], 820 XChangeProperty (dpy, parent,
751 prop, XA_STRING, 8, PropModeReplace, 821 prop, XA_STRING, 8, PropModeReplace,
752 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 822 (const unsigned char *)str, len >= 0 ? len : strlen (str));
753} 823}
754 824
755void 825void
… …
757{ 827{
758 XTextProperty ct; 828 XTextProperty ct;
759 829
760 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 830 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
761 { 831 {
762 XSetTextProperty (dpy, parent[0], &ct, prop); 832 XSetTextProperty (dpy, parent, &ct, prop);
763 XFree (ct.value); 833 XFree (ct.value);
764 } 834 }
765} 835}
766 836
767void 837void
768rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 838rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
769{ 839{
770 wchar_t *ws = rxvt_mbstowcs (str, len); 840 wchar_t *ws = rxvt_mbstowcs (str, len);
771 char *s = rxvt_wcstoutf8 (ws); 841 char *s = rxvt_wcstoutf8 (ws);
772 842
773 XChangeProperty (dpy, parent[0], 843 XChangeProperty (dpy, parent,
774 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 844 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
775 (const unsigned char *)s, strlen (s)); 845 (const unsigned char *)s, strlen (s));
776 846
777 free (s); 847 free (s);
778 free (ws); 848 free (ws);
… …
873void 943void
874rxvt_term::set_colorfgbg () 944rxvt_term::set_colorfgbg ()
875{ 945{
876 unsigned int i; 946 unsigned int i;
877 const char *xpmb = ""; 947 const char *xpmb = "";
878 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 948 char fstr[] = "default";
949 char bstr[] = "default";
879 950
880 strcpy (fstr, "default");
881 strcpy (bstr, "default");
882 for (i = Color_Black; i <= Color_White; i++) 951 for (i = Color_Black; i <= Color_White; i++)
883 if (pix_colors[Color_fg] == pix_colors[i]) 952 if (pix_colors[Color_fg] == pix_colors[i])
884 { 953 {
885 sprintf (fstr, "%d", (i - Color_Black)); 954 sprintf (fstr, "%d", i - Color_Black);
886 break; 955 break;
887 } 956 }
888 957
889 for (i = Color_Black; i <= Color_White; i++) 958 for (i = Color_Black; i <= Color_White; i++)
890 if (pix_colors[Color_bg] == pix_colors[i]) 959 if (pix_colors[Color_bg] == pix_colors[i])
891 { 960 {
892 sprintf (bstr, "%d", (i - Color_Black)); 961 sprintf (bstr, "%d", i - Color_Black);
893#ifdef BG_IMAGE_FROM_FILE 962#ifdef BG_IMAGE_FROM_FILE
894 xpmb = "default;"; 963 xpmb = "default;";
895#endif 964#endif
896 break; 965 break;
897 } 966 }
… …
933 1002
934 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1003 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
935 if (set_hint) 1004 if (set_hint)
936 { 1005 {
937 szHint.flags &= ~(PBaseSize | PResizeInc); 1006 szHint.flags &= ~(PBaseSize | PResizeInc);
938 XSetWMNormalHints (dpy, parent[0], &szHint); 1007 XSetWMNormalHints (dpy, parent, &szHint);
939 szHint.flags |= PBaseSize | PResizeInc; 1008 szHint.flags |= PBaseSize | PResizeInc;
940 } 1009 }
941 1010
942 if (!ignoreparent) 1011 if (!ignoreparent)
943 { 1012 {
… …
949 int x, y, x1, y1; 1018 int x, y, x1, y1;
950 int dx, dy; 1019 int dx, dy;
951 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1020 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
952 Window unused_cr; 1021 Window unused_cr;
953 1022
954 XTranslateCoordinates (dpy, parent[0], display->root, 1023 XTranslateCoordinates (dpy, parent, display->root,
955 0, 0, &x, &y, &unused_cr); 1024 0, 0, &x, &y, &unused_cr);
956 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1025 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
957 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1026 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
958 /* 1027 /*
959 * if display->root isn't the parent window, a WM will probably have offset 1028 * if display->root isn't the parent window, a WM will probably have offset
960 * our position for handles and decorations. Counter it 1029 * our position for handles and decorations. Counter it
961 */ 1030 */
… …
978 if (y < y1) /* top half */ 1047 if (y < y1) /* top half */
979 dy = 0; 1048 dy = 0;
980 else if (y == y1) /* exact center */ 1049 else if (y == y1) /* exact center */
981 dy /= 2; 1050 dy /= 2;
982 1051
983 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1052 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
984 szHint.width, szHint.height); 1053 szHint.width, szHint.height);
985#else 1054#else
986 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1055 XResizeWindow (dpy, parent, szHint.width, szHint.height);
987#endif 1056#endif
988 } 1057 }
989 1058
990 if (set_hint) 1059 if (set_hint)
991 XSetWMNormalHints (dpy, parent[0], &szHint); 1060 XSetWMNormalHints (dpy, parent, &szHint);
992 1061
993 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1062 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
994 1063
995 if (fix_screen || newwidth != old_width || newheight != old_height) 1064 if (fix_screen || newwidth != old_width || newheight != old_height)
996 { 1065 {
… …
1000 XMoveResizeWindow (dpy, vt, 1069 XMoveResizeWindow (dpy, vt,
1001 window_vt_x, window_vt_y, 1070 window_vt_x, window_vt_y,
1002 width, height); 1071 width, height);
1003 1072
1004#ifdef HAVE_BG_PIXMAP 1073#ifdef HAVE_BG_PIXMAP
1005 if (bgPixmap.window_size_sensitive ()) 1074 if (bg_window_size_sensitive ())
1006 update_background (); 1075 update_background ();
1007#endif 1076#endif
1008 } 1077 }
1009 1078
1010 if (fix_screen || old_height == 0) 1079 if (fix_screen || old_height == 0)
1011 scr_reset (); 1080 scr_reset ();
1012
1013#ifdef HAVE_BG_PIXMAP
1014// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1015// if (bgPixmap.pixmap)
1016// scr_touch (false);
1017#endif
1018 1081
1019#ifdef USE_XIM 1082#ifdef USE_XIM
1020 IMSetPosition (); 1083 IMSetPosition ();
1021#endif 1084#endif
1022} 1085}
… …
1105 1168
1106 atom = XInternAtom (dpy, server, False); 1169 atom = XInternAtom (dpy, server, False);
1107 win = XGetSelectionOwner (dpy, atom); 1170 win = XGetSelectionOwner (dpy, atom);
1108 1171
1109 if (win != None) 1172 if (win != None)
1110 return True; 1173 return true;
1111 } 1174 }
1112 1175
1113 return False; 1176 return false;
1114} 1177}
1115 1178
1116void 1179void
1117rxvt_term::IMSendSpot () 1180rxvt_term::IMSendSpot ()
1118{ 1181{
… …
1238 XRectangle rect, status_rect, needed_rect; 1301 XRectangle rect, status_rect, needed_rect;
1239 unsigned long fg, bg; 1302 unsigned long fg, bg;
1240 const char *p; 1303 const char *p;
1241 char **s; 1304 char **s;
1242 XIMStyles *xim_styles; 1305 XIMStyles *xim_styles;
1243#ifdef ENABLE_XIM_ONTHESPOT
1244 XIMCallback xcb[4];
1245#endif
1246 1306
1247 set_environ (envv); 1307 set_environ (envv);
1248 1308
1249 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1309 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1250 return false; 1310 return false;
… …
1271 p = pet[pi]; 1331 p = pet[pi];
1272 1332
1273 if (!p) 1333 if (!p)
1274 continue; 1334 continue;
1275 1335
1276 s = rxvt_splitcommastring (p); 1336 s = rxvt_strsplit (',', p);
1277 1337
1278 for (i = found = 0; !found && s[i]; i++) 1338 for (i = found = 0; !found && s[i]; i++)
1279 { 1339 {
1280 if (!strcmp (s[i], "OverTheSpot")) 1340 if (!strcmp (s[i], "OverTheSpot"))
1281 input_style = XIMPreeditPosition | XIMStatusNothing; 1341 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1293 input_style = XIMPreeditNothing | XIMStatusNothing; 1353 input_style = XIMPreeditNothing | XIMStatusNothing;
1294 1354
1295 for (j = 0; j < xim_styles->count_styles; j++) 1355 for (j = 0; j < xim_styles->count_styles; j++)
1296 if (input_style == xim_styles->supported_styles[j]) 1356 if (input_style == xim_styles->supported_styles[j])
1297 { 1357 {
1298 rxvt_freecommastring (s); 1358 rxvt_free_strsplit (s);
1299 1359
1300 found = 1; 1360 found = 1;
1301 goto foundpet; 1361 goto foundpet;
1302 } 1362 }
1303 1363
1304 } 1364 }
1305 1365
1306 rxvt_freecommastring (s); 1366 rxvt_free_strsplit (s);
1307 } 1367 }
1308 1368
1309foundpet: 1369foundpet:
1310 1370
1311 XFree (xim_styles); 1371 XFree (xim_styles);
… …
1390 NULL); 1450 NULL);
1391 } 1451 }
1392#if ENABLE_XIM_ONTHESPOT 1452#if ENABLE_XIM_ONTHESPOT
1393 else if (input_style & XIMPreeditCallbacks) 1453 else if (input_style & XIMPreeditCallbacks)
1394 { 1454 {
1455 XIMCallback xcb[4];
1456
1395 im_set_position (spot); 1457 im_set_position (spot);
1396 1458
1397 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1459 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1398 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1460 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1399 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1461 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1414#endif 1476#endif
1415 1477
1416 Input_Context = XCreateIC (xim, 1478 Input_Context = XCreateIC (xim,
1417 XNInputStyle, input_style, 1479 XNInputStyle, input_style,
1418 XNClientWindow, vt, 1480 XNClientWindow, vt,
1419 XNFocusWindow, parent[0], 1481 XNFocusWindow, parent,
1420 preedit_attr ? XNPreeditAttributes : NULL, 1482 preedit_attr ? XNPreeditAttributes : NULL,
1421 preedit_attr, 1483 preedit_attr,
1422 status_attr ? XNStatusAttributes : NULL, 1484 status_attr ? XNStatusAttributes : NULL,
1423 status_attr, NULL); 1485 status_attr, NULL);
1424 1486
… …
1467 p = rs[Rs_inputMethod]; 1529 p = rs[Rs_inputMethod];
1468 if (p && *p) 1530 if (p && *p)
1469 { 1531 {
1470 bool found = false; 1532 bool found = false;
1471 1533
1472 s = rxvt_splitcommastring (p); 1534 s = rxvt_strsplit (',', p);
1473 1535
1474 for (i = 0; s[i]; i++) 1536 for (i = 0; s[i]; i++)
1475 { 1537 {
1476 if (*s[i]) 1538 if (*s[i])
1477 { 1539 {
… …
1483 break; 1545 break;
1484 } 1546 }
1485 } 1547 }
1486 } 1548 }
1487 1549
1488 rxvt_freecommastring (s); 1550 rxvt_free_strsplit (s);
1489 1551
1490 if (found) 1552 if (found)
1491 goto done; 1553 goto done;
1492 } 1554 }
1493 1555
… …
1553 1615
1554void 1616void
1555rxvt_term::get_window_origin (int &x, int &y) 1617rxvt_term::get_window_origin (int &x, int &y)
1556{ 1618{
1557 Window cr; 1619 Window cr;
1558 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1620 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1559/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1560} 1621}
1561 1622
1562Pixmap 1623Pixmap
1563rxvt_term::get_pixmap_property (int prop_id) 1624rxvt_term::get_pixmap_property (Atom property)
1564{ 1625{
1565 if (prop_id > 0 && prop_id < NUM_XA) 1626 Pixmap pixmap = None;
1566 if (xa[prop_id]) 1627
1567 {
1568 int aformat; 1628 int aformat;
1569 unsigned long nitems, bytes_after; 1629 unsigned long nitems, bytes_after;
1570 Atom atype; 1630 Atom atype;
1571 unsigned char *prop = NULL; 1631 unsigned char *prop;
1572 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1632 int result = XGetWindowProperty (dpy, display->root, property,
1573 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1633 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1574 &nitems, &bytes_after, &prop); 1634 &nitems, &bytes_after, &prop);
1575 if (result == Success && prop && atype == XA_PIXMAP) 1635 if (result == Success)
1636 {
1637 if (atype == XA_PIXMAP)
1576 return *(Pixmap *)prop; 1638 pixmap = *(Pixmap *)prop;
1639 XFree (prop);
1577 } 1640 }
1578 1641
1579 return None; 1642 return pixmap;
1580} 1643}
1581 1644
1582#ifdef HAVE_BG_PIXMAP 1645#ifdef HAVE_BG_PIXMAP
1583# if TRACE_PIXMAPS
1584# undef update_background
1585void
1586rxvt_term::trace_update_background (const char *file, int line)
1587{
1588 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1589 update_background ();
1590}
1591# endif
1592 1646
1593void 1647void
1594rxvt_term::update_background () 1648rxvt_term::update_background ()
1595{ 1649{
1596 if (update_background_ev.is_active ()) 1650 if (update_background_ev.is_active ())
1597 return; 1651 return;
1598 1652
1599 bgPixmap.invalidate (); 1653 bg_invalidate ();
1600 1654
1601 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1655 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1602 1656
1603 if (to_wait <= 0.) 1657 if (to_wait <= 0.)
1604 bgPixmap.render (); 1658 bg_render ();
1605 else 1659 else
1606 update_background_ev.start (to_wait); 1660 update_background_ev.start (to_wait);
1607} 1661}
1608 1662
1609void 1663void
1610rxvt_term::update_background_cb (ev::timer &w, int revents) 1664rxvt_term::update_background_cb (ev::timer &w, int revents)
1611{ 1665{
1612 make_current (); 1666 make_current ();
1613 1667
1614 update_background_ev.stop (); 1668 update_background_ev.stop ();
1615 bgPixmap.render (); 1669 bg_render ();
1616 refresh_check (); 1670 refresh_check ();
1617} 1671}
1618 1672
1619#endif /* HAVE_BG_PIXMAP */ 1673#endif /* HAVE_BG_PIXMAP */
1620 1674

Diff Legend

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