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

Diff Legend

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