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.331 by sf-exg, Mon Jul 26 22:07:38 2010 UTC vs.
Revision 1.376 by root, Mon Jun 4 15:18:52 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));
… …
174#endif 172#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if ENABLE_TRANSPARENCY || ENABLE_PERL
176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177#endif 175#endif
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#ifdef USE_XIM 177#if USE_XIM
180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
181#endif 179#endif
182#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif 182#endif
… …
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 ();
243 selection_clear (true); 234 selection_clear (true);
244 235
245#ifdef USE_XIM 236#if USE_XIM
246 im_destroy (); 237 im_destroy ();
247#endif 238#endif
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
… …
374 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 374 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
375 (*t)->emergency_cleanup (); 375 (*t)->emergency_cleanup ();
376} 376}
377 377
378#if !ENABLE_MINIMAL 378#if !ENABLE_MINIMAL
379static void 379static void ecb_cold
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 occurred, 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);
… …
422 mesg, BUFSIZ); 422 mesg, BUFSIZ);
423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
424} 424}
425#endif 425#endif
426 426
427int 427int ecb_cold
428rxvt_xerror_handler (Display *display, XErrorEvent *event) 428rxvt_xerror_handler (Display *display, XErrorEvent *event)
429{ 429{
430 if (GET_R->allowedxerror == -1) 430 if (GET_R->allowedxerror == -1)
431 GET_R->allowedxerror = event->error_code; 431 GET_R->allowedxerror = event->error_code;
432 else 432 else
… …
441 } 441 }
442 442
443 return 0; 443 return 0;
444} 444}
445 445
446int 446int ecb_cold
447rxvt_xioerror_handler (Display *display) 447rxvt_xioerror_handler (Display *display)
448{ 448{
449 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 449 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
450 DisplayString (display)); 450 DisplayString (display));
451 rxvt_emergency_cleanup (); 451 rxvt_emergency_cleanup ();
… …
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))));
553
554 rxvt_get_ttymode (&rxvt_term::def_tio);
486 555
487 // get rid of stdin/stdout as we don't need them, to free resources 556 // get rid of stdin/stdout as we don't need them, to free resources
488 dup2 (STDERR_FILENO, STDIN_FILENO); 557 dup2 (STDERR_FILENO, STDIN_FILENO);
489 dup2 (STDERR_FILENO, STDOUT_FILENO); 558 dup2 (STDERR_FILENO, STDOUT_FILENO);
490 559
491 ptytty::init ();
492
493 if (!ev_default_loop (0)) 560 if (!ev_default_loop ())
494 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 561 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
495 562
496 rxvt_environ = environ; 563 rxvt_environ = environ;
497 564
498 signal (SIGHUP, SIG_IGN); 565 signal (SIGHUP, SIG_IGN);
… …
504 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 571 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
505 // TODO: handle this with exceptions and tolerate the memory loss 572 // TODO: handle this with exceptions and tolerate the memory loss
506 XSetIOErrorHandler (rxvt_xioerror_handler); 573 XSetIOErrorHandler (rxvt_xioerror_handler);
507 574
508 XrmInitialize (); 575 XrmInitialize ();
576
577#if HAVE_PIXBUF
578 g_type_init ();
579#endif
509} 580}
510 581
511/*----------------------------------------------------------------------*/ 582/*----------------------------------------------------------------------*/
512/* 583/*
513 * window size/position calculations for XSizeHint and other storage. 584 * window size/position calculations for XSizeHint and other storage.
… …
634 if (recalc_y) 705 if (recalc_y)
635 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 706 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
636 707
637 ncol = width / fwidth; 708 ncol = width / fwidth;
638 nrow = height / fheight; 709 nrow = height / fheight;
710
711 // When the size of the vt window is not a multiple of the cell
712 // size, i.e., when the wm does not honour our size hints, there are
713 // extra areas not covered by the terminal screen. Such gaps, when a
714 // bg pixmap is set, would have to be cleared manually to properly
715 // refresh the background. We take the simpler route and shrink the
716 // vt window so as to avoid creating gaps.
717 vt_width = ncol * fwidth;
718 vt_height = nrow * fheight;
639} 719}
640 720
641/*----------------------------------------------------------------------*/ 721/*----------------------------------------------------------------------*/
642/* 722/*
643 * Tell the teletype handler what size the window is. 723 * Tell the teletype handler what size the window is.
… …
651 731
652 struct winsize ws; 732 struct winsize ws;
653 733
654 ws.ws_col = ncol; 734 ws.ws_col = ncol;
655 ws.ws_row = nrow; 735 ws.ws_row = nrow;
656 ws.ws_xpixel = width; 736 ws.ws_xpixel = vt_width;
657 ws.ws_ypixel = height; 737 ws.ws_ypixel = vt_height;
658 ioctl (pty->pty, TIOCSWINSZ, &ws); 738 ioctl (pty->pty, TIOCSWINSZ, &ws);
659 739
660#if 0 740#if 0
661 // TIOCSWINSZ is supposed to do this automatically and correctly 741 // TIOCSWINSZ is supposed to do this automatically and correctly
662 if (cmd_pid) /* force through to the command */ 742 if (cmd_pid) /* force through to the command */
663 kill (-cmd_pid, SIGWINCH); 743 kill (-cmd_pid, SIGWINCH);
664#endif 744#endif
665} 745}
666 746
667/*----------------------------------------------------------------------*/ 747/*----------------------------------------------------------------------*/
668/* set_fonts () - load and set the various fonts 748/* load and set the various fonts */
669 *
670 * init = 1 - initialize
671 *
672 * fontname == FONT_UP - switch to bigger font
673 * fontname == FONT_DN - switch to smaller font
674 */
675bool 749bool
676rxvt_term::set_fonts () 750rxvt_term::set_fonts ()
677{ 751{
678 rxvt_fontset *fs = new rxvt_fontset (this); 752 rxvt_fontset *fs = new rxvt_fontset (this);
679 rxvt_fontprop prop; 753 rxvt_fontprop prop;
… …
694 768
695 delete fontset[0]; 769 delete fontset[0];
696 fontset[0] = fs; 770 fontset[0] = fs;
697 771
698 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 772 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
699 prop.height += lineSpace;
700 prop.width += letterSpace; 773 prop.width += letterSpace;
701 774
702 fs->set_prop (prop, false); 775 fs->set_prop (prop, false);
703 776
704 fwidth = prop.width; 777 fwidth = prop.width;
705 fheight = prop.height; 778 fheight = prop.height + lineSpace;
706 fbase = prop.ascent; 779 fbase = prop.ascent;
707 780
708 for (int style = 1; style < 4; style++) 781 for (int style = 1; style < 4; style++)
709 { 782 {
710#if ENABLE_STYLES 783#if ENABLE_STYLES
… …
736#else 809#else
737 fontset[style] = fontset[0]; 810 fontset[style] = fontset[0];
738#endif 811#endif
739 } 812 }
740 813
741 if (parent[0]) 814 if (parent)
742 { 815 {
743 resize_all_windows (0, 0, 0); 816 resize_all_windows (0, 0, 0);
744 scr_remap_chars (); 817 scr_remap_chars ();
745 scr_touch (true); 818 scr_touch (true);
746 } 819 }
… …
749} 822}
750 823
751void 824void
752rxvt_term::set_string_property (Atom prop, const char *str, int len) 825rxvt_term::set_string_property (Atom prop, const char *str, int len)
753{ 826{
754 XChangeProperty (dpy, parent[0], 827 XChangeProperty (dpy, parent,
755 prop, XA_STRING, 8, PropModeReplace, 828 prop, XA_STRING, 8, PropModeReplace,
756 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 829 (const unsigned char *)str, len >= 0 ? len : strlen (str));
757} 830}
758 831
759void 832void
… …
761{ 834{
762 XTextProperty ct; 835 XTextProperty ct;
763 836
764 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 837 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
765 { 838 {
766 XSetTextProperty (dpy, parent[0], &ct, prop); 839 XSetTextProperty (dpy, parent, &ct, prop);
767 XFree (ct.value); 840 XFree (ct.value);
768 } 841 }
769} 842}
770 843
771void 844void
772rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 845rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
773{ 846{
774 wchar_t *ws = rxvt_mbstowcs (str, len); 847 wchar_t *ws = rxvt_mbstowcs (str, len);
775 char *s = rxvt_wcstoutf8 (ws); 848 char *s = rxvt_wcstoutf8 (ws);
776 849
777 XChangeProperty (dpy, parent[0], 850 XChangeProperty (dpy, parent,
778 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 851 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
779 (const unsigned char *)s, strlen (s)); 852 (const unsigned char *)s, strlen (s));
780 853
781 free (s); 854 free (s);
782 free (ws); 855 free (ws);
… …
872 945
873/*----------------------------------------------------------------------*/ 946/*----------------------------------------------------------------------*/
874/* 947/*
875 * find if fg/bg matches any of the normal (low-intensity) colors 948 * find if fg/bg matches any of the normal (low-intensity) colors
876 */ 949 */
877void 950char *
878rxvt_term::set_colorfgbg () 951rxvt_term::get_colorfgbg ()
879{ 952{
880 unsigned int i; 953 unsigned int i;
881 const char *xpmb = ""; 954 const char *xpmb = "";
882 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 955 char fstr[] = "default";
956 char bstr[] = "default";
957 char *env_colorfgbg;
883 958
884 strcpy (fstr, "default");
885 strcpy (bstr, "default");
886 for (i = Color_Black; i <= Color_White; i++) 959 for (i = Color_Black; i <= Color_White; i++)
887 if (pix_colors[Color_fg] == pix_colors[i]) 960 if (pix_colors[Color_fg] == pix_colors[i])
888 { 961 {
889 sprintf (fstr, "%d", (i - Color_Black)); 962 sprintf (fstr, "%d", i - Color_Black);
890 break; 963 break;
891 } 964 }
892 965
893 for (i = Color_Black; i <= Color_White; i++) 966 for (i = Color_Black; i <= Color_White; i++)
894 if (pix_colors[Color_bg] == pix_colors[i]) 967 if (pix_colors[Color_bg] == pix_colors[i])
895 { 968 {
896 sprintf (bstr, "%d", (i - Color_Black)); 969 sprintf (bstr, "%d", i - Color_Black);
897#ifdef BG_IMAGE_FROM_FILE 970#if BG_IMAGE_FROM_FILE
898 xpmb = "default;"; 971 xpmb = "default;";
899#endif 972#endif
900 break; 973 break;
901 } 974 }
902 975
976 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
903 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 977 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
978 return env_colorfgbg;
904} 979}
905 980
906/*----------------------------------------------------------------------*/ 981/*----------------------------------------------------------------------*/
907 982
908bool 983bool
… …
937 1012
938 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1013 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
939 if (set_hint) 1014 if (set_hint)
940 { 1015 {
941 szHint.flags &= ~(PBaseSize | PResizeInc); 1016 szHint.flags &= ~(PBaseSize | PResizeInc);
942 XSetWMNormalHints (dpy, parent[0], &szHint); 1017 XSetWMNormalHints (dpy, parent, &szHint);
943 szHint.flags |= PBaseSize | PResizeInc; 1018 szHint.flags |= PBaseSize | PResizeInc;
944 } 1019 }
945 1020
946 if (!ignoreparent) 1021 if (!ignoreparent)
947 { 1022 {
… …
953 int x, y, x1, y1; 1028 int x, y, x1, y1;
954 int dx, dy; 1029 int dx, dy;
955 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1030 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
956 Window unused_cr; 1031 Window unused_cr;
957 1032
958 XTranslateCoordinates (dpy, parent[0], display->root, 1033 XTranslateCoordinates (dpy, parent, display->root,
959 0, 0, &x, &y, &unused_cr); 1034 0, 0, &x, &y, &unused_cr);
960 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1035 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
961 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1036 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
962 /* 1037 /*
963 * if display->root isn't the parent window, a WM will probably have offset 1038 * if display->root isn't the parent window, a WM will probably have offset
964 * our position for handles and decorations. Counter it 1039 * our position for handles and decorations. Counter it
965 */ 1040 */
… …
982 if (y < y1) /* top half */ 1057 if (y < y1) /* top half */
983 dy = 0; 1058 dy = 0;
984 else if (y == y1) /* exact center */ 1059 else if (y == y1) /* exact center */
985 dy /= 2; 1060 dy /= 2;
986 1061
987 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1062 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
988 szHint.width, szHint.height); 1063 szHint.width, szHint.height);
989#else 1064#else
990 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1065 XResizeWindow (dpy, parent, szHint.width, szHint.height);
991#endif 1066#endif
992 } 1067 }
993 1068
994 if (set_hint) 1069 if (set_hint)
995 XSetWMNormalHints (dpy, parent[0], &szHint); 1070 XSetWMNormalHints (dpy, parent, &szHint);
996 1071
997 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1072 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
998 1073
999 if (fix_screen || newwidth != old_width || newheight != old_height) 1074 if (fix_screen || newwidth != old_width || newheight != old_height)
1000 { 1075 {
1001 if (scrollBar.state) 1076 if (scrollBar.state)
1002 scrollBar.resize (); 1077 scrollBar.resize ();
1003 1078
1004 XMoveResizeWindow (dpy, vt, 1079 XMoveResizeWindow (dpy, vt,
1005 window_vt_x, window_vt_y, 1080 window_vt_x, window_vt_y,
1006 width, height); 1081 vt_width, vt_height);
1007 1082
1008#ifdef HAVE_BG_PIXMAP 1083#ifdef HAVE_BG_PIXMAP
1009 if (bgPixmap.window_size_sensitive ()) 1084 if (bg_window_size_sensitive ())
1010 update_background (); 1085 update_background ();
1011#endif 1086#endif
1012 } 1087 }
1013 1088
1014 if (fix_screen || old_height == 0) 1089 if (fix_screen || old_height == 0)
1015 scr_reset (); 1090 scr_reset ();
1016 1091
1017#ifdef HAVE_BG_PIXMAP
1018// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1019// if (bgPixmap.pixmap)
1020// scr_touch (false);
1021#endif
1022
1023#ifdef USE_XIM 1092#if USE_XIM
1024 IMSetPosition (); 1093 im_set_position ();
1025#endif 1094#endif
1026} 1095}
1027 1096
1028/* 1097/*
1029 * Set the width/height of the vt window in characters. Units are pixels. 1098 * Set the width/height of the vt window in characters. Units are pixels.
… …
1042 newwidth = wattr.width - szHint.base_width; 1111 newwidth = wattr.width - szHint.base_width;
1043 if (newheight == 0) 1112 if (newheight == 0)
1044 newheight = wattr.height - szHint.base_height; 1113 newheight = wattr.height - szHint.base_height;
1045 } 1114 }
1046 1115
1047 if (newwidth != width || newheight != height) 1116 if (newwidth != vt_width || newheight != vt_height)
1048 { 1117 {
1049 newwidth += szHint.base_width; 1118 newwidth += szHint.base_width;
1050 newheight += szHint.base_height; 1119 newheight += szHint.base_height;
1051 resize_all_windows (newwidth, newheight, 0); 1120 resize_all_windows (newwidth, newheight, 0);
1052 } 1121 }
1053} 1122}
1054 1123
1055/* -------------------------------------------------------------------- * 1124/* -------------------------------------------------------------------- *
1056 * - X INPUT METHOD ROUTINES - * 1125 * - X INPUT METHOD ROUTINES - *
1057 * -------------------------------------------------------------------- */ 1126 * -------------------------------------------------------------------- */
1058#ifdef USE_XIM 1127#if USE_XIM
1059 1128
1060void 1129void
1061rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1130rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1062{ 1131{
1063 fg = pix_colors [Color_fg]; 1132 fg = pix_colors [Color_fg];
… …
1090 status_rect.height = fheight; 1159 status_rect.height = fheight;
1091} 1160}
1092 1161
1093/* Checking whether input method is running. */ 1162/* Checking whether input method is running. */
1094bool 1163bool
1095rxvt_term::IMisRunning () 1164rxvt_term::im_is_running ()
1096{ 1165{
1097 Atom atom; 1166 Atom atom;
1098 Window win; 1167 Window win;
1099 char server[IMBUFSIZ]; 1168 char server[IMBUFSIZ];
1100 1169
… …
1109 1178
1110 atom = XInternAtom (dpy, server, False); 1179 atom = XInternAtom (dpy, server, False);
1111 win = XGetSelectionOwner (dpy, atom); 1180 win = XGetSelectionOwner (dpy, atom);
1112 1181
1113 if (win != None) 1182 if (win != None)
1114 return True; 1183 return true;
1115 } 1184 }
1116 1185
1117 return False; 1186 return false;
1118} 1187}
1119 1188
1120void 1189void
1121rxvt_term::IMSendSpot () 1190rxvt_term::im_send_spot ()
1122{ 1191{
1123 XPoint nspot; 1192 XPoint nspot;
1124 XVaNestedList preedit_attr; 1193 XVaNestedList preedit_attr;
1125 1194
1126 if (!Input_Context 1195 if (!Input_Context
… …
1232/* 1301/*
1233 * Try to open a XIM with the current modifiers, then see if we can 1302 * Try to open a XIM with the current modifiers, then see if we can
1234 * open a suitable preedit type 1303 * open a suitable preedit type
1235 */ 1304 */
1236bool 1305bool
1237rxvt_term::IM_get_IC (const char *modifiers) 1306rxvt_term::im_get_ic (const char *modifiers)
1238{ 1307{
1239 int i, j, found; 1308 int i, j, found;
1240 XIM xim; 1309 XIM xim;
1241 XPoint spot; 1310 XPoint spot;
1242 XRectangle rect, status_rect, needed_rect; 1311 XRectangle rect, status_rect, needed_rect;
1243 unsigned long fg, bg; 1312 unsigned long fg, bg;
1244 const char *p; 1313 const char *p;
1245 char **s; 1314 char **s;
1246 XIMStyles *xim_styles; 1315 XIMStyles *xim_styles;
1247#ifdef ENABLE_XIM_ONTHESPOT
1248 XIMCallback xcb[4];
1249#endif
1250 1316
1251 set_environ (envv); 1317 set_environ (envv);
1252 1318
1253 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1319 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1254 return false; 1320 return false;
… …
1275 p = pet[pi]; 1341 p = pet[pi];
1276 1342
1277 if (!p) 1343 if (!p)
1278 continue; 1344 continue;
1279 1345
1280 s = rxvt_splitcommastring (p); 1346 s = rxvt_strsplit (',', p);
1281 1347
1282 for (i = found = 0; !found && s[i]; i++) 1348 for (i = found = 0; !found && s[i]; i++)
1283 { 1349 {
1284 if (!strcmp (s[i], "OverTheSpot")) 1350 if (!strcmp (s[i], "OverTheSpot"))
1285 input_style = XIMPreeditPosition | XIMStatusNothing; 1351 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1297 input_style = XIMPreeditNothing | XIMStatusNothing; 1363 input_style = XIMPreeditNothing | XIMStatusNothing;
1298 1364
1299 for (j = 0; j < xim_styles->count_styles; j++) 1365 for (j = 0; j < xim_styles->count_styles; j++)
1300 if (input_style == xim_styles->supported_styles[j]) 1366 if (input_style == xim_styles->supported_styles[j])
1301 { 1367 {
1302 rxvt_freecommastring (s); 1368 rxvt_free_strsplit (s);
1303 1369
1304 found = 1; 1370 found = 1;
1305 goto foundpet; 1371 goto foundpet;
1306 } 1372 }
1307 1373
1308 } 1374 }
1309 1375
1310 rxvt_freecommastring (s); 1376 rxvt_free_strsplit (s);
1311 } 1377 }
1312 1378
1313foundpet: 1379foundpet:
1314 1380
1315 XFree (xim_styles); 1381 XFree (xim_styles);
… …
1394 NULL); 1460 NULL);
1395 } 1461 }
1396#if ENABLE_XIM_ONTHESPOT 1462#if ENABLE_XIM_ONTHESPOT
1397 else if (input_style & XIMPreeditCallbacks) 1463 else if (input_style & XIMPreeditCallbacks)
1398 { 1464 {
1465 XIMCallback xcb[4];
1466
1399 im_set_position (spot); 1467 im_set_position (spot);
1400 1468
1401 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1469 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1402 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1470 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1403 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1471 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1418#endif 1486#endif
1419 1487
1420 Input_Context = XCreateIC (xim, 1488 Input_Context = XCreateIC (xim,
1421 XNInputStyle, input_style, 1489 XNInputStyle, input_style,
1422 XNClientWindow, vt, 1490 XNClientWindow, vt,
1423 XNFocusWindow, parent[0], 1491 XNFocusWindow, parent,
1424 preedit_attr ? XNPreeditAttributes : NULL, 1492 preedit_attr ? XNPreeditAttributes : NULL,
1425 preedit_attr, 1493 preedit_attr,
1426 status_attr ? XNStatusAttributes : NULL, 1494 status_attr ? XNStatusAttributes : NULL,
1427 status_attr, NULL); 1495 status_attr, NULL);
1428 1496
… …
1441 // unfortunately, only the focus window is used by XIM, hard to fix 1509 // unfortunately, only the focus window is used by XIM, hard to fix
1442 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1510 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1443 vt_select_input (); 1511 vt_select_input ();
1444#endif 1512#endif
1445 1513
1446 IMSetPosition (); 1514 im_set_position ();
1447 1515
1448 return true; 1516 return true;
1449} 1517}
1450 1518
1451void 1519void
… …
1461 im_destroy (); 1529 im_destroy ();
1462 1530
1463 if (Input_Context) 1531 if (Input_Context)
1464 return; 1532 return;
1465 1533
1466#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1467 if (rs[Rs_imLocale]) 1534 if (rs[Rs_imLocale])
1468 SET_LOCALE (rs[Rs_imLocale]); 1535 SET_LOCALE (rs[Rs_imLocale]);
1469#endif
1470 1536
1471 p = rs[Rs_inputMethod]; 1537 p = rs[Rs_inputMethod];
1472 if (p && *p) 1538 if (p && *p)
1473 { 1539 {
1474 bool found = false; 1540 bool found = false;
1475 1541
1476 s = rxvt_splitcommastring (p); 1542 s = rxvt_strsplit (',', p);
1477 1543
1478 for (i = 0; s[i]; i++) 1544 for (i = 0; s[i]; i++)
1479 { 1545 {
1480 if (*s[i]) 1546 if (*s[i])
1481 { 1547 {
1482 strcpy (buf, "@im="); 1548 strcpy (buf, "@im=");
1483 strncat (buf, s[i], IMBUFSIZ - 5); 1549 strncat (buf, s[i], IMBUFSIZ - 5);
1484 if (IM_get_IC (buf)) 1550 if (im_get_ic (buf))
1485 { 1551 {
1486 found = true; 1552 found = true;
1487 break; 1553 break;
1488 } 1554 }
1489 } 1555 }
1490 } 1556 }
1491 1557
1492 rxvt_freecommastring (s); 1558 rxvt_free_strsplit (s);
1493 1559
1494 if (found) 1560 if (found)
1495 goto done; 1561 goto done;
1496 } 1562 }
1497 1563
1498 /* try with XMODIFIERS env. var. */ 1564 /* try with XMODIFIERS env. var. */
1499 if (IM_get_IC ("")) 1565 if (im_get_ic (""))
1500 goto done; 1566 goto done;
1501 1567
1502 /* try with no modifiers base IF the user didn't specify an IM */ 1568 /* try with no modifiers base IF the user didn't specify an IM */
1503 if (IM_get_IC ("@im=none")) 1569 if (im_get_ic ("@im=none"))
1504 goto done; 1570 goto done;
1505 1571
1506done: 1572done:
1507#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1508 if (rs[Rs_imLocale]) 1573 if (rs[Rs_imLocale])
1509 SET_LOCALE (locale); 1574 SET_LOCALE (locale);
1510#endif
1511} 1575}
1512 1576
1513void 1577void
1514rxvt_term::IMSetPosition () 1578rxvt_term::im_set_position ()
1515{ 1579{
1516 XRectangle preedit_rect, status_rect, *needed_rect; 1580 XRectangle preedit_rect, status_rect, *needed_rect;
1517 XVaNestedList preedit_attr, status_attr; 1581 XVaNestedList preedit_attr, status_attr;
1518 1582
1519 if (!Input_Context 1583 if (!Input_Context
1520 || !focus 1584 || !focus
1521 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1585 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1522 || !IMisRunning ()) 1586 || !im_is_running ())
1523 return; 1587 return;
1524 1588
1525 if (input_style & XIMPreeditPosition) 1589 if (input_style & XIMPreeditPosition)
1526 { 1590 {
1527 im_set_size (preedit_rect); 1591 im_set_size (preedit_rect);
… …
1557 1621
1558void 1622void
1559rxvt_term::get_window_origin (int &x, int &y) 1623rxvt_term::get_window_origin (int &x, int &y)
1560{ 1624{
1561 Window cr; 1625 Window cr;
1562 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1626 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1563/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1564}
1565
1566Pixmap
1567rxvt_term::get_pixmap_property (int prop_id)
1568{
1569 if (prop_id > 0 && prop_id < NUM_XA)
1570 if (xa[prop_id])
1571 {
1572 int aformat;
1573 unsigned long nitems, bytes_after;
1574 Atom atype;
1575 unsigned char *prop = NULL;
1576 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1577 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1578 &nitems, &bytes_after, &prop);
1579 if (result == Success && prop && atype == XA_PIXMAP)
1580 return *(Pixmap *)prop;
1581 }
1582
1583 return None;
1584} 1627}
1585 1628
1586#ifdef HAVE_BG_PIXMAP 1629#ifdef HAVE_BG_PIXMAP
1587# if TRACE_PIXMAPS
1588# undef update_background
1589void
1590rxvt_term::trace_update_background (const char *file, int line)
1591{
1592 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1593 update_background ();
1594}
1595# endif
1596 1630
1597void 1631void
1598rxvt_term::update_background () 1632rxvt_term::update_background ()
1599{ 1633{
1600 if (update_background_ev.is_active ()) 1634 if (update_background_ev.is_active ())
1601 return; 1635 return;
1602 1636
1603 bgPixmap.invalidate (); 1637 bg_invalidate ();
1604 1638
1639 if (!mapped)
1640 return;
1641
1605 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1642 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1606 1643
1607 if (to_wait <= 0.) 1644 if (to_wait <= 0.)
1608 bgPixmap.render (); 1645 bg_render ();
1609 else 1646 else
1610 update_background_ev.start (to_wait); 1647 update_background_ev.start (to_wait);
1611} 1648}
1612 1649
1613void 1650void
1614rxvt_term::update_background_cb (ev::timer &w, int revents) 1651rxvt_term::update_background_cb (ev::timer &w, int revents)
1615{ 1652{
1616 make_current (); 1653 make_current ();
1617 1654
1618 update_background_ev.stop (); 1655 update_background_ev.stop ();
1619 bgPixmap.render (); 1656 bg_render ();
1620 refresh_check (); 1657 refresh_check ();
1621} 1658}
1622 1659
1623#endif /* HAVE_BG_PIXMAP */ 1660#endif /* HAVE_BG_PIXMAP */
1624 1661

Diff Legend

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