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.339 by root, Tue Dec 7 19:53:20 2010 UTC vs.
Revision 1.381 by root, Tue Jun 5 12:04:33 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-2010 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 ();
… …
362 348
363 delete this; 349 delete this;
364} 350}
365 351
366void 352void
367rxvt_term::set_option (uint8_t opt, bool set) 353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
368{ 354{
369 if (!opt) 355 if (!opt)
370 return; 356 return;
371 357
372 uint8_t mask = 1 << (opt & 7); 358 uint8_t mask = 1 << (opt & 7);
… …
376} 362}
377 363
378/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
379/* 365/*
380 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
381 * TODO: if debugging, this should free up any known resources if we can
382 */ 367 */
383static XErrorHandler old_xerror_handler; 368static XErrorHandler old_xerror_handler;
384 369
385static void 370static void
386rxvt_emergency_cleanup () 371rxvt_emergency_cleanup ()
… …
388 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 373 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
389 (*t)->emergency_cleanup (); 374 (*t)->emergency_cleanup ();
390} 375}
391 376
392#if !ENABLE_MINIMAL 377#if !ENABLE_MINIMAL
393static void 378static void ecb_cold
394print_x_error (Display *dpy, XErrorEvent *event) 379print_x_error (Display *dpy, XErrorEvent *event)
395{ 380{
396 char buffer[BUFSIZ]; 381 char buffer[BUFSIZ];
397 char mesg[BUFSIZ]; 382 char mesg[BUFSIZ];
398 char number[32]; 383 char number[32];
399 char *mtype = "XlibMessage"; 384
400 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
401 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
402 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 385 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
386
387 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
388 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
389
390 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
391 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
403 rxvt_warn ("%s: %s\n", mesg, buffer); 392 rxvt_warn ("+ %s: %s\n", mesg, buffer);
393
404 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 394 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
405 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 395 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
406 sprintf(number, "%d", event->request_code); 396
407 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
408 rxvt_warn ("(which is %s)\n", buffer);
409 if (event->request_code >= 128) { 397 if (event->request_code >= 128)
398 {
399#if 0
400 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
401 int nexts;
402 char **exts = XListExtensions (dpy, &nexts);
403
404 while (nexts)
405 {
406 char *extname = exts [nexts - 1];
407 int major, first_event, first_error;
408
409 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
410 {
411 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
412 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
413
414 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
415 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
416 rxvt_warn ("+ (which is %s)\n", buffer);
417
418 break;
419 }
420
421 printf ("nextss %d %s\n", nexts, extname);//D
422 --nexts;
423 ++exts;
424 }
425#else
426 int nexts = 0;
427 char **exts = 0;
428#endif
429
430 if (!nexts)
431 {
432 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
433
410 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 434 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
411 mesg, BUFSIZ); 435 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 436
437 sprintf (number, "%d", event->minor_code);
438 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
439 rxvt_warn ("+ (which is %s)\n", buffer);
440 }
441
442 XFreeExtensionList (exts);
413 } 443 }
444 else
445 {
446 sprintf (number, "%d", event->request_code);
447 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
448 rxvt_warn ("+ (which is %s)\n", buffer);
449 }
450
414 if ((event->error_code == BadWindow) || 451 if (event->error_code == BadWindow
415 (event->error_code == BadPixmap) || 452 || event->error_code == BadPixmap
416 (event->error_code == BadCursor) || 453 || event->error_code == BadCursor
417 (event->error_code == BadFont) || 454 || event->error_code == BadFont
418 (event->error_code == BadDrawable) || 455 || event->error_code == BadDrawable
419 (event->error_code == BadColor) || 456 || event->error_code == BadColor
420 (event->error_code == BadGC) || 457 || event->error_code == BadGC
421 (event->error_code == BadIDChoice) || 458 || event->error_code == BadIDChoice
422 (event->error_code == BadValue) || 459 || event->error_code == BadValue
423 (event->error_code == BadAtom)) { 460 || event->error_code == BadAtom)
461 {
424 if (event->error_code == BadValue) 462 if (event->error_code == BadValue)
425 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 463 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
426 mesg, BUFSIZ);
427 else if (event->error_code == BadAtom) 464 else if (event->error_code == BadAtom)
428 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 465 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
429 mesg, BUFSIZ);
430 else 466 else
431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 467 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
432 mesg, BUFSIZ);
433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
434 }
435 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
436 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
438}
439#endif
440 468
441int 469 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
470 }
471}
472#endif
473
474int ecb_cold
442rxvt_xerror_handler (Display *display, XErrorEvent *event) 475rxvt_xerror_handler (Display *display, XErrorEvent *event)
443{ 476{
444 if (GET_R->allowedxerror == -1) 477 if (GET_R->allowedxerror == -1)
445 GET_R->allowedxerror = event->error_code; 478 GET_R->allowedxerror = event->error_code;
446 else 479 else
… …
455 } 488 }
456 489
457 return 0; 490 return 0;
458} 491}
459 492
460int 493int ecb_cold
461rxvt_xioerror_handler (Display *display) 494rxvt_xioerror_handler (Display *display)
462{ 495{
463 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 496 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
464 DisplayString (display)); 497 DisplayString (display));
465 rxvt_emergency_cleanup (); 498 rxvt_emergency_cleanup ();
… …
585 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 618 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
586 // TODO: handle this with exceptions and tolerate the memory loss 619 // TODO: handle this with exceptions and tolerate the memory loss
587 XSetIOErrorHandler (rxvt_xioerror_handler); 620 XSetIOErrorHandler (rxvt_xioerror_handler);
588 621
589 XrmInitialize (); 622 XrmInitialize ();
623
624#if HAVE_PIXBUF
625 g_type_init ();
626#endif
590} 627}
591 628
592/*----------------------------------------------------------------------*/ 629/*----------------------------------------------------------------------*/
593/* 630/*
594 * window size/position calculations for XSizeHint and other storage. 631 * window size/position calculations for XSizeHint and other storage.
… …
715 if (recalc_y) 752 if (recalc_y)
716 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 753 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
717 754
718 ncol = width / fwidth; 755 ncol = width / fwidth;
719 nrow = height / fheight; 756 nrow = height / fheight;
757
758 // When the size of the vt window is not a multiple of the cell
759 // size, i.e., when the wm does not honour our size hints, there are
760 // extra areas not covered by the terminal screen. Such gaps, when a
761 // bg pixmap is set, would have to be cleared manually to properly
762 // refresh the background. We take the simpler route and shrink the
763 // vt window so as to avoid creating gaps.
764 vt_width = ncol * fwidth;
765 vt_height = nrow * fheight;
720} 766}
721 767
722/*----------------------------------------------------------------------*/ 768/*----------------------------------------------------------------------*/
723/* 769/*
724 * Tell the teletype handler what size the window is. 770 * Tell the teletype handler what size the window is.
… …
732 778
733 struct winsize ws; 779 struct winsize ws;
734 780
735 ws.ws_col = ncol; 781 ws.ws_col = ncol;
736 ws.ws_row = nrow; 782 ws.ws_row = nrow;
737 ws.ws_xpixel = width; 783 ws.ws_xpixel = vt_width;
738 ws.ws_ypixel = height; 784 ws.ws_ypixel = vt_height;
739 ioctl (pty->pty, TIOCSWINSZ, &ws); 785 ioctl (pty->pty, TIOCSWINSZ, &ws);
740 786
741#if 0 787#if 0
742 // TIOCSWINSZ is supposed to do this automatically and correctly 788 // TIOCSWINSZ is supposed to do this automatically and correctly
743 if (cmd_pid) /* force through to the command */ 789 if (cmd_pid) /* force through to the command */
744 kill (-cmd_pid, SIGWINCH); 790 kill (-cmd_pid, SIGWINCH);
745#endif 791#endif
746} 792}
747 793
748/*----------------------------------------------------------------------*/ 794/*----------------------------------------------------------------------*/
749/* set_fonts () - load and set the various fonts 795/* load and set the various fonts */
750 *
751 * init = 1 - initialize
752 *
753 * fontname == FONT_UP - switch to bigger font
754 * fontname == FONT_DN - switch to smaller font
755 */
756bool 796bool
757rxvt_term::set_fonts () 797rxvt_term::set_fonts ()
758{ 798{
759 rxvt_fontset *fs = new rxvt_fontset (this); 799 rxvt_fontset *fs = new rxvt_fontset (this);
760 rxvt_fontprop prop; 800 rxvt_fontprop prop;
… …
775 815
776 delete fontset[0]; 816 delete fontset[0];
777 fontset[0] = fs; 817 fontset[0] = fs;
778 818
779 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 819 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
780 prop.height += lineSpace;
781 prop.width += letterSpace; 820 prop.width += letterSpace;
782 821
783 fs->set_prop (prop, false); 822 fs->set_prop (prop, false);
784 823
785 fwidth = prop.width; 824 fwidth = prop.width;
786 fheight = prop.height; 825 fheight = prop.height + lineSpace;
787 fbase = prop.ascent; 826 fbase = prop.ascent;
788 827
789 for (int style = 1; style < 4; style++) 828 for (int style = 1; style < 4; style++)
790 { 829 {
791#if ENABLE_STYLES 830#if ENABLE_STYLES
… …
817#else 856#else
818 fontset[style] = fontset[0]; 857 fontset[style] = fontset[0];
819#endif 858#endif
820 } 859 }
821 860
822 if (parent[0]) 861 if (parent)
823 { 862 {
824 resize_all_windows (0, 0, 0); 863 resize_all_windows (0, 0, 0);
825 scr_remap_chars (); 864 scr_remap_chars ();
826 scr_touch (true); 865 scr_touch (true);
827 } 866 }
… …
830} 869}
831 870
832void 871void
833rxvt_term::set_string_property (Atom prop, const char *str, int len) 872rxvt_term::set_string_property (Atom prop, const char *str, int len)
834{ 873{
835 XChangeProperty (dpy, parent[0], 874 XChangeProperty (dpy, parent,
836 prop, XA_STRING, 8, PropModeReplace, 875 prop, XA_STRING, 8, PropModeReplace,
837 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 876 (const unsigned char *)str, len >= 0 ? len : strlen (str));
838} 877}
839 878
840void 879void
… …
842{ 881{
843 XTextProperty ct; 882 XTextProperty ct;
844 883
845 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 884 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
846 { 885 {
847 XSetTextProperty (dpy, parent[0], &ct, prop); 886 XSetTextProperty (dpy, parent, &ct, prop);
848 XFree (ct.value); 887 XFree (ct.value);
849 } 888 }
850} 889}
851 890
852void 891void
853rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 892rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
854{ 893{
855 wchar_t *ws = rxvt_mbstowcs (str, len); 894 wchar_t *ws = rxvt_mbstowcs (str, len);
856 char *s = rxvt_wcstoutf8 (ws); 895 char *s = rxvt_wcstoutf8 (ws);
857 896
858 XChangeProperty (dpy, parent[0], 897 XChangeProperty (dpy, parent,
859 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 898 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
860 (const unsigned char *)s, strlen (s)); 899 (const unsigned char *)s, strlen (s));
861 900
862 free (s); 901 free (s);
863 free (ws); 902 free (ws);
… …
953 992
954/*----------------------------------------------------------------------*/ 993/*----------------------------------------------------------------------*/
955/* 994/*
956 * find if fg/bg matches any of the normal (low-intensity) colors 995 * find if fg/bg matches any of the normal (low-intensity) colors
957 */ 996 */
958void 997char *
959rxvt_term::set_colorfgbg () 998rxvt_term::get_colorfgbg ()
960{ 999{
961 unsigned int i; 1000 unsigned int i;
962 const char *xpmb = ""; 1001 const char *xpmb = "";
963 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1002 char fstr[] = "default";
1003 char bstr[] = "default";
1004 char *env_colorfgbg;
964 1005
965 strcpy (fstr, "default");
966 strcpy (bstr, "default");
967 for (i = Color_Black; i <= Color_White; i++) 1006 for (i = Color_Black; i <= Color_White; i++)
968 if (pix_colors[Color_fg] == pix_colors[i]) 1007 if (pix_colors[Color_fg] == pix_colors[i])
969 { 1008 {
970 sprintf (fstr, "%d", (i - Color_Black)); 1009 sprintf (fstr, "%d", i - Color_Black);
971 break; 1010 break;
972 } 1011 }
973 1012
974 for (i = Color_Black; i <= Color_White; i++) 1013 for (i = Color_Black; i <= Color_White; i++)
975 if (pix_colors[Color_bg] == pix_colors[i]) 1014 if (pix_colors[Color_bg] == pix_colors[i])
976 { 1015 {
977 sprintf (bstr, "%d", (i - Color_Black)); 1016 sprintf (bstr, "%d", i - Color_Black);
978#ifdef BG_IMAGE_FROM_FILE 1017#if BG_IMAGE_FROM_FILE
979 xpmb = "default;"; 1018 xpmb = "default;";
980#endif 1019#endif
981 break; 1020 break;
982 } 1021 }
983 1022
1023 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
984 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1024 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1025 return env_colorfgbg;
985} 1026}
986 1027
987/*----------------------------------------------------------------------*/ 1028/*----------------------------------------------------------------------*/
988 1029
989bool 1030bool
… …
1018 1059
1019 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1060 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1020 if (set_hint) 1061 if (set_hint)
1021 { 1062 {
1022 szHint.flags &= ~(PBaseSize | PResizeInc); 1063 szHint.flags &= ~(PBaseSize | PResizeInc);
1023 XSetWMNormalHints (dpy, parent[0], &szHint); 1064 XSetWMNormalHints (dpy, parent, &szHint);
1024 szHint.flags |= PBaseSize | PResizeInc; 1065 szHint.flags |= PBaseSize | PResizeInc;
1025 } 1066 }
1026 1067
1027 if (!ignoreparent) 1068 if (!ignoreparent)
1028 { 1069 {
… …
1034 int x, y, x1, y1; 1075 int x, y, x1, y1;
1035 int dx, dy; 1076 int dx, dy;
1036 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1077 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1037 Window unused_cr; 1078 Window unused_cr;
1038 1079
1039 XTranslateCoordinates (dpy, parent[0], display->root, 1080 XTranslateCoordinates (dpy, parent, display->root,
1040 0, 0, &x, &y, &unused_cr); 1081 0, 0, &x, &y, &unused_cr);
1041 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1082 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1042 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1083 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1043 /* 1084 /*
1044 * if display->root isn't the parent window, a WM will probably have offset 1085 * if display->root isn't the parent window, a WM will probably have offset
1045 * our position for handles and decorations. Counter it 1086 * our position for handles and decorations. Counter it
1046 */ 1087 */
… …
1063 if (y < y1) /* top half */ 1104 if (y < y1) /* top half */
1064 dy = 0; 1105 dy = 0;
1065 else if (y == y1) /* exact center */ 1106 else if (y == y1) /* exact center */
1066 dy /= 2; 1107 dy /= 2;
1067 1108
1068 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1109 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1069 szHint.width, szHint.height); 1110 szHint.width, szHint.height);
1070#else 1111#else
1071 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1112 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1072#endif 1113#endif
1073 } 1114 }
1074 1115
1075 if (set_hint) 1116 if (set_hint)
1076 XSetWMNormalHints (dpy, parent[0], &szHint); 1117 XSetWMNormalHints (dpy, parent, &szHint);
1077 1118
1078 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1119 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1079 1120
1080 if (fix_screen || newwidth != old_width || newheight != old_height) 1121 if (fix_screen || newwidth != old_width || newheight != old_height)
1081 { 1122 {
1082 if (scrollBar.state) 1123 if (scrollBar.state)
1083 scrollBar.resize (); 1124 scrollBar.resize ();
1084 1125
1085 XMoveResizeWindow (dpy, vt, 1126 XMoveResizeWindow (dpy, vt,
1086 window_vt_x, window_vt_y, 1127 window_vt_x, window_vt_y,
1087 width, height); 1128 vt_width, vt_height);
1129
1130 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1088 1131
1089#ifdef HAVE_BG_PIXMAP 1132#ifdef HAVE_BG_PIXMAP
1090 if (bgPixmap.window_size_sensitive ()) 1133 if (bg_window_size_sensitive ())
1091 update_background (); 1134 update_background ();
1092#endif 1135#endif
1093 } 1136 }
1094 1137
1095 if (fix_screen || old_height == 0) 1138 if (fix_screen || old_height == 0)
1096 scr_reset (); 1139 scr_reset ();
1097 1140
1098#ifdef HAVE_BG_PIXMAP
1099// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1100// if (bgPixmap.pixmap)
1101// scr_touch (false);
1102#endif
1103
1104#ifdef USE_XIM 1141#if USE_XIM
1105 IMSetPosition (); 1142 im_set_position ();
1106#endif 1143#endif
1107} 1144}
1108 1145
1109/* 1146/*
1110 * Set the width/height of the vt window in characters. Units are pixels. 1147 * Set the width/height of the vt window in characters. Units are pixels.
… …
1123 newwidth = wattr.width - szHint.base_width; 1160 newwidth = wattr.width - szHint.base_width;
1124 if (newheight == 0) 1161 if (newheight == 0)
1125 newheight = wattr.height - szHint.base_height; 1162 newheight = wattr.height - szHint.base_height;
1126 } 1163 }
1127 1164
1128 if (newwidth != width || newheight != height) 1165 if (newwidth != vt_width || newheight != vt_height)
1129 { 1166 {
1130 newwidth += szHint.base_width; 1167 newwidth += szHint.base_width;
1131 newheight += szHint.base_height; 1168 newheight += szHint.base_height;
1132 resize_all_windows (newwidth, newheight, 0); 1169 resize_all_windows (newwidth, newheight, 0);
1133 } 1170 }
1134} 1171}
1135 1172
1136/* -------------------------------------------------------------------- * 1173/* -------------------------------------------------------------------- *
1137 * - X INPUT METHOD ROUTINES - * 1174 * - X INPUT METHOD ROUTINES - *
1138 * -------------------------------------------------------------------- */ 1175 * -------------------------------------------------------------------- */
1139#ifdef USE_XIM 1176#if USE_XIM
1140 1177
1141void 1178void
1142rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1179rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1143{ 1180{
1144 fg = pix_colors [Color_fg]; 1181 fg = pix_colors [Color_fg];
… …
1171 status_rect.height = fheight; 1208 status_rect.height = fheight;
1172} 1209}
1173 1210
1174/* Checking whether input method is running. */ 1211/* Checking whether input method is running. */
1175bool 1212bool
1176rxvt_term::IMisRunning () 1213rxvt_term::im_is_running ()
1177{ 1214{
1178 Atom atom; 1215 Atom atom;
1179 Window win; 1216 Window win;
1180 char server[IMBUFSIZ]; 1217 char server[IMBUFSIZ];
1181 1218
… …
1190 1227
1191 atom = XInternAtom (dpy, server, False); 1228 atom = XInternAtom (dpy, server, False);
1192 win = XGetSelectionOwner (dpy, atom); 1229 win = XGetSelectionOwner (dpy, atom);
1193 1230
1194 if (win != None) 1231 if (win != None)
1195 return True; 1232 return true;
1196 } 1233 }
1197 1234
1198 return False; 1235 return false;
1199} 1236}
1200 1237
1201void 1238void
1202rxvt_term::IMSendSpot () 1239rxvt_term::im_send_spot ()
1203{ 1240{
1204 XPoint nspot; 1241 XPoint nspot;
1205 XVaNestedList preedit_attr; 1242 XVaNestedList preedit_attr;
1206 1243
1207 if (!Input_Context 1244 if (!Input_Context
… …
1313/* 1350/*
1314 * Try to open a XIM with the current modifiers, then see if we can 1351 * Try to open a XIM with the current modifiers, then see if we can
1315 * open a suitable preedit type 1352 * open a suitable preedit type
1316 */ 1353 */
1317bool 1354bool
1318rxvt_term::IM_get_IC (const char *modifiers) 1355rxvt_term::im_get_ic (const char *modifiers)
1319{ 1356{
1320 int i, j, found; 1357 int i, j, found;
1321 XIM xim; 1358 XIM xim;
1322 XPoint spot; 1359 XPoint spot;
1323 XRectangle rect, status_rect, needed_rect; 1360 XRectangle rect, status_rect, needed_rect;
1324 unsigned long fg, bg; 1361 unsigned long fg, bg;
1325 const char *p; 1362 const char *p;
1326 char **s; 1363 char **s;
1327 XIMStyles *xim_styles; 1364 XIMStyles *xim_styles;
1328#ifdef ENABLE_XIM_ONTHESPOT
1329 XIMCallback xcb[4];
1330#endif
1331 1365
1332 set_environ (envv); 1366 set_environ (envv);
1333 1367
1334 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1368 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1335 return false; 1369 return false;
… …
1356 p = pet[pi]; 1390 p = pet[pi];
1357 1391
1358 if (!p) 1392 if (!p)
1359 continue; 1393 continue;
1360 1394
1361 s = rxvt_splitcommastring (p); 1395 s = rxvt_strsplit (',', p);
1362 1396
1363 for (i = found = 0; !found && s[i]; i++) 1397 for (i = found = 0; !found && s[i]; i++)
1364 { 1398 {
1365 if (!strcmp (s[i], "OverTheSpot")) 1399 if (!strcmp (s[i], "OverTheSpot"))
1366 input_style = XIMPreeditPosition | XIMStatusNothing; 1400 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1378 input_style = XIMPreeditNothing | XIMStatusNothing; 1412 input_style = XIMPreeditNothing | XIMStatusNothing;
1379 1413
1380 for (j = 0; j < xim_styles->count_styles; j++) 1414 for (j = 0; j < xim_styles->count_styles; j++)
1381 if (input_style == xim_styles->supported_styles[j]) 1415 if (input_style == xim_styles->supported_styles[j])
1382 { 1416 {
1383 rxvt_freecommastring (s); 1417 rxvt_free_strsplit (s);
1384 1418
1385 found = 1; 1419 found = 1;
1386 goto foundpet; 1420 goto foundpet;
1387 } 1421 }
1388 1422
1389 } 1423 }
1390 1424
1391 rxvt_freecommastring (s); 1425 rxvt_free_strsplit (s);
1392 } 1426 }
1393 1427
1394foundpet: 1428foundpet:
1395 1429
1396 XFree (xim_styles); 1430 XFree (xim_styles);
… …
1475 NULL); 1509 NULL);
1476 } 1510 }
1477#if ENABLE_XIM_ONTHESPOT 1511#if ENABLE_XIM_ONTHESPOT
1478 else if (input_style & XIMPreeditCallbacks) 1512 else if (input_style & XIMPreeditCallbacks)
1479 { 1513 {
1514 XIMCallback xcb[4];
1515
1480 im_set_position (spot); 1516 im_set_position (spot);
1481 1517
1482 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1518 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1483 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1519 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1484 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1520 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1499#endif 1535#endif
1500 1536
1501 Input_Context = XCreateIC (xim, 1537 Input_Context = XCreateIC (xim,
1502 XNInputStyle, input_style, 1538 XNInputStyle, input_style,
1503 XNClientWindow, vt, 1539 XNClientWindow, vt,
1504 XNFocusWindow, parent[0], 1540 XNFocusWindow, parent,
1505 preedit_attr ? XNPreeditAttributes : NULL, 1541 preedit_attr ? XNPreeditAttributes : NULL,
1506 preedit_attr, 1542 preedit_attr,
1507 status_attr ? XNStatusAttributes : NULL, 1543 status_attr ? XNStatusAttributes : NULL,
1508 status_attr, NULL); 1544 status_attr, NULL);
1509 1545
… …
1522 // unfortunately, only the focus window is used by XIM, hard to fix 1558 // unfortunately, only the focus window is used by XIM, hard to fix
1523 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1559 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1524 vt_select_input (); 1560 vt_select_input ();
1525#endif 1561#endif
1526 1562
1527 IMSetPosition (); 1563 im_set_position ();
1528 1564
1529 return true; 1565 return true;
1530} 1566}
1531 1567
1532void 1568void
… …
1542 im_destroy (); 1578 im_destroy ();
1543 1579
1544 if (Input_Context) 1580 if (Input_Context)
1545 return; 1581 return;
1546 1582
1547#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1548 if (rs[Rs_imLocale]) 1583 if (rs[Rs_imLocale])
1549 SET_LOCALE (rs[Rs_imLocale]); 1584 SET_LOCALE (rs[Rs_imLocale]);
1550#endif
1551 1585
1552 p = rs[Rs_inputMethod]; 1586 p = rs[Rs_inputMethod];
1553 if (p && *p) 1587 if (p && *p)
1554 { 1588 {
1555 bool found = false; 1589 bool found = false;
1556 1590
1557 s = rxvt_splitcommastring (p); 1591 s = rxvt_strsplit (',', p);
1558 1592
1559 for (i = 0; s[i]; i++) 1593 for (i = 0; s[i]; i++)
1560 { 1594 {
1561 if (*s[i]) 1595 if (*s[i])
1562 { 1596 {
1563 strcpy (buf, "@im="); 1597 strcpy (buf, "@im=");
1564 strncat (buf, s[i], IMBUFSIZ - 5); 1598 strncat (buf, s[i], IMBUFSIZ - 5);
1565 if (IM_get_IC (buf)) 1599 if (im_get_ic (buf))
1566 { 1600 {
1567 found = true; 1601 found = true;
1568 break; 1602 break;
1569 } 1603 }
1570 } 1604 }
1571 } 1605 }
1572 1606
1573 rxvt_freecommastring (s); 1607 rxvt_free_strsplit (s);
1574 1608
1575 if (found) 1609 if (found)
1576 goto done; 1610 goto done;
1577 } 1611 }
1578 1612
1579 /* try with XMODIFIERS env. var. */ 1613 /* try with XMODIFIERS env. var. */
1580 if (IM_get_IC ("")) 1614 if (im_get_ic (""))
1581 goto done; 1615 goto done;
1582 1616
1583 /* try with no modifiers base IF the user didn't specify an IM */ 1617 /* try with no modifiers base IF the user didn't specify an IM */
1584 if (IM_get_IC ("@im=none")) 1618 if (im_get_ic ("@im=none"))
1585 goto done; 1619 goto done;
1586 1620
1587done: 1621done:
1588#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1589 if (rs[Rs_imLocale]) 1622 if (rs[Rs_imLocale])
1590 SET_LOCALE (locale); 1623 SET_LOCALE (locale);
1591#endif
1592} 1624}
1593 1625
1594void 1626void
1595rxvt_term::IMSetPosition () 1627rxvt_term::im_set_position ()
1596{ 1628{
1597 XRectangle preedit_rect, status_rect, *needed_rect; 1629 XRectangle preedit_rect, status_rect, *needed_rect;
1598 XVaNestedList preedit_attr, status_attr; 1630 XVaNestedList preedit_attr, status_attr;
1599 1631
1600 if (!Input_Context 1632 if (!Input_Context
1601 || !focus 1633 || !focus
1602 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1634 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1603 || !IMisRunning ()) 1635 || !im_is_running ())
1604 return; 1636 return;
1605 1637
1606 if (input_style & XIMPreeditPosition) 1638 if (input_style & XIMPreeditPosition)
1607 { 1639 {
1608 im_set_size (preedit_rect); 1640 im_set_size (preedit_rect);
… …
1638 1670
1639void 1671void
1640rxvt_term::get_window_origin (int &x, int &y) 1672rxvt_term::get_window_origin (int &x, int &y)
1641{ 1673{
1642 Window cr; 1674 Window cr;
1643 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1675 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1644}
1645
1646Pixmap
1647rxvt_term::get_pixmap_property (int prop_id)
1648{
1649 if (prop_id > 0 && prop_id < NUM_XA)
1650 if (xa[prop_id])
1651 {
1652 int aformat;
1653 unsigned long nitems, bytes_after;
1654 Atom atype;
1655 unsigned char *prop = NULL;
1656 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1657 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1658 &nitems, &bytes_after, &prop);
1659 if (result == Success && prop && atype == XA_PIXMAP)
1660 return *(Pixmap *)prop;
1661 }
1662
1663 return None;
1664} 1676}
1665 1677
1666#ifdef HAVE_BG_PIXMAP 1678#ifdef HAVE_BG_PIXMAP
1667 1679
1668void 1680void
1669rxvt_term::update_background () 1681rxvt_term::update_background ()
1670{ 1682{
1671 if (update_background_ev.is_active ()) 1683 if (update_background_ev.is_active ())
1672 return; 1684 return;
1673 1685
1674 bgPixmap.invalidate (); 1686 bg_invalidate ();
1675 1687
1688 if (!mapped)
1689 return;
1690
1676 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1691 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1677 1692
1678 if (to_wait <= 0.) 1693 if (to_wait <= 0.)
1679 bgPixmap.render (); 1694 bg_render ();
1680 else 1695 else
1681 update_background_ev.start (to_wait); 1696 update_background_ev.start (to_wait);
1682} 1697}
1683 1698
1684void 1699void
1685rxvt_term::update_background_cb (ev::timer &w, int revents) 1700rxvt_term::update_background_cb (ev::timer &w, int revents)
1686{ 1701{
1687 make_current (); 1702 make_current ();
1688 1703
1689 update_background_ev.stop (); 1704 update_background_ev.stop ();
1690 bgPixmap.render (); 1705 bg_render ();
1691 refresh_check (); 1706 refresh_check ();
1692} 1707}
1693 1708
1694#endif /* HAVE_BG_PIXMAP */ 1709#endif /* HAVE_BG_PIXMAP */
1695 1710

Diff Legend

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