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.328 by sf-exg, Mon Jul 19 16:43:21 2010 UTC vs.
Revision 1.361 by sf-exg, Sun Aug 21 20:13:58 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.begin (); cc < v.end (); cc++)
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);
495 signal (SIGPIPE, SIG_IGN); 571 signal (SIGPIPE, SIG_IGN);
496 572
497 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 573 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
498 sig_handlers.sw_int.start (SIGINT); ev_unref (); 574 sig_handlers.sw_int.start (SIGINT); ev_unref ();
499
500 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
501 /* signal (SIGURG, SIG_DFL); */
502 575
503 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 576 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
504 // TODO: handle this with exceptions and tolerate the memory loss 577 // TODO: handle this with exceptions and tolerate the memory loss
505 XSetIOErrorHandler (rxvt_xioerror_handler); 578 XSetIOErrorHandler (rxvt_xioerror_handler);
506 579
… …
633 if (recalc_y) 706 if (recalc_y)
634 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 707 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
635 708
636 ncol = width / fwidth; 709 ncol = width / fwidth;
637 nrow = height / fheight; 710 nrow = height / fheight;
711
712 // When the size of the vt window is not a multiple of the cell
713 // size, i.e., when the wm does not honour our size hints, there are
714 // extra areas not covered by the terminal screen. Such gaps, when a
715 // bg pixmap is set, would have to be cleared manually to properly
716 // refresh the background. We take the simpler route and shrink the
717 // vt window so as to avoid creating gaps.
718 width = ncol * fwidth;
719 height = nrow * fheight;
638} 720}
639 721
640/*----------------------------------------------------------------------*/ 722/*----------------------------------------------------------------------*/
641/* 723/*
642 * Tell the teletype handler what size the window is. 724 * Tell the teletype handler what size the window is.
… …
662 kill (-cmd_pid, SIGWINCH); 744 kill (-cmd_pid, SIGWINCH);
663#endif 745#endif
664} 746}
665 747
666/*----------------------------------------------------------------------*/ 748/*----------------------------------------------------------------------*/
667/* set_fonts () - load and set the various fonts 749/* load and set the various fonts */
668 *
669 * init = 1 - initialize
670 *
671 * fontname == FONT_UP - switch to bigger font
672 * fontname == FONT_DN - switch to smaller font
673 */
674bool 750bool
675rxvt_term::set_fonts () 751rxvt_term::set_fonts ()
676{ 752{
677 rxvt_fontset *fs = new rxvt_fontset (this); 753 rxvt_fontset *fs = new rxvt_fontset (this);
678 rxvt_fontprop prop; 754 rxvt_fontprop prop;
… …
735#else 811#else
736 fontset[style] = fontset[0]; 812 fontset[style] = fontset[0];
737#endif 813#endif
738 } 814 }
739 815
740 if (parent[0]) 816 if (parent)
741 { 817 {
742 resize_all_windows (0, 0, 0); 818 resize_all_windows (0, 0, 0);
743 scr_remap_chars (); 819 scr_remap_chars ();
744 scr_touch (true); 820 scr_touch (true);
745 } 821 }
… …
748} 824}
749 825
750void 826void
751rxvt_term::set_string_property (Atom prop, const char *str, int len) 827rxvt_term::set_string_property (Atom prop, const char *str, int len)
752{ 828{
753 XChangeProperty (dpy, parent[0], 829 XChangeProperty (dpy, parent,
754 prop, XA_STRING, 8, PropModeReplace, 830 prop, XA_STRING, 8, PropModeReplace,
755 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 831 (const unsigned char *)str, len >= 0 ? len : strlen (str));
756} 832}
757 833
758void 834void
… …
760{ 836{
761 XTextProperty ct; 837 XTextProperty ct;
762 838
763 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 839 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
764 { 840 {
765 XSetTextProperty (dpy, parent[0], &ct, prop); 841 XSetTextProperty (dpy, parent, &ct, prop);
766 XFree (ct.value); 842 XFree (ct.value);
767 } 843 }
768} 844}
769 845
770void 846void
771rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 847rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
772{ 848{
773 wchar_t *ws = rxvt_mbstowcs (str, len); 849 wchar_t *ws = rxvt_mbstowcs (str, len);
774 char *s = rxvt_wcstoutf8 (ws); 850 char *s = rxvt_wcstoutf8 (ws);
775 851
776 XChangeProperty (dpy, parent[0], 852 XChangeProperty (dpy, parent,
777 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 853 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
778 (const unsigned char *)s, strlen (s)); 854 (const unsigned char *)s, strlen (s));
779 855
780 free (s); 856 free (s);
781 free (ws); 857 free (ws);
… …
876void 952void
877rxvt_term::set_colorfgbg () 953rxvt_term::set_colorfgbg ()
878{ 954{
879 unsigned int i; 955 unsigned int i;
880 const char *xpmb = ""; 956 const char *xpmb = "";
881 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 957 char fstr[] = "default";
958 char bstr[] = "default";
882 959
883 strcpy (fstr, "default");
884 strcpy (bstr, "default");
885 for (i = Color_Black; i <= Color_White; i++) 960 for (i = Color_Black; i <= Color_White; i++)
886 if (pix_colors[Color_fg] == pix_colors[i]) 961 if (pix_colors[Color_fg] == pix_colors[i])
887 { 962 {
888 sprintf (fstr, "%d", (i - Color_Black)); 963 sprintf (fstr, "%d", i - Color_Black);
889 break; 964 break;
890 } 965 }
891 966
892 for (i = Color_Black; i <= Color_White; i++) 967 for (i = Color_Black; i <= Color_White; i++)
893 if (pix_colors[Color_bg] == pix_colors[i]) 968 if (pix_colors[Color_bg] == pix_colors[i])
894 { 969 {
895 sprintf (bstr, "%d", (i - Color_Black)); 970 sprintf (bstr, "%d", i - Color_Black);
896#ifdef BG_IMAGE_FROM_FILE 971#ifdef BG_IMAGE_FROM_FILE
897 xpmb = "default;"; 972 xpmb = "default;";
898#endif 973#endif
899 break; 974 break;
900 } 975 }
… …
936 1011
937 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1012 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
938 if (set_hint) 1013 if (set_hint)
939 { 1014 {
940 szHint.flags &= ~(PBaseSize | PResizeInc); 1015 szHint.flags &= ~(PBaseSize | PResizeInc);
941 XSetWMNormalHints (dpy, parent[0], &szHint); 1016 XSetWMNormalHints (dpy, parent, &szHint);
942 szHint.flags |= PBaseSize | PResizeInc; 1017 szHint.flags |= PBaseSize | PResizeInc;
943 } 1018 }
944 1019
945 if (!ignoreparent) 1020 if (!ignoreparent)
946 { 1021 {
… …
952 int x, y, x1, y1; 1027 int x, y, x1, y1;
953 int dx, dy; 1028 int dx, dy;
954 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1029 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
955 Window unused_cr; 1030 Window unused_cr;
956 1031
957 XTranslateCoordinates (dpy, parent[0], display->root, 1032 XTranslateCoordinates (dpy, parent, display->root,
958 0, 0, &x, &y, &unused_cr); 1033 0, 0, &x, &y, &unused_cr);
959 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1034 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
960 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1035 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
961 /* 1036 /*
962 * if display->root isn't the parent window, a WM will probably have offset 1037 * if display->root isn't the parent window, a WM will probably have offset
963 * our position for handles and decorations. Counter it 1038 * our position for handles and decorations. Counter it
964 */ 1039 */
… …
981 if (y < y1) /* top half */ 1056 if (y < y1) /* top half */
982 dy = 0; 1057 dy = 0;
983 else if (y == y1) /* exact center */ 1058 else if (y == y1) /* exact center */
984 dy /= 2; 1059 dy /= 2;
985 1060
986 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1061 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
987 szHint.width, szHint.height); 1062 szHint.width, szHint.height);
988#else 1063#else
989 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1064 XResizeWindow (dpy, parent, szHint.width, szHint.height);
990#endif 1065#endif
991 } 1066 }
992 1067
993 if (set_hint) 1068 if (set_hint)
994 XSetWMNormalHints (dpy, parent[0], &szHint); 1069 XSetWMNormalHints (dpy, parent, &szHint);
995 1070
996 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1071 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
997 1072
998 if (fix_screen || newwidth != old_width || newheight != old_height) 1073 if (fix_screen || newwidth != old_width || newheight != old_height)
999 { 1074 {
… …
1003 XMoveResizeWindow (dpy, vt, 1078 XMoveResizeWindow (dpy, vt,
1004 window_vt_x, window_vt_y, 1079 window_vt_x, window_vt_y,
1005 width, height); 1080 width, height);
1006 1081
1007#ifdef HAVE_BG_PIXMAP 1082#ifdef HAVE_BG_PIXMAP
1008 if (bgPixmap.window_size_sensitive ()) 1083 if (bg_window_size_sensitive ())
1009 update_background (); 1084 update_background ();
1010#endif 1085#endif
1011 } 1086 }
1012 1087
1013 if (fix_screen || old_height == 0) 1088 if (fix_screen || old_height == 0)
1014 scr_reset (); 1089 scr_reset ();
1015 1090
1016#ifdef HAVE_BG_PIXMAP
1017// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1018// if (bgPixmap.pixmap)
1019// scr_touch (false);
1020#endif
1021
1022#ifdef USE_XIM 1091#ifdef USE_XIM
1023 IMSetPosition (); 1092 im_set_position ();
1024#endif 1093#endif
1025} 1094}
1026 1095
1027/* 1096/*
1028 * Set the width/height of the vt window in characters. Units are pixels. 1097 * Set the width/height of the vt window in characters. Units are pixels.
… …
1089 status_rect.height = fheight; 1158 status_rect.height = fheight;
1090} 1159}
1091 1160
1092/* Checking whether input method is running. */ 1161/* Checking whether input method is running. */
1093bool 1162bool
1094rxvt_term::IMisRunning () 1163rxvt_term::im_is_running ()
1095{ 1164{
1096 Atom atom; 1165 Atom atom;
1097 Window win; 1166 Window win;
1098 char server[IMBUFSIZ]; 1167 char server[IMBUFSIZ];
1099 1168
… …
1108 1177
1109 atom = XInternAtom (dpy, server, False); 1178 atom = XInternAtom (dpy, server, False);
1110 win = XGetSelectionOwner (dpy, atom); 1179 win = XGetSelectionOwner (dpy, atom);
1111 1180
1112 if (win != None) 1181 if (win != None)
1113 return True; 1182 return true;
1114 } 1183 }
1115 1184
1116 return False; 1185 return false;
1117} 1186}
1118 1187
1119void 1188void
1120rxvt_term::IMSendSpot () 1189rxvt_term::im_send_spot ()
1121{ 1190{
1122 XPoint nspot; 1191 XPoint nspot;
1123 XVaNestedList preedit_attr; 1192 XVaNestedList preedit_attr;
1124 1193
1125 if (!Input_Context 1194 if (!Input_Context
… …
1231/* 1300/*
1232 * Try to open a XIM with the current modifiers, then see if we can 1301 * Try to open a XIM with the current modifiers, then see if we can
1233 * open a suitable preedit type 1302 * open a suitable preedit type
1234 */ 1303 */
1235bool 1304bool
1236rxvt_term::IM_get_IC (const char *modifiers) 1305rxvt_term::im_get_ic (const char *modifiers)
1237{ 1306{
1238 int i, j, found; 1307 int i, j, found;
1239 XIM xim; 1308 XIM xim;
1240 XPoint spot; 1309 XPoint spot;
1241 XRectangle rect, status_rect, needed_rect; 1310 XRectangle rect, status_rect, needed_rect;
1242 unsigned long fg, bg; 1311 unsigned long fg, bg;
1243 const char *p; 1312 const char *p;
1244 char **s; 1313 char **s;
1245 XIMStyles *xim_styles; 1314 XIMStyles *xim_styles;
1246#ifdef ENABLE_XIM_ONTHESPOT
1247 XIMCallback xcb[4];
1248#endif
1249 1315
1250 set_environ (envv); 1316 set_environ (envv);
1251 1317
1252 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1318 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1253 return false; 1319 return false;
… …
1274 p = pet[pi]; 1340 p = pet[pi];
1275 1341
1276 if (!p) 1342 if (!p)
1277 continue; 1343 continue;
1278 1344
1279 s = rxvt_splitcommastring (p); 1345 s = rxvt_strsplit (',', p);
1280 1346
1281 for (i = found = 0; !found && s[i]; i++) 1347 for (i = found = 0; !found && s[i]; i++)
1282 { 1348 {
1283 if (!strcmp (s[i], "OverTheSpot")) 1349 if (!strcmp (s[i], "OverTheSpot"))
1284 input_style = XIMPreeditPosition | XIMStatusNothing; 1350 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1296 input_style = XIMPreeditNothing | XIMStatusNothing; 1362 input_style = XIMPreeditNothing | XIMStatusNothing;
1297 1363
1298 for (j = 0; j < xim_styles->count_styles; j++) 1364 for (j = 0; j < xim_styles->count_styles; j++)
1299 if (input_style == xim_styles->supported_styles[j]) 1365 if (input_style == xim_styles->supported_styles[j])
1300 { 1366 {
1301 rxvt_freecommastring (s); 1367 rxvt_free_strsplit (s);
1302 1368
1303 found = 1; 1369 found = 1;
1304 goto foundpet; 1370 goto foundpet;
1305 } 1371 }
1306 1372
1307 } 1373 }
1308 1374
1309 rxvt_freecommastring (s); 1375 rxvt_free_strsplit (s);
1310 } 1376 }
1311 1377
1312foundpet: 1378foundpet:
1313 1379
1314 XFree (xim_styles); 1380 XFree (xim_styles);
… …
1393 NULL); 1459 NULL);
1394 } 1460 }
1395#if ENABLE_XIM_ONTHESPOT 1461#if ENABLE_XIM_ONTHESPOT
1396 else if (input_style & XIMPreeditCallbacks) 1462 else if (input_style & XIMPreeditCallbacks)
1397 { 1463 {
1464 XIMCallback xcb[4];
1465
1398 im_set_position (spot); 1466 im_set_position (spot);
1399 1467
1400 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1468 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1401 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1469 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1402 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1470 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1417#endif 1485#endif
1418 1486
1419 Input_Context = XCreateIC (xim, 1487 Input_Context = XCreateIC (xim,
1420 XNInputStyle, input_style, 1488 XNInputStyle, input_style,
1421 XNClientWindow, vt, 1489 XNClientWindow, vt,
1422 XNFocusWindow, parent[0], 1490 XNFocusWindow, parent,
1423 preedit_attr ? XNPreeditAttributes : NULL, 1491 preedit_attr ? XNPreeditAttributes : NULL,
1424 preedit_attr, 1492 preedit_attr,
1425 status_attr ? XNStatusAttributes : NULL, 1493 status_attr ? XNStatusAttributes : NULL,
1426 status_attr, NULL); 1494 status_attr, NULL);
1427 1495
… …
1440 // unfortunately, only the focus window is used by XIM, hard to fix 1508 // unfortunately, only the focus window is used by XIM, hard to fix
1441 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1509 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1442 vt_select_input (); 1510 vt_select_input ();
1443#endif 1511#endif
1444 1512
1445 IMSetPosition (); 1513 im_set_position ();
1446 1514
1447 return true; 1515 return true;
1448} 1516}
1449 1517
1450void 1518void
… …
1470 p = rs[Rs_inputMethod]; 1538 p = rs[Rs_inputMethod];
1471 if (p && *p) 1539 if (p && *p)
1472 { 1540 {
1473 bool found = false; 1541 bool found = false;
1474 1542
1475 s = rxvt_splitcommastring (p); 1543 s = rxvt_strsplit (',', p);
1476 1544
1477 for (i = 0; s[i]; i++) 1545 for (i = 0; s[i]; i++)
1478 { 1546 {
1479 if (*s[i]) 1547 if (*s[i])
1480 { 1548 {
1481 strcpy (buf, "@im="); 1549 strcpy (buf, "@im=");
1482 strncat (buf, s[i], IMBUFSIZ - 5); 1550 strncat (buf, s[i], IMBUFSIZ - 5);
1483 if (IM_get_IC (buf)) 1551 if (im_get_ic (buf))
1484 { 1552 {
1485 found = true; 1553 found = true;
1486 break; 1554 break;
1487 } 1555 }
1488 } 1556 }
1489 } 1557 }
1490 1558
1491 rxvt_freecommastring (s); 1559 rxvt_free_strsplit (s);
1492 1560
1493 if (found) 1561 if (found)
1494 goto done; 1562 goto done;
1495 } 1563 }
1496 1564
1497 /* try with XMODIFIERS env. var. */ 1565 /* try with XMODIFIERS env. var. */
1498 if (IM_get_IC ("")) 1566 if (im_get_ic (""))
1499 goto done; 1567 goto done;
1500 1568
1501 /* try with no modifiers base IF the user didn't specify an IM */ 1569 /* try with no modifiers base IF the user didn't specify an IM */
1502 if (IM_get_IC ("@im=none")) 1570 if (im_get_ic ("@im=none"))
1503 goto done; 1571 goto done;
1504 1572
1505done: 1573done:
1506#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1574#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1507 if (rs[Rs_imLocale]) 1575 if (rs[Rs_imLocale])
1508 SET_LOCALE (locale); 1576 SET_LOCALE (locale);
1509#endif 1577#endif
1510} 1578}
1511 1579
1512void 1580void
1513rxvt_term::IMSetPosition () 1581rxvt_term::im_set_position ()
1514{ 1582{
1515 XRectangle preedit_rect, status_rect, *needed_rect; 1583 XRectangle preedit_rect, status_rect, *needed_rect;
1516 XVaNestedList preedit_attr, status_attr; 1584 XVaNestedList preedit_attr, status_attr;
1517 1585
1518 if (!Input_Context 1586 if (!Input_Context
1519 || !focus 1587 || !focus
1520 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1588 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1521 || !IMisRunning ()) 1589 || !im_is_running ())
1522 return; 1590 return;
1523 1591
1524 if (input_style & XIMPreeditPosition) 1592 if (input_style & XIMPreeditPosition)
1525 { 1593 {
1526 im_set_size (preedit_rect); 1594 im_set_size (preedit_rect);
… …
1556 1624
1557void 1625void
1558rxvt_term::get_window_origin (int &x, int &y) 1626rxvt_term::get_window_origin (int &x, int &y)
1559{ 1627{
1560 Window cr; 1628 Window cr;
1561 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1629 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1562/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1563} 1630}
1564 1631
1565Pixmap 1632Pixmap
1566rxvt_term::get_pixmap_property (int prop_id) 1633rxvt_term::get_pixmap_property (Atom property)
1567{ 1634{
1568 if (prop_id > 0 && prop_id < NUM_XA) 1635 Pixmap pixmap = None;
1569 if (xa[prop_id]) 1636
1570 {
1571 int aformat; 1637 int aformat;
1572 unsigned long nitems, bytes_after; 1638 unsigned long nitems, bytes_after;
1573 Atom atype; 1639 Atom atype;
1574 unsigned char *prop = NULL; 1640 unsigned char *prop;
1575 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1641 int result = XGetWindowProperty (dpy, display->root, property,
1576 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1642 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1577 &nitems, &bytes_after, &prop); 1643 &nitems, &bytes_after, &prop);
1578 if (result == Success && prop && atype == XA_PIXMAP) 1644 if (result == Success)
1645 {
1646 if (atype == XA_PIXMAP)
1579 return *(Pixmap *)prop; 1647 pixmap = *(Pixmap *)prop;
1648 XFree (prop);
1580 } 1649 }
1581 1650
1582 return None; 1651 return pixmap;
1583} 1652}
1584 1653
1585#ifdef HAVE_BG_PIXMAP 1654#ifdef HAVE_BG_PIXMAP
1586# if TRACE_PIXMAPS
1587# undef update_background
1588void
1589rxvt_term::trace_update_background (const char *file, int line)
1590{
1591 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1592 update_background ();
1593}
1594# endif
1595 1655
1596void 1656void
1597rxvt_term::update_background () 1657rxvt_term::update_background ()
1598{ 1658{
1599 if (update_background_ev.is_active ()) 1659 if (update_background_ev.is_active ())
1600 return; 1660 return;
1601 1661
1602 bgPixmap.invalidate (); 1662 bg_invalidate ();
1603 1663
1664 if (!mapped)
1665 return;
1666
1604 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1667 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1605 1668
1606 if (to_wait <= 0.) 1669 if (to_wait <= 0.)
1607 bgPixmap.render (); 1670 bg_render ();
1608 else 1671 else
1609 update_background_ev.start (to_wait); 1672 update_background_ev.start (to_wait);
1610} 1673}
1611 1674
1612void 1675void
1613rxvt_term::update_background_cb (ev::timer &w, int revents) 1676rxvt_term::update_background_cb (ev::timer &w, int revents)
1614{ 1677{
1615 make_current (); 1678 make_current ();
1616 1679
1617 update_background_ev.stop (); 1680 update_background_ev.stop ();
1618 bgPixmap.render (); 1681 bg_render ();
1619 refresh_check (); 1682 refresh_check ();
1620} 1683}
1621 1684
1622#endif /* HAVE_BG_PIXMAP */ 1685#endif /* HAVE_BG_PIXMAP */
1623 1686

Diff Legend

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