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.368 by root, Wed Jan 18 12:26:59 2012 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);
… …
274 for (int i = 0; i < allocated.size (); i++) 267 for (int i = 0; i < allocated.size (); i++)
275 free (allocated [i]); 268 free (allocated [i]);
276 269
277 free (selection.text); 270 free (selection.text);
278 free (selection.clip_text); 271 free (selection.clip_text);
279 // TODO: manage env vars in child only(!)
280 free (env_display);
281 free (env_term);
282 free (locale); 272 free (locale);
283 free (v_buffer); 273 free (v_buffer);
284 free (incr_buf); 274
275 delete selection_req;
285 276
286 delete envv; 277 delete envv;
287 delete argv; 278 delete argv;
288 279
289#ifdef KEYSYM_RESOURCE 280#ifdef KEYSYM_RESOURCE
… …
325#endif 316#endif
326 scrollbar_ev.stop (display); 317 scrollbar_ev.stop (display);
327#if ENABLE_TRANSPARENCY || ENABLE_PERL 318#if ENABLE_TRANSPARENCY || ENABLE_PERL
328 rootwin_ev.stop (display); 319 rootwin_ev.stop (display);
329#endif 320#endif
330 incr_ev.stop ();
331 termwin_ev.stop (display); 321 termwin_ev.stop (display);
332 vt_ev.stop (display); 322 vt_ev.stop (display);
333 } 323 }
334 324
335 flush_ev.stop (); 325 flush_ev.stop ();
… …
357rxvt_term::destroy_cb (ev::idle &w, int revents) 347rxvt_term::destroy_cb (ev::idle &w, int revents)
358{ 348{
359 make_current (); 349 make_current ();
360 350
361 delete this; 351 delete this;
352}
353
354void
355rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
356{
357 if (!opt)
358 return;
359
360 uint8_t mask = 1 << (opt & 7);
361 uint8_t &val = options [opt >> 3];
362
363 val = val & ~mask | (set ? mask : 0);
362} 364}
363 365
364/*----------------------------------------------------------------------*/ 366/*----------------------------------------------------------------------*/
365/* 367/*
366 * Exit gracefully, clearing the utmp entry and restoring tty attributes 368 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
380print_x_error (Display *dpy, XErrorEvent *event) 382print_x_error (Display *dpy, XErrorEvent *event)
381{ 383{
382 char buffer[BUFSIZ]; 384 char buffer[BUFSIZ];
383 char mesg[BUFSIZ]; 385 char mesg[BUFSIZ];
384 char number[32]; 386 char number[32];
385 char *mtype = "XlibMessage"; 387 const char mtype[] = "XlibMessage";
386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
388 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 390 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
389 rxvt_warn ("%s: %s\n", mesg, buffer); 391 rxvt_warn ("%s: %s\n", mesg, buffer);
390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
392 sprintf(number, "%d", event->request_code); 394 sprintf(number, "%d", event->request_code);
393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 395 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
… …
474 rxvt_emergency_cleanup (); 476 rxvt_emergency_cleanup ();
475 w.stop (); 477 w.stop ();
476 kill (getpid (), w.signum); 478 kill (getpid (), w.signum);
477} 479}
478 480
481static void
482rxvt_get_ttymode (struct termios *tio)
483{
484 if (tcgetattr (STDIN_FILENO, tio) < 0)
485 memset (tio, 0, sizeof (struct termios));
486
487 for (int i = 0; i < NCCS; i++)
488 tio->c_cc[i] = VDISABLE;
489
490 tio->c_cc[VINTR] = CINTR;
491 tio->c_cc[VQUIT] = CQUIT;
492 tio->c_cc[VERASE] = CERASE;
493#ifdef VERASE2
494 tio->c_cc[VERASE2] = CERASE2;
495#endif
496 tio->c_cc[VKILL] = CKILL;
497 tio->c_cc[VEOF] = CEOF;
498 tio->c_cc[VSTART] = CSTART;
499 tio->c_cc[VSTOP] = CSTOP;
500 tio->c_cc[VSUSP] = CSUSP;
501# ifdef VDSUSP
502 tio->c_cc[VDSUSP] = CDSUSP;
503# endif
504# ifdef VREPRINT
505 tio->c_cc[VREPRINT] = CRPRNT;
506# endif
507# ifdef VDISCRD
508 tio->c_cc[VDISCRD] = CFLUSH;
509# endif
510# ifdef VWERSE
511 tio->c_cc[VWERSE] = CWERASE;
512# endif
513# ifdef VLNEXT
514 tio->c_cc[VLNEXT] = CLNEXT;
515# endif
516# ifdef VSTATUS
517 tio->c_cc[VSTATUS] = CSTATUS;
518# endif
519
520# if VMIN != VEOF
521 tio->c_cc[VMIN] = 1;
522# endif
523# if VTIME != VEOL
524 tio->c_cc[VTIME] = 0;
525# endif
526
527 /* input modes */
528 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
529# ifdef IMAXBEL
530 | IMAXBEL
531# endif
532 | IXON);
533
534 /* output modes */
535 tio->c_oflag = (OPOST | ONLCR);
536
537 /* control modes */
538 tio->c_cflag = (CS8 | CREAD);
539
540 /* local modes */
541 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
542# if defined (ECHOCTL) && defined (ECHOKE)
543 | ECHOCTL | ECHOKE
544# endif
545 | ECHOE | ECHOK);
546}
547
479char **rxvt_environ; // startup environment 548char **rxvt_environ; // startup environment
480 549
481void 550void
482rxvt_init () 551rxvt_init ()
483{ 552{
484 assert (("fontMask must not overlap other RS masks", 553 assert (("fontMask must not overlap other RS masks",
485 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask)))); 554 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
486 555
487 ptytty::init (); 556 rxvt_get_ttymode (&rxvt_term::def_tio);
488 557
558 // get rid of stdin/stdout as we don't need them, to free resources
559 dup2 (STDERR_FILENO, STDIN_FILENO);
560 dup2 (STDERR_FILENO, STDOUT_FILENO);
561
489 if (!ev_default_loop (0)) 562 if (!ev_default_loop ())
490 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 563 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
491 564
492 rxvt_environ = environ; 565 rxvt_environ = environ;
493 566
494 signal (SIGHUP, SIG_IGN); 567 signal (SIGHUP, SIG_IGN);
… …
630 if (recalc_y) 703 if (recalc_y)
631 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 704 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
632 705
633 ncol = width / fwidth; 706 ncol = width / fwidth;
634 nrow = height / fheight; 707 nrow = height / fheight;
708
709 // When the size of the vt window is not a multiple of the cell
710 // size, i.e., when the wm does not honour our size hints, there are
711 // extra areas not covered by the terminal screen. Such gaps, when a
712 // bg pixmap is set, would have to be cleared manually to properly
713 // refresh the background. We take the simpler route and shrink the
714 // vt window so as to avoid creating gaps.
715 vt_width = ncol * fwidth;
716 vt_height = nrow * fheight;
635} 717}
636 718
637/*----------------------------------------------------------------------*/ 719/*----------------------------------------------------------------------*/
638/* 720/*
639 * Tell the teletype handler what size the window is. 721 * Tell the teletype handler what size the window is.
… …
647 729
648 struct winsize ws; 730 struct winsize ws;
649 731
650 ws.ws_col = ncol; 732 ws.ws_col = ncol;
651 ws.ws_row = nrow; 733 ws.ws_row = nrow;
652 ws.ws_xpixel = width; 734 ws.ws_xpixel = vt_width;
653 ws.ws_ypixel = height; 735 ws.ws_ypixel = vt_height;
654 ioctl (pty->pty, TIOCSWINSZ, &ws); 736 ioctl (pty->pty, TIOCSWINSZ, &ws);
655 737
656#if 0 738#if 0
657 // TIOCSWINSZ is supposed to do this automatically and correctly 739 // TIOCSWINSZ is supposed to do this automatically and correctly
658 if (cmd_pid) /* force through to the command */ 740 if (cmd_pid) /* force through to the command */
659 kill (-cmd_pid, SIGWINCH); 741 kill (-cmd_pid, SIGWINCH);
660#endif 742#endif
661} 743}
662 744
663/*----------------------------------------------------------------------*/ 745/*----------------------------------------------------------------------*/
664/* set_fonts () - load and set the various fonts 746/* 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 747bool
672rxvt_term::set_fonts () 748rxvt_term::set_fonts ()
673{ 749{
674 rxvt_fontset *fs = new rxvt_fontset (this); 750 rxvt_fontset *fs = new rxvt_fontset (this);
675 rxvt_fontprop prop; 751 rxvt_fontprop prop;
… …
732#else 808#else
733 fontset[style] = fontset[0]; 809 fontset[style] = fontset[0];
734#endif 810#endif
735 } 811 }
736 812
737 if (parent[0]) 813 if (parent)
738 { 814 {
739 resize_all_windows (0, 0, 0); 815 resize_all_windows (0, 0, 0);
740 scr_remap_chars (); 816 scr_remap_chars ();
741 scr_touch (true); 817 scr_touch (true);
742 } 818 }
… …
745} 821}
746 822
747void 823void
748rxvt_term::set_string_property (Atom prop, const char *str, int len) 824rxvt_term::set_string_property (Atom prop, const char *str, int len)
749{ 825{
750 XChangeProperty (dpy, parent[0], 826 XChangeProperty (dpy, parent,
751 prop, XA_STRING, 8, PropModeReplace, 827 prop, XA_STRING, 8, PropModeReplace,
752 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 828 (const unsigned char *)str, len >= 0 ? len : strlen (str));
753} 829}
754 830
755void 831void
… …
757{ 833{
758 XTextProperty ct; 834 XTextProperty ct;
759 835
760 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 836 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
761 { 837 {
762 XSetTextProperty (dpy, parent[0], &ct, prop); 838 XSetTextProperty (dpy, parent, &ct, prop);
763 XFree (ct.value); 839 XFree (ct.value);
764 } 840 }
765} 841}
766 842
767void 843void
768rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 844rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
769{ 845{
770 wchar_t *ws = rxvt_mbstowcs (str, len); 846 wchar_t *ws = rxvt_mbstowcs (str, len);
771 char *s = rxvt_wcstoutf8 (ws); 847 char *s = rxvt_wcstoutf8 (ws);
772 848
773 XChangeProperty (dpy, parent[0], 849 XChangeProperty (dpy, parent,
774 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 850 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
775 (const unsigned char *)s, strlen (s)); 851 (const unsigned char *)s, strlen (s));
776 852
777 free (s); 853 free (s);
778 free (ws); 854 free (ws);
… …
868 944
869/*----------------------------------------------------------------------*/ 945/*----------------------------------------------------------------------*/
870/* 946/*
871 * find if fg/bg matches any of the normal (low-intensity) colors 947 * find if fg/bg matches any of the normal (low-intensity) colors
872 */ 948 */
873void 949char *
874rxvt_term::set_colorfgbg () 950rxvt_term::get_colorfgbg ()
875{ 951{
876 unsigned int i; 952 unsigned int i;
877 const char *xpmb = ""; 953 const char *xpmb = "";
878 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 954 char fstr[] = "default";
955 char bstr[] = "default";
956 char *env_colorfgbg;
879 957
880 strcpy (fstr, "default");
881 strcpy (bstr, "default");
882 for (i = Color_Black; i <= Color_White; i++) 958 for (i = Color_Black; i <= Color_White; i++)
883 if (pix_colors[Color_fg] == pix_colors[i]) 959 if (pix_colors[Color_fg] == pix_colors[i])
884 { 960 {
885 sprintf (fstr, "%d", (i - Color_Black)); 961 sprintf (fstr, "%d", i - Color_Black);
886 break; 962 break;
887 } 963 }
888 964
889 for (i = Color_Black; i <= Color_White; i++) 965 for (i = Color_Black; i <= Color_White; i++)
890 if (pix_colors[Color_bg] == pix_colors[i]) 966 if (pix_colors[Color_bg] == pix_colors[i])
891 { 967 {
892 sprintf (bstr, "%d", (i - Color_Black)); 968 sprintf (bstr, "%d", i - Color_Black);
893#ifdef BG_IMAGE_FROM_FILE 969#ifdef BG_IMAGE_FROM_FILE
894 xpmb = "default;"; 970 xpmb = "default;";
895#endif 971#endif
896 break; 972 break;
897 } 973 }
898 974
975 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
899 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 976 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
977 return env_colorfgbg;
900} 978}
901 979
902/*----------------------------------------------------------------------*/ 980/*----------------------------------------------------------------------*/
903 981
904bool 982bool
… …
933 1011
934 // 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
935 if (set_hint) 1013 if (set_hint)
936 { 1014 {
937 szHint.flags &= ~(PBaseSize | PResizeInc); 1015 szHint.flags &= ~(PBaseSize | PResizeInc);
938 XSetWMNormalHints (dpy, parent[0], &szHint); 1016 XSetWMNormalHints (dpy, parent, &szHint);
939 szHint.flags |= PBaseSize | PResizeInc; 1017 szHint.flags |= PBaseSize | PResizeInc;
940 } 1018 }
941 1019
942 if (!ignoreparent) 1020 if (!ignoreparent)
943 { 1021 {
… …
949 int x, y, x1, y1; 1027 int x, y, x1, y1;
950 int dx, dy; 1028 int dx, dy;
951 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1029 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
952 Window unused_cr; 1030 Window unused_cr;
953 1031
954 XTranslateCoordinates (dpy, parent[0], display->root, 1032 XTranslateCoordinates (dpy, parent, display->root,
955 0, 0, &x, &y, &unused_cr); 1033 0, 0, &x, &y, &unused_cr);
956 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1034 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
957 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1035 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
958 /* 1036 /*
959 * 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
960 * our position for handles and decorations. Counter it 1038 * our position for handles and decorations. Counter it
961 */ 1039 */
… …
978 if (y < y1) /* top half */ 1056 if (y < y1) /* top half */
979 dy = 0; 1057 dy = 0;
980 else if (y == y1) /* exact center */ 1058 else if (y == y1) /* exact center */
981 dy /= 2; 1059 dy /= 2;
982 1060
983 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1061 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
984 szHint.width, szHint.height); 1062 szHint.width, szHint.height);
985#else 1063#else
986 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1064 XResizeWindow (dpy, parent, szHint.width, szHint.height);
987#endif 1065#endif
988 } 1066 }
989 1067
990 if (set_hint) 1068 if (set_hint)
991 XSetWMNormalHints (dpy, parent[0], &szHint); 1069 XSetWMNormalHints (dpy, parent, &szHint);
992 1070
993 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1071 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
994 1072
995 if (fix_screen || newwidth != old_width || newheight != old_height) 1073 if (fix_screen || newwidth != old_width || newheight != old_height)
996 { 1074 {
997 if (scrollBar.state) 1075 if (scrollBar.state)
998 scrollBar.resize (); 1076 scrollBar.resize ();
999 1077
1000 XMoveResizeWindow (dpy, vt, 1078 XMoveResizeWindow (dpy, vt,
1001 window_vt_x, window_vt_y, 1079 window_vt_x, window_vt_y,
1002 width, height); 1080 vt_width, vt_height);
1003 1081
1004#ifdef HAVE_BG_PIXMAP 1082#ifdef HAVE_BG_PIXMAP
1005 if (bgPixmap.window_size_sensitive ()) 1083 if (bg_window_size_sensitive ())
1006 update_background (); 1084 update_background ();
1007#endif 1085#endif
1008 } 1086 }
1009 1087
1010 if (fix_screen || old_height == 0) 1088 if (fix_screen || old_height == 0)
1011 scr_reset (); 1089 scr_reset ();
1012 1090
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
1019#ifdef USE_XIM 1091#ifdef USE_XIM
1020 IMSetPosition (); 1092 im_set_position ();
1021#endif 1093#endif
1022} 1094}
1023 1095
1024/* 1096/*
1025 * 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.
… …
1038 newwidth = wattr.width - szHint.base_width; 1110 newwidth = wattr.width - szHint.base_width;
1039 if (newheight == 0) 1111 if (newheight == 0)
1040 newheight = wattr.height - szHint.base_height; 1112 newheight = wattr.height - szHint.base_height;
1041 } 1113 }
1042 1114
1043 if (newwidth != width || newheight != height) 1115 if (newwidth != vt_width || newheight != vt_height)
1044 { 1116 {
1045 newwidth += szHint.base_width; 1117 newwidth += szHint.base_width;
1046 newheight += szHint.base_height; 1118 newheight += szHint.base_height;
1047 resize_all_windows (newwidth, newheight, 0); 1119 resize_all_windows (newwidth, newheight, 0);
1048 } 1120 }
… …
1086 status_rect.height = fheight; 1158 status_rect.height = fheight;
1087} 1159}
1088 1160
1089/* Checking whether input method is running. */ 1161/* Checking whether input method is running. */
1090bool 1162bool
1091rxvt_term::IMisRunning () 1163rxvt_term::im_is_running ()
1092{ 1164{
1093 Atom atom; 1165 Atom atom;
1094 Window win; 1166 Window win;
1095 char server[IMBUFSIZ]; 1167 char server[IMBUFSIZ];
1096 1168
… …
1105 1177
1106 atom = XInternAtom (dpy, server, False); 1178 atom = XInternAtom (dpy, server, False);
1107 win = XGetSelectionOwner (dpy, atom); 1179 win = XGetSelectionOwner (dpy, atom);
1108 1180
1109 if (win != None) 1181 if (win != None)
1110 return True; 1182 return true;
1111 } 1183 }
1112 1184
1113 return False; 1185 return false;
1114} 1186}
1115 1187
1116void 1188void
1117rxvt_term::IMSendSpot () 1189rxvt_term::im_send_spot ()
1118{ 1190{
1119 XPoint nspot; 1191 XPoint nspot;
1120 XVaNestedList preedit_attr; 1192 XVaNestedList preedit_attr;
1121 1193
1122 if (!Input_Context 1194 if (!Input_Context
… …
1228/* 1300/*
1229 * 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
1230 * open a suitable preedit type 1302 * open a suitable preedit type
1231 */ 1303 */
1232bool 1304bool
1233rxvt_term::IM_get_IC (const char *modifiers) 1305rxvt_term::im_get_ic (const char *modifiers)
1234{ 1306{
1235 int i, j, found; 1307 int i, j, found;
1236 XIM xim; 1308 XIM xim;
1237 XPoint spot; 1309 XPoint spot;
1238 XRectangle rect, status_rect, needed_rect; 1310 XRectangle rect, status_rect, needed_rect;
1239 unsigned long fg, bg; 1311 unsigned long fg, bg;
1240 const char *p; 1312 const char *p;
1241 char **s; 1313 char **s;
1242 XIMStyles *xim_styles; 1314 XIMStyles *xim_styles;
1243#ifdef ENABLE_XIM_ONTHESPOT
1244 XIMCallback xcb[4];
1245#endif
1246 1315
1247 set_environ (envv); 1316 set_environ (envv);
1248 1317
1249 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1318 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1250 return false; 1319 return false;
… …
1271 p = pet[pi]; 1340 p = pet[pi];
1272 1341
1273 if (!p) 1342 if (!p)
1274 continue; 1343 continue;
1275 1344
1276 s = rxvt_splitcommastring (p); 1345 s = rxvt_strsplit (',', p);
1277 1346
1278 for (i = found = 0; !found && s[i]; i++) 1347 for (i = found = 0; !found && s[i]; i++)
1279 { 1348 {
1280 if (!strcmp (s[i], "OverTheSpot")) 1349 if (!strcmp (s[i], "OverTheSpot"))
1281 input_style = XIMPreeditPosition | XIMStatusNothing; 1350 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1293 input_style = XIMPreeditNothing | XIMStatusNothing; 1362 input_style = XIMPreeditNothing | XIMStatusNothing;
1294 1363
1295 for (j = 0; j < xim_styles->count_styles; j++) 1364 for (j = 0; j < xim_styles->count_styles; j++)
1296 if (input_style == xim_styles->supported_styles[j]) 1365 if (input_style == xim_styles->supported_styles[j])
1297 { 1366 {
1298 rxvt_freecommastring (s); 1367 rxvt_free_strsplit (s);
1299 1368
1300 found = 1; 1369 found = 1;
1301 goto foundpet; 1370 goto foundpet;
1302 } 1371 }
1303 1372
1304 } 1373 }
1305 1374
1306 rxvt_freecommastring (s); 1375 rxvt_free_strsplit (s);
1307 } 1376 }
1308 1377
1309foundpet: 1378foundpet:
1310 1379
1311 XFree (xim_styles); 1380 XFree (xim_styles);
… …
1390 NULL); 1459 NULL);
1391 } 1460 }
1392#if ENABLE_XIM_ONTHESPOT 1461#if ENABLE_XIM_ONTHESPOT
1393 else if (input_style & XIMPreeditCallbacks) 1462 else if (input_style & XIMPreeditCallbacks)
1394 { 1463 {
1464 XIMCallback xcb[4];
1465
1395 im_set_position (spot); 1466 im_set_position (spot);
1396 1467
1397 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;
1398 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;
1399 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;
… …
1414#endif 1485#endif
1415 1486
1416 Input_Context = XCreateIC (xim, 1487 Input_Context = XCreateIC (xim,
1417 XNInputStyle, input_style, 1488 XNInputStyle, input_style,
1418 XNClientWindow, vt, 1489 XNClientWindow, vt,
1419 XNFocusWindow, parent[0], 1490 XNFocusWindow, parent,
1420 preedit_attr ? XNPreeditAttributes : NULL, 1491 preedit_attr ? XNPreeditAttributes : NULL,
1421 preedit_attr, 1492 preedit_attr,
1422 status_attr ? XNStatusAttributes : NULL, 1493 status_attr ? XNStatusAttributes : NULL,
1423 status_attr, NULL); 1494 status_attr, NULL);
1424 1495
… …
1437 // 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
1438 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1509 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1439 vt_select_input (); 1510 vt_select_input ();
1440#endif 1511#endif
1441 1512
1442 IMSetPosition (); 1513 im_set_position ();
1443 1514
1444 return true; 1515 return true;
1445} 1516}
1446 1517
1447void 1518void
… …
1467 p = rs[Rs_inputMethod]; 1538 p = rs[Rs_inputMethod];
1468 if (p && *p) 1539 if (p && *p)
1469 { 1540 {
1470 bool found = false; 1541 bool found = false;
1471 1542
1472 s = rxvt_splitcommastring (p); 1543 s = rxvt_strsplit (',', p);
1473 1544
1474 for (i = 0; s[i]; i++) 1545 for (i = 0; s[i]; i++)
1475 { 1546 {
1476 if (*s[i]) 1547 if (*s[i])
1477 { 1548 {
1478 strcpy (buf, "@im="); 1549 strcpy (buf, "@im=");
1479 strncat (buf, s[i], IMBUFSIZ - 5); 1550 strncat (buf, s[i], IMBUFSIZ - 5);
1480 if (IM_get_IC (buf)) 1551 if (im_get_ic (buf))
1481 { 1552 {
1482 found = true; 1553 found = true;
1483 break; 1554 break;
1484 } 1555 }
1485 } 1556 }
1486 } 1557 }
1487 1558
1488 rxvt_freecommastring (s); 1559 rxvt_free_strsplit (s);
1489 1560
1490 if (found) 1561 if (found)
1491 goto done; 1562 goto done;
1492 } 1563 }
1493 1564
1494 /* try with XMODIFIERS env. var. */ 1565 /* try with XMODIFIERS env. var. */
1495 if (IM_get_IC ("")) 1566 if (im_get_ic (""))
1496 goto done; 1567 goto done;
1497 1568
1498 /* 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 */
1499 if (IM_get_IC ("@im=none")) 1570 if (im_get_ic ("@im=none"))
1500 goto done; 1571 goto done;
1501 1572
1502done: 1573done: ;
1503#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1574#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1504 if (rs[Rs_imLocale]) 1575 if (rs[Rs_imLocale])
1505 SET_LOCALE (locale); 1576 SET_LOCALE (locale);
1506#endif 1577#endif
1507} 1578}
1508 1579
1509void 1580void
1510rxvt_term::IMSetPosition () 1581rxvt_term::im_set_position ()
1511{ 1582{
1512 XRectangle preedit_rect, status_rect, *needed_rect; 1583 XRectangle preedit_rect, status_rect, *needed_rect;
1513 XVaNestedList preedit_attr, status_attr; 1584 XVaNestedList preedit_attr, status_attr;
1514 1585
1515 if (!Input_Context 1586 if (!Input_Context
1516 || !focus 1587 || !focus
1517 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1588 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1518 || !IMisRunning ()) 1589 || !im_is_running ())
1519 return; 1590 return;
1520 1591
1521 if (input_style & XIMPreeditPosition) 1592 if (input_style & XIMPreeditPosition)
1522 { 1593 {
1523 im_set_size (preedit_rect); 1594 im_set_size (preedit_rect);
… …
1553 1624
1554void 1625void
1555rxvt_term::get_window_origin (int &x, int &y) 1626rxvt_term::get_window_origin (int &x, int &y)
1556{ 1627{
1557 Window cr; 1628 Window cr;
1558 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1629 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1559/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1560} 1630}
1561 1631
1562Pixmap 1632Pixmap
1563rxvt_term::get_pixmap_property (int prop_id) 1633rxvt_term::get_pixmap_property (Atom property)
1564{ 1634{
1565 if (prop_id > 0 && prop_id < NUM_XA) 1635 Pixmap pixmap = None;
1566 if (xa[prop_id]) 1636
1567 {
1568 int aformat; 1637 int aformat;
1569 unsigned long nitems, bytes_after; 1638 unsigned long nitems, bytes_after;
1570 Atom atype; 1639 Atom atype;
1571 unsigned char *prop = NULL; 1640 unsigned char *prop;
1572 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1641 int result = XGetWindowProperty (dpy, display->root, property,
1573 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1642 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1574 &nitems, &bytes_after, &prop); 1643 &nitems, &bytes_after, &prop);
1575 if (result == Success && prop && atype == XA_PIXMAP) 1644 if (result == Success)
1645 {
1646 if (atype == XA_PIXMAP)
1576 return *(Pixmap *)prop; 1647 pixmap = *(Pixmap *)prop;
1648 XFree (prop);
1577 } 1649 }
1578 1650
1579 return None; 1651 return pixmap;
1580} 1652}
1581 1653
1582#ifdef HAVE_BG_PIXMAP 1654#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 1655
1593void 1656void
1594rxvt_term::update_background () 1657rxvt_term::update_background ()
1595{ 1658{
1596 if (update_background_ev.is_active ()) 1659 if (update_background_ev.is_active ())
1597 return; 1660 return;
1598 1661
1599 bgPixmap.invalidate (); 1662 bg_invalidate ();
1600 1663
1664 if (!mapped)
1665 return;
1666
1601 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1667 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1602 1668
1603 if (to_wait <= 0.) 1669 if (to_wait <= 0.)
1604 bgPixmap.render (); 1670 bg_render ();
1605 else 1671 else
1606 update_background_ev.start (to_wait); 1672 update_background_ev.start (to_wait);
1607} 1673}
1608 1674
1609void 1675void
1610rxvt_term::update_background_cb (ev::timer &w, int revents) 1676rxvt_term::update_background_cb (ev::timer &w, int revents)
1611{ 1677{
1612 make_current (); 1678 make_current ();
1613 1679
1614 update_background_ev.stop (); 1680 update_background_ev.stop ();
1615 bgPixmap.render (); 1681 bg_render ();
1616 refresh_check (); 1682 refresh_check ();
1617} 1683}
1618 1684
1619#endif /* HAVE_BG_PIXMAP */ 1685#endif /* HAVE_BG_PIXMAP */
1620 1686

Diff Legend

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