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.335 by root, Sun Oct 24 17:52:50 2010 UTC vs.
Revision 1.378 by root, Tue Jun 5 11:10:50 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.
… …
36#include "keyboard.h" 36#include "keyboard.h"
37#include "rxvtperl.h" 37#include "rxvtperl.h"
38 38
39#include <limits> 39#include <limits>
40 40
41#include <cassert> 41#include <assert.h>
42#include <csignal> 42#include <signal.h>
43#include <cstring> 43#include <string.h>
44 44
45#include <termios.h> 45#include <termios.h>
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 51# include <locale.h>
53# endif
54#endif 52#endif
55 53
56struct termios rxvt_term::def_tio; 54struct termios rxvt_term::def_tio;
57vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
58 56
… …
96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
97{ 95{
98 compose_char *cc; 96 compose_char *cc;
99 97
100 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
101 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
102 cc = (*this)[c1]; 100 cc = (*this)[c1];
103 while (cc) 101 while (cc)
104 { 102 {
105 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
106 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
107 } 105 }
108 106
109 // check to see whether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
110 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
111 {
112 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
113 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
114 }
115 111
116 // allocate a new combination 112 // allocate a new combination
117 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
118 { 114 {
119 static int seen; 115 static int seen;
120 116
121 if (!seen++) 117 if (!seen++)
122 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
123 119
124 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
125 } 121 }
126 122
127 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
176#endif 172#endif
177#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if ENABLE_TRANSPARENCY || ENABLE_PERL
178 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
179#endif 175#endif
180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
181#ifdef USE_XIM 177#if USE_XIM
182 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
183#endif 179#endif
184#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
185 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
186#endif 182#endif
… …
189#endif 185#endif
190 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197 192
198 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
199 194
… …
228 delete fontset[i]; 223 delete fontset[i];
229#endif 224#endif
230 delete fontset[0]; 225 delete fontset[0];
231 226
232#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
233 bgPixmap.destroy (); 228 bg_destroy ();
234#endif
235#ifdef HAVE_AFTERIMAGE
236 if (asv)
237 destroy_asvisual (asv, 0);
238 if (asimman)
239 destroy_image_manager (asimman, 0);
240#endif 229#endif
241 230
242 if (display) 231 if (display)
243 { 232 {
244 selection_clear (); 233 selection_clear ();
245 selection_clear (true); 234 selection_clear (true);
246 235
247#ifdef USE_XIM 236#if USE_XIM
248 im_destroy (); 237 im_destroy ();
249#endif 238#endif
250 scrollBar.destroy (); 239 scrollBar.destroy ();
251 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
252 241
253 delete drawable; 242 delete drawable;
254 // destroy all windows 243 // destroy all windows
255 if (parent[0]) 244 if (parent)
256 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
257 246
258 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
259 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
260 { 249 {
261 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
276 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
277 free (allocated [i]); 266 free (allocated [i]);
278 267
279 free (selection.text); 268 free (selection.text);
280 free (selection.clip_text); 269 free (selection.clip_text);
281 // TODO: manage env vars in child only(!)
282 free (env_display);
283 free (env_term);
284 free (locale); 270 free (locale);
285 free (v_buffer); 271 free (v_buffer);
286 free (incr_buf); 272
273 delete selection_req;
287 274
288 delete envv; 275 delete envv;
289 delete argv; 276 delete argv;
290 277
291#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
… …
327#endif 314#endif
328 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
329#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if ENABLE_TRANSPARENCY || ENABLE_PERL
330 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
331#endif 318#endif
332 incr_ev.stop ();
333 termwin_ev.stop (display); 319 termwin_ev.stop (display);
334 vt_ev.stop (display); 320 vt_ev.stop (display);
335 } 321 }
336 322
337 flush_ev.stop (); 323 flush_ev.stop ();
… …
359rxvt_term::destroy_cb (ev::idle &w, int revents) 345rxvt_term::destroy_cb (ev::idle &w, int revents)
360{ 346{
361 make_current (); 347 make_current ();
362 348
363 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);
364} 362}
365 363
366/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
367/* 365/*
368 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
376 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++)
377 (*t)->emergency_cleanup (); 375 (*t)->emergency_cleanup ();
378} 376}
379 377
380#if !ENABLE_MINIMAL 378#if !ENABLE_MINIMAL
381static void 379static void ecb_cold
382print_x_error (Display *dpy, XErrorEvent *event) 380print_x_error (Display *dpy, XErrorEvent *event)
383{ 381{
384 char buffer[BUFSIZ]; 382 char buffer[BUFSIZ];
385 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
386 char number[32]; 384 char number[32];
387 char *mtype = "XlibMessage"; 385 const char mtype[] = "XlibMessage";
386
388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 387 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 388 XGetErrorDatabaseText (dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
390 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 389 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
391 rxvt_warn ("%s: %s\n", mesg, buffer); 390 rxvt_warn ("%s: %s\n", mesg, buffer);
392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 391 XGetErrorDatabaseText (dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 392 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
394 sprintf(number, "%d", event->request_code); 393 sprintf (number, "%d", event->request_code);
395 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 394 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
396 rxvt_warn ("(which is %s)\n", buffer); 395 rxvt_warn ("(which is %s)\n", buffer);
396
397 if (event->request_code >= 128) { 397 if (event->request_code >= 128)
398 {
398 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 399 XGetErrorDatabaseText (dpy, mtype, "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
399 mesg, BUFSIZ);
400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
401 } 401 }
402
402 if ((event->error_code == BadWindow) || 403 if (event->error_code == BadWindow
403 (event->error_code == BadPixmap) || 404 || event->error_code == BadPixmap
404 (event->error_code == BadCursor) || 405 || event->error_code == BadCursor
405 (event->error_code == BadFont) || 406 || event->error_code == BadFont
406 (event->error_code == BadDrawable) || 407 || event->error_code == BadDrawable
407 (event->error_code == BadColor) || 408 || event->error_code == BadColor
408 (event->error_code == BadGC) || 409 || event->error_code == BadGC
409 (event->error_code == BadIDChoice) || 410 || event->error_code == BadIDChoice
410 (event->error_code == BadValue) || 411 || event->error_code == BadValue
411 (event->error_code == BadAtom)) { 412 || event->error_code == BadAtom)
413 {
412 if (event->error_code == BadValue) 414 if (event->error_code == BadValue)
413 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 415 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", mesg, BUFSIZ);
414 mesg, BUFSIZ);
415 else if (event->error_code == BadAtom) 416 else if (event->error_code == BadAtom)
416 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
417 mesg, BUFSIZ);
418 else 418 else
419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
420 mesg, BUFSIZ); 420
421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
422 } 422 }
423
423 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 424 XGetErrorDatabaseText (dpy, mtype, "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
424 mesg, BUFSIZ);
425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
426} 426}
427#endif 427#endif
428 428
429int 429int ecb_cold
430rxvt_xerror_handler (Display *display, XErrorEvent *event) 430rxvt_xerror_handler (Display *display, XErrorEvent *event)
431{ 431{
432 if (GET_R->allowedxerror == -1) 432 if (GET_R->allowedxerror == -1)
433 GET_R->allowedxerror = event->error_code; 433 GET_R->allowedxerror = event->error_code;
434 else 434 else
… …
443 } 443 }
444 444
445 return 0; 445 return 0;
446} 446}
447 447
448int 448int ecb_cold
449rxvt_xioerror_handler (Display *display) 449rxvt_xioerror_handler (Display *display)
450{ 450{
451 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 451 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
452 DisplayString (display)); 452 DisplayString (display));
453 rxvt_emergency_cleanup (); 453 rxvt_emergency_cleanup ();
… …
511 tio->c_cc[VWERSE] = CWERASE; 511 tio->c_cc[VWERSE] = CWERASE;
512# endif 512# endif
513# ifdef VLNEXT 513# ifdef VLNEXT
514 tio->c_cc[VLNEXT] = CLNEXT; 514 tio->c_cc[VLNEXT] = CLNEXT;
515# endif 515# endif
516# ifdef VSTATUS
517 tio->c_cc[VSTATUS] = CSTATUS;
518# endif
516 519
517# if VMIN != VEOF 520# if VMIN != VEOF
518 tio->c_cc[VMIN] = 1; 521 tio->c_cc[VMIN] = 1;
519# endif 522# endif
520# if VTIME != VEOL 523# if VTIME != VEOL
… …
570 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 573 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
571 // TODO: handle this with exceptions and tolerate the memory loss 574 // TODO: handle this with exceptions and tolerate the memory loss
572 XSetIOErrorHandler (rxvt_xioerror_handler); 575 XSetIOErrorHandler (rxvt_xioerror_handler);
573 576
574 XrmInitialize (); 577 XrmInitialize ();
578
579#if HAVE_PIXBUF
580 g_type_init ();
581#endif
575} 582}
576 583
577/*----------------------------------------------------------------------*/ 584/*----------------------------------------------------------------------*/
578/* 585/*
579 * window size/position calculations for XSizeHint and other storage. 586 * window size/position calculations for XSizeHint and other storage.
… …
700 if (recalc_y) 707 if (recalc_y)
701 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 708 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
702 709
703 ncol = width / fwidth; 710 ncol = width / fwidth;
704 nrow = height / fheight; 711 nrow = height / fheight;
712
713 // When the size of the vt window is not a multiple of the cell
714 // size, i.e., when the wm does not honour our size hints, there are
715 // extra areas not covered by the terminal screen. Such gaps, when a
716 // bg pixmap is set, would have to be cleared manually to properly
717 // refresh the background. We take the simpler route and shrink the
718 // vt window so as to avoid creating gaps.
719 vt_width = ncol * fwidth;
720 vt_height = nrow * fheight;
705} 721}
706 722
707/*----------------------------------------------------------------------*/ 723/*----------------------------------------------------------------------*/
708/* 724/*
709 * Tell the teletype handler what size the window is. 725 * Tell the teletype handler what size the window is.
… …
717 733
718 struct winsize ws; 734 struct winsize ws;
719 735
720 ws.ws_col = ncol; 736 ws.ws_col = ncol;
721 ws.ws_row = nrow; 737 ws.ws_row = nrow;
722 ws.ws_xpixel = width; 738 ws.ws_xpixel = vt_width;
723 ws.ws_ypixel = height; 739 ws.ws_ypixel = vt_height;
724 ioctl (pty->pty, TIOCSWINSZ, &ws); 740 ioctl (pty->pty, TIOCSWINSZ, &ws);
725 741
726#if 0 742#if 0
727 // TIOCSWINSZ is supposed to do this automatically and correctly 743 // TIOCSWINSZ is supposed to do this automatically and correctly
728 if (cmd_pid) /* force through to the command */ 744 if (cmd_pid) /* force through to the command */
729 kill (-cmd_pid, SIGWINCH); 745 kill (-cmd_pid, SIGWINCH);
730#endif 746#endif
731} 747}
732 748
733/*----------------------------------------------------------------------*/ 749/*----------------------------------------------------------------------*/
734/* set_fonts () - load and set the various fonts 750/* load and set the various fonts */
735 *
736 * init = 1 - initialize
737 *
738 * fontname == FONT_UP - switch to bigger font
739 * fontname == FONT_DN - switch to smaller font
740 */
741bool 751bool
742rxvt_term::set_fonts () 752rxvt_term::set_fonts ()
743{ 753{
744 rxvt_fontset *fs = new rxvt_fontset (this); 754 rxvt_fontset *fs = new rxvt_fontset (this);
745 rxvt_fontprop prop; 755 rxvt_fontprop prop;
… …
760 770
761 delete fontset[0]; 771 delete fontset[0];
762 fontset[0] = fs; 772 fontset[0] = fs;
763 773
764 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 774 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
765 prop.height += lineSpace;
766 prop.width += letterSpace; 775 prop.width += letterSpace;
767 776
768 fs->set_prop (prop, false); 777 fs->set_prop (prop, false);
769 778
770 fwidth = prop.width; 779 fwidth = prop.width;
771 fheight = prop.height; 780 fheight = prop.height + lineSpace;
772 fbase = prop.ascent; 781 fbase = prop.ascent;
773 782
774 for (int style = 1; style < 4; style++) 783 for (int style = 1; style < 4; style++)
775 { 784 {
776#if ENABLE_STYLES 785#if ENABLE_STYLES
… …
802#else 811#else
803 fontset[style] = fontset[0]; 812 fontset[style] = fontset[0];
804#endif 813#endif
805 } 814 }
806 815
807 if (parent[0]) 816 if (parent)
808 { 817 {
809 resize_all_windows (0, 0, 0); 818 resize_all_windows (0, 0, 0);
810 scr_remap_chars (); 819 scr_remap_chars ();
811 scr_touch (true); 820 scr_touch (true);
812 } 821 }
… …
815} 824}
816 825
817void 826void
818rxvt_term::set_string_property (Atom prop, const char *str, int len) 827rxvt_term::set_string_property (Atom prop, const char *str, int len)
819{ 828{
820 XChangeProperty (dpy, parent[0], 829 XChangeProperty (dpy, parent,
821 prop, XA_STRING, 8, PropModeReplace, 830 prop, XA_STRING, 8, PropModeReplace,
822 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 831 (const unsigned char *)str, len >= 0 ? len : strlen (str));
823} 832}
824 833
825void 834void
… …
827{ 836{
828 XTextProperty ct; 837 XTextProperty ct;
829 838
830 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 839 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
831 { 840 {
832 XSetTextProperty (dpy, parent[0], &ct, prop); 841 XSetTextProperty (dpy, parent, &ct, prop);
833 XFree (ct.value); 842 XFree (ct.value);
834 } 843 }
835} 844}
836 845
837void 846void
838rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 847rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
839{ 848{
840 wchar_t *ws = rxvt_mbstowcs (str, len); 849 wchar_t *ws = rxvt_mbstowcs (str, len);
841 char *s = rxvt_wcstoutf8 (ws); 850 char *s = rxvt_wcstoutf8 (ws);
842 851
843 XChangeProperty (dpy, parent[0], 852 XChangeProperty (dpy, parent,
844 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 853 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
845 (const unsigned char *)s, strlen (s)); 854 (const unsigned char *)s, strlen (s));
846 855
847 free (s); 856 free (s);
848 free (ws); 857 free (ws);
… …
938 947
939/*----------------------------------------------------------------------*/ 948/*----------------------------------------------------------------------*/
940/* 949/*
941 * find if fg/bg matches any of the normal (low-intensity) colors 950 * find if fg/bg matches any of the normal (low-intensity) colors
942 */ 951 */
943void 952char *
944rxvt_term::set_colorfgbg () 953rxvt_term::get_colorfgbg ()
945{ 954{
946 unsigned int i; 955 unsigned int i;
947 const char *xpmb = ""; 956 const char *xpmb = "";
948 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 957 char fstr[] = "default";
958 char bstr[] = "default";
959 char *env_colorfgbg;
949 960
950 strcpy (fstr, "default");
951 strcpy (bstr, "default");
952 for (i = Color_Black; i <= Color_White; i++) 961 for (i = Color_Black; i <= Color_White; i++)
953 if (pix_colors[Color_fg] == pix_colors[i]) 962 if (pix_colors[Color_fg] == pix_colors[i])
954 { 963 {
955 sprintf (fstr, "%d", (i - Color_Black)); 964 sprintf (fstr, "%d", i - Color_Black);
956 break; 965 break;
957 } 966 }
958 967
959 for (i = Color_Black; i <= Color_White; i++) 968 for (i = Color_Black; i <= Color_White; i++)
960 if (pix_colors[Color_bg] == pix_colors[i]) 969 if (pix_colors[Color_bg] == pix_colors[i])
961 { 970 {
962 sprintf (bstr, "%d", (i - Color_Black)); 971 sprintf (bstr, "%d", i - Color_Black);
963#ifdef BG_IMAGE_FROM_FILE 972#if BG_IMAGE_FROM_FILE
964 xpmb = "default;"; 973 xpmb = "default;";
965#endif 974#endif
966 break; 975 break;
967 } 976 }
968 977
978 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
969 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 979 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
980 return env_colorfgbg;
970} 981}
971 982
972/*----------------------------------------------------------------------*/ 983/*----------------------------------------------------------------------*/
973 984
974bool 985bool
… …
1003 1014
1004 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1015 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1005 if (set_hint) 1016 if (set_hint)
1006 { 1017 {
1007 szHint.flags &= ~(PBaseSize | PResizeInc); 1018 szHint.flags &= ~(PBaseSize | PResizeInc);
1008 XSetWMNormalHints (dpy, parent[0], &szHint); 1019 XSetWMNormalHints (dpy, parent, &szHint);
1009 szHint.flags |= PBaseSize | PResizeInc; 1020 szHint.flags |= PBaseSize | PResizeInc;
1010 } 1021 }
1011 1022
1012 if (!ignoreparent) 1023 if (!ignoreparent)
1013 { 1024 {
… …
1019 int x, y, x1, y1; 1030 int x, y, x1, y1;
1020 int dx, dy; 1031 int dx, dy;
1021 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1032 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1022 Window unused_cr; 1033 Window unused_cr;
1023 1034
1024 XTranslateCoordinates (dpy, parent[0], display->root, 1035 XTranslateCoordinates (dpy, parent, display->root,
1025 0, 0, &x, &y, &unused_cr); 1036 0, 0, &x, &y, &unused_cr);
1026 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1037 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1027 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1038 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1028 /* 1039 /*
1029 * if display->root isn't the parent window, a WM will probably have offset 1040 * if display->root isn't the parent window, a WM will probably have offset
1030 * our position for handles and decorations. Counter it 1041 * our position for handles and decorations. Counter it
1031 */ 1042 */
… …
1048 if (y < y1) /* top half */ 1059 if (y < y1) /* top half */
1049 dy = 0; 1060 dy = 0;
1050 else if (y == y1) /* exact center */ 1061 else if (y == y1) /* exact center */
1051 dy /= 2; 1062 dy /= 2;
1052 1063
1053 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1064 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1054 szHint.width, szHint.height); 1065 szHint.width, szHint.height);
1055#else 1066#else
1056 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1067 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1057#endif 1068#endif
1058 } 1069 }
1059 1070
1060 if (set_hint) 1071 if (set_hint)
1061 XSetWMNormalHints (dpy, parent[0], &szHint); 1072 XSetWMNormalHints (dpy, parent, &szHint);
1062 1073
1063 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1074 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1064 1075
1065 if (fix_screen || newwidth != old_width || newheight != old_height) 1076 if (fix_screen || newwidth != old_width || newheight != old_height)
1066 { 1077 {
1067 if (scrollBar.state) 1078 if (scrollBar.state)
1068 scrollBar.resize (); 1079 scrollBar.resize ();
1069 1080
1070 XMoveResizeWindow (dpy, vt, 1081 XMoveResizeWindow (dpy, vt,
1071 window_vt_x, window_vt_y, 1082 window_vt_x, window_vt_y,
1072 width, height); 1083 vt_width, vt_height);
1084
1085 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1073 1086
1074#ifdef HAVE_BG_PIXMAP 1087#ifdef HAVE_BG_PIXMAP
1075 if (bgPixmap.window_size_sensitive ()) 1088 if (bg_window_size_sensitive ())
1076 update_background (); 1089 update_background ();
1077#endif 1090#endif
1078 } 1091 }
1079 1092
1080 if (fix_screen || old_height == 0) 1093 if (fix_screen || old_height == 0)
1081 scr_reset (); 1094 scr_reset ();
1082 1095
1083#ifdef HAVE_BG_PIXMAP
1084// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1085// if (bgPixmap.pixmap)
1086// scr_touch (false);
1087#endif
1088
1089#ifdef USE_XIM 1096#if USE_XIM
1090 IMSetPosition (); 1097 im_set_position ();
1091#endif 1098#endif
1092} 1099}
1093 1100
1094/* 1101/*
1095 * Set the width/height of the vt window in characters. Units are pixels. 1102 * Set the width/height of the vt window in characters. Units are pixels.
… …
1108 newwidth = wattr.width - szHint.base_width; 1115 newwidth = wattr.width - szHint.base_width;
1109 if (newheight == 0) 1116 if (newheight == 0)
1110 newheight = wattr.height - szHint.base_height; 1117 newheight = wattr.height - szHint.base_height;
1111 } 1118 }
1112 1119
1113 if (newwidth != width || newheight != height) 1120 if (newwidth != vt_width || newheight != vt_height)
1114 { 1121 {
1115 newwidth += szHint.base_width; 1122 newwidth += szHint.base_width;
1116 newheight += szHint.base_height; 1123 newheight += szHint.base_height;
1117 resize_all_windows (newwidth, newheight, 0); 1124 resize_all_windows (newwidth, newheight, 0);
1118 } 1125 }
1119} 1126}
1120 1127
1121/* -------------------------------------------------------------------- * 1128/* -------------------------------------------------------------------- *
1122 * - X INPUT METHOD ROUTINES - * 1129 * - X INPUT METHOD ROUTINES - *
1123 * -------------------------------------------------------------------- */ 1130 * -------------------------------------------------------------------- */
1124#ifdef USE_XIM 1131#if USE_XIM
1125 1132
1126void 1133void
1127rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1134rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1128{ 1135{
1129 fg = pix_colors [Color_fg]; 1136 fg = pix_colors [Color_fg];
… …
1156 status_rect.height = fheight; 1163 status_rect.height = fheight;
1157} 1164}
1158 1165
1159/* Checking whether input method is running. */ 1166/* Checking whether input method is running. */
1160bool 1167bool
1161rxvt_term::IMisRunning () 1168rxvt_term::im_is_running ()
1162{ 1169{
1163 Atom atom; 1170 Atom atom;
1164 Window win; 1171 Window win;
1165 char server[IMBUFSIZ]; 1172 char server[IMBUFSIZ];
1166 1173
… …
1175 1182
1176 atom = XInternAtom (dpy, server, False); 1183 atom = XInternAtom (dpy, server, False);
1177 win = XGetSelectionOwner (dpy, atom); 1184 win = XGetSelectionOwner (dpy, atom);
1178 1185
1179 if (win != None) 1186 if (win != None)
1180 return True; 1187 return true;
1181 } 1188 }
1182 1189
1183 return False; 1190 return false;
1184} 1191}
1185 1192
1186void 1193void
1187rxvt_term::IMSendSpot () 1194rxvt_term::im_send_spot ()
1188{ 1195{
1189 XPoint nspot; 1196 XPoint nspot;
1190 XVaNestedList preedit_attr; 1197 XVaNestedList preedit_attr;
1191 1198
1192 if (!Input_Context 1199 if (!Input_Context
… …
1298/* 1305/*
1299 * Try to open a XIM with the current modifiers, then see if we can 1306 * Try to open a XIM with the current modifiers, then see if we can
1300 * open a suitable preedit type 1307 * open a suitable preedit type
1301 */ 1308 */
1302bool 1309bool
1303rxvt_term::IM_get_IC (const char *modifiers) 1310rxvt_term::im_get_ic (const char *modifiers)
1304{ 1311{
1305 int i, j, found; 1312 int i, j, found;
1306 XIM xim; 1313 XIM xim;
1307 XPoint spot; 1314 XPoint spot;
1308 XRectangle rect, status_rect, needed_rect; 1315 XRectangle rect, status_rect, needed_rect;
1309 unsigned long fg, bg; 1316 unsigned long fg, bg;
1310 const char *p; 1317 const char *p;
1311 char **s; 1318 char **s;
1312 XIMStyles *xim_styles; 1319 XIMStyles *xim_styles;
1313#ifdef ENABLE_XIM_ONTHESPOT
1314 XIMCallback xcb[4];
1315#endif
1316 1320
1317 set_environ (envv); 1321 set_environ (envv);
1318 1322
1319 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1323 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1320 return false; 1324 return false;
… …
1341 p = pet[pi]; 1345 p = pet[pi];
1342 1346
1343 if (!p) 1347 if (!p)
1344 continue; 1348 continue;
1345 1349
1346 s = rxvt_splitcommastring (p); 1350 s = rxvt_strsplit (',', p);
1347 1351
1348 for (i = found = 0; !found && s[i]; i++) 1352 for (i = found = 0; !found && s[i]; i++)
1349 { 1353 {
1350 if (!strcmp (s[i], "OverTheSpot")) 1354 if (!strcmp (s[i], "OverTheSpot"))
1351 input_style = XIMPreeditPosition | XIMStatusNothing; 1355 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1363 input_style = XIMPreeditNothing | XIMStatusNothing; 1367 input_style = XIMPreeditNothing | XIMStatusNothing;
1364 1368
1365 for (j = 0; j < xim_styles->count_styles; j++) 1369 for (j = 0; j < xim_styles->count_styles; j++)
1366 if (input_style == xim_styles->supported_styles[j]) 1370 if (input_style == xim_styles->supported_styles[j])
1367 { 1371 {
1368 rxvt_freecommastring (s); 1372 rxvt_free_strsplit (s);
1369 1373
1370 found = 1; 1374 found = 1;
1371 goto foundpet; 1375 goto foundpet;
1372 } 1376 }
1373 1377
1374 } 1378 }
1375 1379
1376 rxvt_freecommastring (s); 1380 rxvt_free_strsplit (s);
1377 } 1381 }
1378 1382
1379foundpet: 1383foundpet:
1380 1384
1381 XFree (xim_styles); 1385 XFree (xim_styles);
… …
1460 NULL); 1464 NULL);
1461 } 1465 }
1462#if ENABLE_XIM_ONTHESPOT 1466#if ENABLE_XIM_ONTHESPOT
1463 else if (input_style & XIMPreeditCallbacks) 1467 else if (input_style & XIMPreeditCallbacks)
1464 { 1468 {
1469 XIMCallback xcb[4];
1470
1465 im_set_position (spot); 1471 im_set_position (spot);
1466 1472
1467 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1473 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1468 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1474 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1469 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1475 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1484#endif 1490#endif
1485 1491
1486 Input_Context = XCreateIC (xim, 1492 Input_Context = XCreateIC (xim,
1487 XNInputStyle, input_style, 1493 XNInputStyle, input_style,
1488 XNClientWindow, vt, 1494 XNClientWindow, vt,
1489 XNFocusWindow, parent[0], 1495 XNFocusWindow, parent,
1490 preedit_attr ? XNPreeditAttributes : NULL, 1496 preedit_attr ? XNPreeditAttributes : NULL,
1491 preedit_attr, 1497 preedit_attr,
1492 status_attr ? XNStatusAttributes : NULL, 1498 status_attr ? XNStatusAttributes : NULL,
1493 status_attr, NULL); 1499 status_attr, NULL);
1494 1500
… …
1507 // unfortunately, only the focus window is used by XIM, hard to fix 1513 // unfortunately, only the focus window is used by XIM, hard to fix
1508 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1514 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1509 vt_select_input (); 1515 vt_select_input ();
1510#endif 1516#endif
1511 1517
1512 IMSetPosition (); 1518 im_set_position ();
1513 1519
1514 return true; 1520 return true;
1515} 1521}
1516 1522
1517void 1523void
… …
1527 im_destroy (); 1533 im_destroy ();
1528 1534
1529 if (Input_Context) 1535 if (Input_Context)
1530 return; 1536 return;
1531 1537
1532#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1533 if (rs[Rs_imLocale]) 1538 if (rs[Rs_imLocale])
1534 SET_LOCALE (rs[Rs_imLocale]); 1539 SET_LOCALE (rs[Rs_imLocale]);
1535#endif
1536 1540
1537 p = rs[Rs_inputMethod]; 1541 p = rs[Rs_inputMethod];
1538 if (p && *p) 1542 if (p && *p)
1539 { 1543 {
1540 bool found = false; 1544 bool found = false;
1541 1545
1542 s = rxvt_splitcommastring (p); 1546 s = rxvt_strsplit (',', p);
1543 1547
1544 for (i = 0; s[i]; i++) 1548 for (i = 0; s[i]; i++)
1545 { 1549 {
1546 if (*s[i]) 1550 if (*s[i])
1547 { 1551 {
1548 strcpy (buf, "@im="); 1552 strcpy (buf, "@im=");
1549 strncat (buf, s[i], IMBUFSIZ - 5); 1553 strncat (buf, s[i], IMBUFSIZ - 5);
1550 if (IM_get_IC (buf)) 1554 if (im_get_ic (buf))
1551 { 1555 {
1552 found = true; 1556 found = true;
1553 break; 1557 break;
1554 } 1558 }
1555 } 1559 }
1556 } 1560 }
1557 1561
1558 rxvt_freecommastring (s); 1562 rxvt_free_strsplit (s);
1559 1563
1560 if (found) 1564 if (found)
1561 goto done; 1565 goto done;
1562 } 1566 }
1563 1567
1564 /* try with XMODIFIERS env. var. */ 1568 /* try with XMODIFIERS env. var. */
1565 if (IM_get_IC ("")) 1569 if (im_get_ic (""))
1566 goto done; 1570 goto done;
1567 1571
1568 /* try with no modifiers base IF the user didn't specify an IM */ 1572 /* try with no modifiers base IF the user didn't specify an IM */
1569 if (IM_get_IC ("@im=none")) 1573 if (im_get_ic ("@im=none"))
1570 goto done; 1574 goto done;
1571 1575
1572done: 1576done:
1573#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1574 if (rs[Rs_imLocale]) 1577 if (rs[Rs_imLocale])
1575 SET_LOCALE (locale); 1578 SET_LOCALE (locale);
1576#endif
1577} 1579}
1578 1580
1579void 1581void
1580rxvt_term::IMSetPosition () 1582rxvt_term::im_set_position ()
1581{ 1583{
1582 XRectangle preedit_rect, status_rect, *needed_rect; 1584 XRectangle preedit_rect, status_rect, *needed_rect;
1583 XVaNestedList preedit_attr, status_attr; 1585 XVaNestedList preedit_attr, status_attr;
1584 1586
1585 if (!Input_Context 1587 if (!Input_Context
1586 || !focus 1588 || !focus
1587 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1589 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1588 || !IMisRunning ()) 1590 || !im_is_running ())
1589 return; 1591 return;
1590 1592
1591 if (input_style & XIMPreeditPosition) 1593 if (input_style & XIMPreeditPosition)
1592 { 1594 {
1593 im_set_size (preedit_rect); 1595 im_set_size (preedit_rect);
… …
1623 1625
1624void 1626void
1625rxvt_term::get_window_origin (int &x, int &y) 1627rxvt_term::get_window_origin (int &x, int &y)
1626{ 1628{
1627 Window cr; 1629 Window cr;
1628 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1630 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1629}
1630
1631Pixmap
1632rxvt_term::get_pixmap_property (int prop_id)
1633{
1634 if (prop_id > 0 && prop_id < NUM_XA)
1635 if (xa[prop_id])
1636 {
1637 int aformat;
1638 unsigned long nitems, bytes_after;
1639 Atom atype;
1640 unsigned char *prop = NULL;
1641 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1642 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1643 &nitems, &bytes_after, &prop);
1644 if (result == Success && prop && atype == XA_PIXMAP)
1645 return *(Pixmap *)prop;
1646 }
1647
1648 return None;
1649} 1631}
1650 1632
1651#ifdef HAVE_BG_PIXMAP 1633#ifdef HAVE_BG_PIXMAP
1652 1634
1653void 1635void
1654rxvt_term::update_background () 1636rxvt_term::update_background ()
1655{ 1637{
1656 if (update_background_ev.is_active ()) 1638 if (update_background_ev.is_active ())
1657 return; 1639 return;
1658 1640
1659 bgPixmap.invalidate (); 1641 bg_invalidate ();
1660 1642
1643 if (!mapped)
1644 return;
1645
1661 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1646 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1662 1647
1663 if (to_wait <= 0.) 1648 if (to_wait <= 0.)
1664 bgPixmap.render (); 1649 bg_render ();
1665 else 1650 else
1666 update_background_ev.start (to_wait); 1651 update_background_ev.start (to_wait);
1667} 1652}
1668 1653
1669void 1654void
1670rxvt_term::update_background_cb (ev::timer &w, int revents) 1655rxvt_term::update_background_cb (ev::timer &w, int revents)
1671{ 1656{
1672 make_current (); 1657 make_current ();
1673 1658
1674 update_background_ev.stop (); 1659 update_background_ev.stop ();
1675 bgPixmap.render (); 1660 bg_render ();
1676 refresh_check (); 1661 refresh_check ();
1677} 1662}
1678 1663
1679#endif /* HAVE_BG_PIXMAP */ 1664#endif /* HAVE_BG_PIXMAP */
1680 1665

Diff Legend

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