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.371 by sf-exg, Thu Jan 19 15:44:49 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);
495 signal (SIGPIPE, SIG_IGN); 566 signal (SIGPIPE, SIG_IGN);
496 567
497 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 568 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
498 sig_handlers.sw_int.start (SIGINT); ev_unref (); 569 sig_handlers.sw_int.start (SIGINT); ev_unref ();
499
500 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
501 /* signal (SIGURG, SIG_DFL); */
502 570
503 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 571 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
504 // TODO: handle this with exceptions and tolerate the memory loss 572 // TODO: handle this with exceptions and tolerate the memory loss
505 XSetIOErrorHandler (rxvt_xioerror_handler); 573 XSetIOErrorHandler (rxvt_xioerror_handler);
506 574
… …
633 if (recalc_y) 701 if (recalc_y)
634 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 702 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
635 703
636 ncol = width / fwidth; 704 ncol = width / fwidth;
637 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;
638} 715}
639 716
640/*----------------------------------------------------------------------*/ 717/*----------------------------------------------------------------------*/
641/* 718/*
642 * Tell the teletype handler what size the window is. 719 * Tell the teletype handler what size the window is.
… …
650 727
651 struct winsize ws; 728 struct winsize ws;
652 729
653 ws.ws_col = ncol; 730 ws.ws_col = ncol;
654 ws.ws_row = nrow; 731 ws.ws_row = nrow;
655 ws.ws_xpixel = width; 732 ws.ws_xpixel = vt_width;
656 ws.ws_ypixel = height; 733 ws.ws_ypixel = vt_height;
657 ioctl (pty->pty, TIOCSWINSZ, &ws); 734 ioctl (pty->pty, TIOCSWINSZ, &ws);
658 735
659#if 0 736#if 0
660 // TIOCSWINSZ is supposed to do this automatically and correctly 737 // TIOCSWINSZ is supposed to do this automatically and correctly
661 if (cmd_pid) /* force through to the command */ 738 if (cmd_pid) /* force through to the command */
662 kill (-cmd_pid, SIGWINCH); 739 kill (-cmd_pid, SIGWINCH);
663#endif 740#endif
664} 741}
665 742
666/*----------------------------------------------------------------------*/ 743/*----------------------------------------------------------------------*/
667/* set_fonts () - load and set the various fonts 744/* 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 745bool
675rxvt_term::set_fonts () 746rxvt_term::set_fonts ()
676{ 747{
677 rxvt_fontset *fs = new rxvt_fontset (this); 748 rxvt_fontset *fs = new rxvt_fontset (this);
678 rxvt_fontprop prop; 749 rxvt_fontprop prop;
… …
735#else 806#else
736 fontset[style] = fontset[0]; 807 fontset[style] = fontset[0];
737#endif 808#endif
738 } 809 }
739 810
740 if (parent[0]) 811 if (parent)
741 { 812 {
742 resize_all_windows (0, 0, 0); 813 resize_all_windows (0, 0, 0);
743 scr_remap_chars (); 814 scr_remap_chars ();
744 scr_touch (true); 815 scr_touch (true);
745 } 816 }
… …
748} 819}
749 820
750void 821void
751rxvt_term::set_string_property (Atom prop, const char *str, int len) 822rxvt_term::set_string_property (Atom prop, const char *str, int len)
752{ 823{
753 XChangeProperty (dpy, parent[0], 824 XChangeProperty (dpy, parent,
754 prop, XA_STRING, 8, PropModeReplace, 825 prop, XA_STRING, 8, PropModeReplace,
755 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 826 (const unsigned char *)str, len >= 0 ? len : strlen (str));
756} 827}
757 828
758void 829void
… …
760{ 831{
761 XTextProperty ct; 832 XTextProperty ct;
762 833
763 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 834 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
764 { 835 {
765 XSetTextProperty (dpy, parent[0], &ct, prop); 836 XSetTextProperty (dpy, parent, &ct, prop);
766 XFree (ct.value); 837 XFree (ct.value);
767 } 838 }
768} 839}
769 840
770void 841void
771rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 842rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
772{ 843{
773 wchar_t *ws = rxvt_mbstowcs (str, len); 844 wchar_t *ws = rxvt_mbstowcs (str, len);
774 char *s = rxvt_wcstoutf8 (ws); 845 char *s = rxvt_wcstoutf8 (ws);
775 846
776 XChangeProperty (dpy, parent[0], 847 XChangeProperty (dpy, parent,
777 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 848 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
778 (const unsigned char *)s, strlen (s)); 849 (const unsigned char *)s, strlen (s));
779 850
780 free (s); 851 free (s);
781 free (ws); 852 free (ws);
… …
871 942
872/*----------------------------------------------------------------------*/ 943/*----------------------------------------------------------------------*/
873/* 944/*
874 * find if fg/bg matches any of the normal (low-intensity) colors 945 * find if fg/bg matches any of the normal (low-intensity) colors
875 */ 946 */
876void 947char *
877rxvt_term::set_colorfgbg () 948rxvt_term::get_colorfgbg ()
878{ 949{
879 unsigned int i; 950 unsigned int i;
880 const char *xpmb = ""; 951 const char *xpmb = "";
881 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 952 char fstr[] = "default";
953 char bstr[] = "default";
954 char *env_colorfgbg;
882 955
883 strcpy (fstr, "default");
884 strcpy (bstr, "default");
885 for (i = Color_Black; i <= Color_White; i++) 956 for (i = Color_Black; i <= Color_White; i++)
886 if (pix_colors[Color_fg] == pix_colors[i]) 957 if (pix_colors[Color_fg] == pix_colors[i])
887 { 958 {
888 sprintf (fstr, "%d", (i - Color_Black)); 959 sprintf (fstr, "%d", i - Color_Black);
889 break; 960 break;
890 } 961 }
891 962
892 for (i = Color_Black; i <= Color_White; i++) 963 for (i = Color_Black; i <= Color_White; i++)
893 if (pix_colors[Color_bg] == pix_colors[i]) 964 if (pix_colors[Color_bg] == pix_colors[i])
894 { 965 {
895 sprintf (bstr, "%d", (i - Color_Black)); 966 sprintf (bstr, "%d", i - Color_Black);
896#ifdef BG_IMAGE_FROM_FILE 967#ifdef BG_IMAGE_FROM_FILE
897 xpmb = "default;"; 968 xpmb = "default;";
898#endif 969#endif
899 break; 970 break;
900 } 971 }
901 972
973 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
902 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 974 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
975 return env_colorfgbg;
903} 976}
904 977
905/*----------------------------------------------------------------------*/ 978/*----------------------------------------------------------------------*/
906 979
907bool 980bool
… …
936 1009
937 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1010 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
938 if (set_hint) 1011 if (set_hint)
939 { 1012 {
940 szHint.flags &= ~(PBaseSize | PResizeInc); 1013 szHint.flags &= ~(PBaseSize | PResizeInc);
941 XSetWMNormalHints (dpy, parent[0], &szHint); 1014 XSetWMNormalHints (dpy, parent, &szHint);
942 szHint.flags |= PBaseSize | PResizeInc; 1015 szHint.flags |= PBaseSize | PResizeInc;
943 } 1016 }
944 1017
945 if (!ignoreparent) 1018 if (!ignoreparent)
946 { 1019 {
… …
952 int x, y, x1, y1; 1025 int x, y, x1, y1;
953 int dx, dy; 1026 int dx, dy;
954 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1027 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
955 Window unused_cr; 1028 Window unused_cr;
956 1029
957 XTranslateCoordinates (dpy, parent[0], display->root, 1030 XTranslateCoordinates (dpy, parent, display->root,
958 0, 0, &x, &y, &unused_cr); 1031 0, 0, &x, &y, &unused_cr);
959 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1032 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
960 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1033 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
961 /* 1034 /*
962 * if display->root isn't the parent window, a WM will probably have offset 1035 * if display->root isn't the parent window, a WM will probably have offset
963 * our position for handles and decorations. Counter it 1036 * our position for handles and decorations. Counter it
964 */ 1037 */
… …
981 if (y < y1) /* top half */ 1054 if (y < y1) /* top half */
982 dy = 0; 1055 dy = 0;
983 else if (y == y1) /* exact center */ 1056 else if (y == y1) /* exact center */
984 dy /= 2; 1057 dy /= 2;
985 1058
986 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1059 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
987 szHint.width, szHint.height); 1060 szHint.width, szHint.height);
988#else 1061#else
989 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1062 XResizeWindow (dpy, parent, szHint.width, szHint.height);
990#endif 1063#endif
991 } 1064 }
992 1065
993 if (set_hint) 1066 if (set_hint)
994 XSetWMNormalHints (dpy, parent[0], &szHint); 1067 XSetWMNormalHints (dpy, parent, &szHint);
995 1068
996 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1069 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
997 1070
998 if (fix_screen || newwidth != old_width || newheight != old_height) 1071 if (fix_screen || newwidth != old_width || newheight != old_height)
999 { 1072 {
1000 if (scrollBar.state) 1073 if (scrollBar.state)
1001 scrollBar.resize (); 1074 scrollBar.resize ();
1002 1075
1003 XMoveResizeWindow (dpy, vt, 1076 XMoveResizeWindow (dpy, vt,
1004 window_vt_x, window_vt_y, 1077 window_vt_x, window_vt_y,
1005 width, height); 1078 vt_width, vt_height);
1006 1079
1007#ifdef HAVE_BG_PIXMAP 1080#ifdef HAVE_BG_PIXMAP
1008 if (bgPixmap.window_size_sensitive ()) 1081 if (bg_window_size_sensitive ())
1009 update_background (); 1082 update_background ();
1010#endif 1083#endif
1011 } 1084 }
1012 1085
1013 if (fix_screen || old_height == 0) 1086 if (fix_screen || old_height == 0)
1014 scr_reset (); 1087 scr_reset ();
1015 1088
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 1089#ifdef USE_XIM
1023 IMSetPosition (); 1090 im_set_position ();
1024#endif 1091#endif
1025} 1092}
1026 1093
1027/* 1094/*
1028 * Set the width/height of the vt window in characters. Units are pixels. 1095 * Set the width/height of the vt window in characters. Units are pixels.
… …
1041 newwidth = wattr.width - szHint.base_width; 1108 newwidth = wattr.width - szHint.base_width;
1042 if (newheight == 0) 1109 if (newheight == 0)
1043 newheight = wattr.height - szHint.base_height; 1110 newheight = wattr.height - szHint.base_height;
1044 } 1111 }
1045 1112
1046 if (newwidth != width || newheight != height) 1113 if (newwidth != vt_width || newheight != vt_height)
1047 { 1114 {
1048 newwidth += szHint.base_width; 1115 newwidth += szHint.base_width;
1049 newheight += szHint.base_height; 1116 newheight += szHint.base_height;
1050 resize_all_windows (newwidth, newheight, 0); 1117 resize_all_windows (newwidth, newheight, 0);
1051 } 1118 }
… …
1089 status_rect.height = fheight; 1156 status_rect.height = fheight;
1090} 1157}
1091 1158
1092/* Checking whether input method is running. */ 1159/* Checking whether input method is running. */
1093bool 1160bool
1094rxvt_term::IMisRunning () 1161rxvt_term::im_is_running ()
1095{ 1162{
1096 Atom atom; 1163 Atom atom;
1097 Window win; 1164 Window win;
1098 char server[IMBUFSIZ]; 1165 char server[IMBUFSIZ];
1099 1166
… …
1108 1175
1109 atom = XInternAtom (dpy, server, False); 1176 atom = XInternAtom (dpy, server, False);
1110 win = XGetSelectionOwner (dpy, atom); 1177 win = XGetSelectionOwner (dpy, atom);
1111 1178
1112 if (win != None) 1179 if (win != None)
1113 return True; 1180 return true;
1114 } 1181 }
1115 1182
1116 return False; 1183 return false;
1117} 1184}
1118 1185
1119void 1186void
1120rxvt_term::IMSendSpot () 1187rxvt_term::im_send_spot ()
1121{ 1188{
1122 XPoint nspot; 1189 XPoint nspot;
1123 XVaNestedList preedit_attr; 1190 XVaNestedList preedit_attr;
1124 1191
1125 if (!Input_Context 1192 if (!Input_Context
… …
1231/* 1298/*
1232 * Try to open a XIM with the current modifiers, then see if we can 1299 * Try to open a XIM with the current modifiers, then see if we can
1233 * open a suitable preedit type 1300 * open a suitable preedit type
1234 */ 1301 */
1235bool 1302bool
1236rxvt_term::IM_get_IC (const char *modifiers) 1303rxvt_term::im_get_ic (const char *modifiers)
1237{ 1304{
1238 int i, j, found; 1305 int i, j, found;
1239 XIM xim; 1306 XIM xim;
1240 XPoint spot; 1307 XPoint spot;
1241 XRectangle rect, status_rect, needed_rect; 1308 XRectangle rect, status_rect, needed_rect;
1242 unsigned long fg, bg; 1309 unsigned long fg, bg;
1243 const char *p; 1310 const char *p;
1244 char **s; 1311 char **s;
1245 XIMStyles *xim_styles; 1312 XIMStyles *xim_styles;
1246#ifdef ENABLE_XIM_ONTHESPOT
1247 XIMCallback xcb[4];
1248#endif
1249 1313
1250 set_environ (envv); 1314 set_environ (envv);
1251 1315
1252 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1316 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1253 return false; 1317 return false;
… …
1274 p = pet[pi]; 1338 p = pet[pi];
1275 1339
1276 if (!p) 1340 if (!p)
1277 continue; 1341 continue;
1278 1342
1279 s = rxvt_splitcommastring (p); 1343 s = rxvt_strsplit (',', p);
1280 1344
1281 for (i = found = 0; !found && s[i]; i++) 1345 for (i = found = 0; !found && s[i]; i++)
1282 { 1346 {
1283 if (!strcmp (s[i], "OverTheSpot")) 1347 if (!strcmp (s[i], "OverTheSpot"))
1284 input_style = XIMPreeditPosition | XIMStatusNothing; 1348 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1296 input_style = XIMPreeditNothing | XIMStatusNothing; 1360 input_style = XIMPreeditNothing | XIMStatusNothing;
1297 1361
1298 for (j = 0; j < xim_styles->count_styles; j++) 1362 for (j = 0; j < xim_styles->count_styles; j++)
1299 if (input_style == xim_styles->supported_styles[j]) 1363 if (input_style == xim_styles->supported_styles[j])
1300 { 1364 {
1301 rxvt_freecommastring (s); 1365 rxvt_free_strsplit (s);
1302 1366
1303 found = 1; 1367 found = 1;
1304 goto foundpet; 1368 goto foundpet;
1305 } 1369 }
1306 1370
1307 } 1371 }
1308 1372
1309 rxvt_freecommastring (s); 1373 rxvt_free_strsplit (s);
1310 } 1374 }
1311 1375
1312foundpet: 1376foundpet:
1313 1377
1314 XFree (xim_styles); 1378 XFree (xim_styles);
… …
1393 NULL); 1457 NULL);
1394 } 1458 }
1395#if ENABLE_XIM_ONTHESPOT 1459#if ENABLE_XIM_ONTHESPOT
1396 else if (input_style & XIMPreeditCallbacks) 1460 else if (input_style & XIMPreeditCallbacks)
1397 { 1461 {
1462 XIMCallback xcb[4];
1463
1398 im_set_position (spot); 1464 im_set_position (spot);
1399 1465
1400 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1466 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; 1467 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; 1468 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1417#endif 1483#endif
1418 1484
1419 Input_Context = XCreateIC (xim, 1485 Input_Context = XCreateIC (xim,
1420 XNInputStyle, input_style, 1486 XNInputStyle, input_style,
1421 XNClientWindow, vt, 1487 XNClientWindow, vt,
1422 XNFocusWindow, parent[0], 1488 XNFocusWindow, parent,
1423 preedit_attr ? XNPreeditAttributes : NULL, 1489 preedit_attr ? XNPreeditAttributes : NULL,
1424 preedit_attr, 1490 preedit_attr,
1425 status_attr ? XNStatusAttributes : NULL, 1491 status_attr ? XNStatusAttributes : NULL,
1426 status_attr, NULL); 1492 status_attr, NULL);
1427 1493
… …
1440 // unfortunately, only the focus window is used by XIM, hard to fix 1506 // unfortunately, only the focus window is used by XIM, hard to fix
1441 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1507 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1442 vt_select_input (); 1508 vt_select_input ();
1443#endif 1509#endif
1444 1510
1445 IMSetPosition (); 1511 im_set_position ();
1446 1512
1447 return true; 1513 return true;
1448} 1514}
1449 1515
1450void 1516void
… …
1460 im_destroy (); 1526 im_destroy ();
1461 1527
1462 if (Input_Context) 1528 if (Input_Context)
1463 return; 1529 return;
1464 1530
1465#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1466 if (rs[Rs_imLocale]) 1531 if (rs[Rs_imLocale])
1467 SET_LOCALE (rs[Rs_imLocale]); 1532 SET_LOCALE (rs[Rs_imLocale]);
1468#endif
1469 1533
1470 p = rs[Rs_inputMethod]; 1534 p = rs[Rs_inputMethod];
1471 if (p && *p) 1535 if (p && *p)
1472 { 1536 {
1473 bool found = false; 1537 bool found = false;
1474 1538
1475 s = rxvt_splitcommastring (p); 1539 s = rxvt_strsplit (',', p);
1476 1540
1477 for (i = 0; s[i]; i++) 1541 for (i = 0; s[i]; i++)
1478 { 1542 {
1479 if (*s[i]) 1543 if (*s[i])
1480 { 1544 {
1481 strcpy (buf, "@im="); 1545 strcpy (buf, "@im=");
1482 strncat (buf, s[i], IMBUFSIZ - 5); 1546 strncat (buf, s[i], IMBUFSIZ - 5);
1483 if (IM_get_IC (buf)) 1547 if (im_get_ic (buf))
1484 { 1548 {
1485 found = true; 1549 found = true;
1486 break; 1550 break;
1487 } 1551 }
1488 } 1552 }
1489 } 1553 }
1490 1554
1491 rxvt_freecommastring (s); 1555 rxvt_free_strsplit (s);
1492 1556
1493 if (found) 1557 if (found)
1494 goto done; 1558 goto done;
1495 } 1559 }
1496 1560
1497 /* try with XMODIFIERS env. var. */ 1561 /* try with XMODIFIERS env. var. */
1498 if (IM_get_IC ("")) 1562 if (im_get_ic (""))
1499 goto done; 1563 goto done;
1500 1564
1501 /* try with no modifiers base IF the user didn't specify an IM */ 1565 /* try with no modifiers base IF the user didn't specify an IM */
1502 if (IM_get_IC ("@im=none")) 1566 if (im_get_ic ("@im=none"))
1503 goto done; 1567 goto done;
1504 1568
1505done: 1569done:
1506#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1507 if (rs[Rs_imLocale]) 1570 if (rs[Rs_imLocale])
1508 SET_LOCALE (locale); 1571 SET_LOCALE (locale);
1509#endif
1510} 1572}
1511 1573
1512void 1574void
1513rxvt_term::IMSetPosition () 1575rxvt_term::im_set_position ()
1514{ 1576{
1515 XRectangle preedit_rect, status_rect, *needed_rect; 1577 XRectangle preedit_rect, status_rect, *needed_rect;
1516 XVaNestedList preedit_attr, status_attr; 1578 XVaNestedList preedit_attr, status_attr;
1517 1579
1518 if (!Input_Context 1580 if (!Input_Context
1519 || !focus 1581 || !focus
1520 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1582 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1521 || !IMisRunning ()) 1583 || !im_is_running ())
1522 return; 1584 return;
1523 1585
1524 if (input_style & XIMPreeditPosition) 1586 if (input_style & XIMPreeditPosition)
1525 { 1587 {
1526 im_set_size (preedit_rect); 1588 im_set_size (preedit_rect);
… …
1556 1618
1557void 1619void
1558rxvt_term::get_window_origin (int &x, int &y) 1620rxvt_term::get_window_origin (int &x, int &y)
1559{ 1621{
1560 Window cr; 1622 Window cr;
1561 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1623 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1562/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1563} 1624}
1564 1625
1565Pixmap 1626Pixmap
1566rxvt_term::get_pixmap_property (int prop_id) 1627rxvt_term::get_pixmap_property (Atom property)
1567{ 1628{
1568 if (prop_id > 0 && prop_id < NUM_XA) 1629 Pixmap pixmap = None;
1569 if (xa[prop_id]) 1630
1570 {
1571 int aformat; 1631 int aformat;
1572 unsigned long nitems, bytes_after; 1632 unsigned long nitems, bytes_after;
1573 Atom atype; 1633 Atom atype;
1574 unsigned char *prop = NULL; 1634 unsigned char *prop;
1575 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1635 int result = XGetWindowProperty (dpy, display->root, property,
1576 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1636 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1577 &nitems, &bytes_after, &prop); 1637 &nitems, &bytes_after, &prop);
1578 if (result == Success && prop && atype == XA_PIXMAP) 1638 if (result == Success)
1639 {
1640 if (atype == XA_PIXMAP)
1579 return *(Pixmap *)prop; 1641 pixmap = *(Pixmap *)prop;
1642 XFree (prop);
1580 } 1643 }
1581 1644
1582 return None; 1645 return pixmap;
1583} 1646}
1584 1647
1585#ifdef HAVE_BG_PIXMAP 1648#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 1649
1596void 1650void
1597rxvt_term::update_background () 1651rxvt_term::update_background ()
1598{ 1652{
1599 if (update_background_ev.is_active ()) 1653 if (update_background_ev.is_active ())
1600 return; 1654 return;
1601 1655
1602 bgPixmap.invalidate (); 1656 bg_invalidate ();
1603 1657
1658 if (!mapped)
1659 return;
1660
1604 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1661 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1605 1662
1606 if (to_wait <= 0.) 1663 if (to_wait <= 0.)
1607 bgPixmap.render (); 1664 bg_render ();
1608 else 1665 else
1609 update_background_ev.start (to_wait); 1666 update_background_ev.start (to_wait);
1610} 1667}
1611 1668
1612void 1669void
1613rxvt_term::update_background_cb (ev::timer &w, int revents) 1670rxvt_term::update_background_cb (ev::timer &w, int revents)
1614{ 1671{
1615 make_current (); 1672 make_current ();
1616 1673
1617 update_background_ev.stop (); 1674 update_background_ev.stop ();
1618 bgPixmap.render (); 1675 bg_render ();
1619 refresh_check (); 1676 refresh_check ();
1620} 1677}
1621 1678
1622#endif /* HAVE_BG_PIXMAP */ 1679#endif /* HAVE_BG_PIXMAP */
1623 1680

Diff Legend

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