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.383 by sf-exg, Wed Aug 29 09:43:42 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 ();
… …
361 make_current (); 347 make_current ();
362 348
363 delete this; 349 delete this;
364} 350}
365 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}
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
369 * TODO: if debugging, this should free up any known resources if we can
370 */ 367 */
371static XErrorHandler old_xerror_handler; 368static XErrorHandler old_xerror_handler;
372 369
373static void 370static void
374rxvt_emergency_cleanup () 371rxvt_emergency_cleanup ()
… …
376 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++)
377 (*t)->emergency_cleanup (); 374 (*t)->emergency_cleanup ();
378} 375}
379 376
380#if !ENABLE_MINIMAL 377#if !ENABLE_MINIMAL
381static void 378static void ecb_cold
382print_x_error (Display *dpy, XErrorEvent *event) 379print_x_error (Display *dpy, XErrorEvent *event)
383{ 380{
384 char buffer[BUFSIZ]; 381 char buffer[BUFSIZ];
385 char mesg[BUFSIZ]; 382 char mesg[BUFSIZ];
386 char number[32]; 383 char number[32];
387 char *mtype = "XlibMessage"; 384
388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
390 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);
391 rxvt_warn ("%s: %s\n", mesg, buffer); 392 rxvt_warn ("+ %s: %s\n", mesg, buffer);
393
392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 394 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 395 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
394 sprintf(number, "%d", event->request_code); 396
395 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
396 rxvt_warn ("(which is %s)\n", buffer);
397 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
398 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 434 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
399 mesg, BUFSIZ); 435 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 436
437#if 0
438 sprintf (number, "RENDER.%d", event->minor_code);
439 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
440 rxvt_warn ("+ (which is %s)\n", buffer);
441#endif
442 }
443
444 XFreeExtensionList (exts);
401 } 445 }
446 else
447 {
448 sprintf (number, "%d", event->request_code);
449 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
450 rxvt_warn ("+ (which is %s)\n", buffer);
451 }
452
402 if ((event->error_code == BadWindow) || 453 if (event->error_code == BadWindow
403 (event->error_code == BadPixmap) || 454 || event->error_code == BadPixmap
404 (event->error_code == BadCursor) || 455 || event->error_code == BadCursor
405 (event->error_code == BadFont) || 456 || event->error_code == BadFont
406 (event->error_code == BadDrawable) || 457 || event->error_code == BadDrawable
407 (event->error_code == BadColor) || 458 || event->error_code == BadColor
408 (event->error_code == BadGC) || 459 || event->error_code == BadGC
409 (event->error_code == BadIDChoice) || 460 || event->error_code == BadIDChoice
410 (event->error_code == BadValue) || 461 || event->error_code == BadValue
411 (event->error_code == BadAtom)) { 462 || event->error_code == BadAtom)
463 {
412 if (event->error_code == BadValue) 464 if (event->error_code == BadValue)
413 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 465 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
414 mesg, BUFSIZ);
415 else if (event->error_code == BadAtom) 466 else if (event->error_code == BadAtom)
416 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 467 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
417 mesg, BUFSIZ);
418 else 468 else
419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 469 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
420 mesg, BUFSIZ);
421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
422 }
423 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
424 mesg, BUFSIZ);
425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
426}
427#endif
428 470
429int 471 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
472 }
473}
474#endif
475
476int ecb_cold
430rxvt_xerror_handler (Display *display, XErrorEvent *event) 477rxvt_xerror_handler (Display *display, XErrorEvent *event)
431{ 478{
432 if (GET_R->allowedxerror == -1) 479 if (GET_R->allowedxerror == -1)
433 GET_R->allowedxerror = event->error_code; 480 GET_R->allowedxerror = event->error_code;
434 else 481 else
… …
443 } 490 }
444 491
445 return 0; 492 return 0;
446} 493}
447 494
448int 495int ecb_cold
449rxvt_xioerror_handler (Display *display) 496rxvt_xioerror_handler (Display *display)
450{ 497{
451 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 498 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
452 DisplayString (display)); 499 DisplayString (display));
453 rxvt_emergency_cleanup (); 500 rxvt_emergency_cleanup ();
… …
511 tio->c_cc[VWERSE] = CWERASE; 558 tio->c_cc[VWERSE] = CWERASE;
512# endif 559# endif
513# ifdef VLNEXT 560# ifdef VLNEXT
514 tio->c_cc[VLNEXT] = CLNEXT; 561 tio->c_cc[VLNEXT] = CLNEXT;
515# endif 562# endif
563# ifdef VSTATUS
564 tio->c_cc[VSTATUS] = CSTATUS;
565# endif
516 566
517# if VMIN != VEOF 567# if VMIN != VEOF
518 tio->c_cc[VMIN] = 1; 568 tio->c_cc[VMIN] = 1;
519# endif 569# endif
520# if VTIME != VEOL 570# if VTIME != VEOL
… …
570 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 620 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
571 // TODO: handle this with exceptions and tolerate the memory loss 621 // TODO: handle this with exceptions and tolerate the memory loss
572 XSetIOErrorHandler (rxvt_xioerror_handler); 622 XSetIOErrorHandler (rxvt_xioerror_handler);
573 623
574 XrmInitialize (); 624 XrmInitialize ();
625
626#if HAVE_PIXBUF
627 g_type_init ();
628#endif
575} 629}
576 630
577/*----------------------------------------------------------------------*/ 631/*----------------------------------------------------------------------*/
578/* 632/*
579 * window size/position calculations for XSizeHint and other storage. 633 * window size/position calculations for XSizeHint and other storage.
… …
700 if (recalc_y) 754 if (recalc_y)
701 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 755 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
702 756
703 ncol = width / fwidth; 757 ncol = width / fwidth;
704 nrow = height / fheight; 758 nrow = height / fheight;
759
760 // When the size of the vt window is not a multiple of the cell
761 // size, i.e., when the wm does not honour our size hints, there are
762 // extra areas not covered by the terminal screen. Such gaps, when a
763 // bg pixmap is set, would have to be cleared manually to properly
764 // refresh the background. We take the simpler route and shrink the
765 // vt window so as to avoid creating gaps.
766 vt_width = ncol * fwidth;
767 vt_height = nrow * fheight;
705} 768}
706 769
707/*----------------------------------------------------------------------*/ 770/*----------------------------------------------------------------------*/
708/* 771/*
709 * Tell the teletype handler what size the window is. 772 * Tell the teletype handler what size the window is.
… …
717 780
718 struct winsize ws; 781 struct winsize ws;
719 782
720 ws.ws_col = ncol; 783 ws.ws_col = ncol;
721 ws.ws_row = nrow; 784 ws.ws_row = nrow;
722 ws.ws_xpixel = width; 785 ws.ws_xpixel = vt_width;
723 ws.ws_ypixel = height; 786 ws.ws_ypixel = vt_height;
724 ioctl (pty->pty, TIOCSWINSZ, &ws); 787 ioctl (pty->pty, TIOCSWINSZ, &ws);
725 788
726#if 0 789#if 0
727 // TIOCSWINSZ is supposed to do this automatically and correctly 790 // TIOCSWINSZ is supposed to do this automatically and correctly
728 if (cmd_pid) /* force through to the command */ 791 if (cmd_pid) /* force through to the command */
729 kill (-cmd_pid, SIGWINCH); 792 kill (-cmd_pid, SIGWINCH);
730#endif 793#endif
731} 794}
732 795
733/*----------------------------------------------------------------------*/ 796/*----------------------------------------------------------------------*/
734/* set_fonts () - load and set the various fonts 797/* 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 798bool
742rxvt_term::set_fonts () 799rxvt_term::set_fonts ()
743{ 800{
744 rxvt_fontset *fs = new rxvt_fontset (this); 801 rxvt_fontset *fs = new rxvt_fontset (this);
745 rxvt_fontprop prop; 802 rxvt_fontprop prop;
… …
760 817
761 delete fontset[0]; 818 delete fontset[0];
762 fontset[0] = fs; 819 fontset[0] = fs;
763 820
764 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 821 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
765 prop.height += lineSpace; 822 prop.width = max (prop.width + letterSpace, 1);
766 prop.width += letterSpace;
767 823
768 fs->set_prop (prop, false); 824 fs->set_prop (prop, false);
769 825
770 fwidth = prop.width; 826 fwidth = prop.width;
771 fheight = prop.height; 827 fheight = prop.height + lineSpace;
772 fbase = prop.ascent; 828 fbase = prop.ascent;
773 829
774 for (int style = 1; style < 4; style++) 830 for (int style = 1; style < 4; style++)
775 { 831 {
776#if ENABLE_STYLES 832#if ENABLE_STYLES
… …
802#else 858#else
803 fontset[style] = fontset[0]; 859 fontset[style] = fontset[0];
804#endif 860#endif
805 } 861 }
806 862
807 if (parent[0]) 863 if (parent)
808 { 864 {
809 resize_all_windows (0, 0, 0); 865 resize_all_windows (0, 0, 0);
810 scr_remap_chars (); 866 scr_remap_chars ();
811 scr_touch (true); 867 scr_touch (true);
812 } 868 }
… …
815} 871}
816 872
817void 873void
818rxvt_term::set_string_property (Atom prop, const char *str, int len) 874rxvt_term::set_string_property (Atom prop, const char *str, int len)
819{ 875{
820 XChangeProperty (dpy, parent[0], 876 XChangeProperty (dpy, parent,
821 prop, XA_STRING, 8, PropModeReplace, 877 prop, XA_STRING, 8, PropModeReplace,
822 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 878 (const unsigned char *)str, len >= 0 ? len : strlen (str));
823} 879}
824 880
825void 881void
… …
827{ 883{
828 XTextProperty ct; 884 XTextProperty ct;
829 885
830 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 886 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
831 { 887 {
832 XSetTextProperty (dpy, parent[0], &ct, prop); 888 XSetTextProperty (dpy, parent, &ct, prop);
833 XFree (ct.value); 889 XFree (ct.value);
834 } 890 }
835} 891}
836 892
837void 893void
838rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 894rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
839{ 895{
840 wchar_t *ws = rxvt_mbstowcs (str, len); 896 wchar_t *ws = rxvt_mbstowcs (str, len);
841 char *s = rxvt_wcstoutf8 (ws); 897 char *s = rxvt_wcstoutf8 (ws);
842 898
843 XChangeProperty (dpy, parent[0], 899 XChangeProperty (dpy, parent,
844 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 900 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
845 (const unsigned char *)s, strlen (s)); 901 (const unsigned char *)s, strlen (s));
846 902
847 free (s); 903 free (s);
848 free (ws); 904 free (ws);
… …
938 994
939/*----------------------------------------------------------------------*/ 995/*----------------------------------------------------------------------*/
940/* 996/*
941 * find if fg/bg matches any of the normal (low-intensity) colors 997 * find if fg/bg matches any of the normal (low-intensity) colors
942 */ 998 */
943void 999char *
944rxvt_term::set_colorfgbg () 1000rxvt_term::get_colorfgbg ()
945{ 1001{
946 unsigned int i; 1002 unsigned int i;
947 const char *xpmb = ""; 1003 const char *xpmb = "";
948 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1004 char fstr[] = "default";
1005 char bstr[] = "default";
1006 char *env_colorfgbg;
949 1007
950 strcpy (fstr, "default");
951 strcpy (bstr, "default");
952 for (i = Color_Black; i <= Color_White; i++) 1008 for (i = Color_Black; i <= Color_White; i++)
953 if (pix_colors[Color_fg] == pix_colors[i]) 1009 if (pix_colors[Color_fg] == pix_colors[i])
954 { 1010 {
955 sprintf (fstr, "%d", (i - Color_Black)); 1011 sprintf (fstr, "%d", i - Color_Black);
956 break; 1012 break;
957 } 1013 }
958 1014
959 for (i = Color_Black; i <= Color_White; i++) 1015 for (i = Color_Black; i <= Color_White; i++)
960 if (pix_colors[Color_bg] == pix_colors[i]) 1016 if (pix_colors[Color_bg] == pix_colors[i])
961 { 1017 {
962 sprintf (bstr, "%d", (i - Color_Black)); 1018 sprintf (bstr, "%d", i - Color_Black);
963#ifdef BG_IMAGE_FROM_FILE 1019#if BG_IMAGE_FROM_FILE
964 xpmb = "default;"; 1020 xpmb = "default;";
965#endif 1021#endif
966 break; 1022 break;
967 } 1023 }
968 1024
1025 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
969 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1026 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1027 return env_colorfgbg;
970} 1028}
971 1029
972/*----------------------------------------------------------------------*/ 1030/*----------------------------------------------------------------------*/
973 1031
974bool 1032bool
… …
1003 1061
1004 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1062 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1005 if (set_hint) 1063 if (set_hint)
1006 { 1064 {
1007 szHint.flags &= ~(PBaseSize | PResizeInc); 1065 szHint.flags &= ~(PBaseSize | PResizeInc);
1008 XSetWMNormalHints (dpy, parent[0], &szHint); 1066 XSetWMNormalHints (dpy, parent, &szHint);
1009 szHint.flags |= PBaseSize | PResizeInc; 1067 szHint.flags |= PBaseSize | PResizeInc;
1010 } 1068 }
1011 1069
1012 if (!ignoreparent) 1070 if (!ignoreparent)
1013 { 1071 {
… …
1019 int x, y, x1, y1; 1077 int x, y, x1, y1;
1020 int dx, dy; 1078 int dx, dy;
1021 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1079 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1022 Window unused_cr; 1080 Window unused_cr;
1023 1081
1024 XTranslateCoordinates (dpy, parent[0], display->root, 1082 XTranslateCoordinates (dpy, parent, display->root,
1025 0, 0, &x, &y, &unused_cr); 1083 0, 0, &x, &y, &unused_cr);
1026 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1084 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1027 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1085 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1028 /* 1086 /*
1029 * if display->root isn't the parent window, a WM will probably have offset 1087 * if display->root isn't the parent window, a WM will probably have offset
1030 * our position for handles and decorations. Counter it 1088 * our position for handles and decorations. Counter it
1031 */ 1089 */
… …
1048 if (y < y1) /* top half */ 1106 if (y < y1) /* top half */
1049 dy = 0; 1107 dy = 0;
1050 else if (y == y1) /* exact center */ 1108 else if (y == y1) /* exact center */
1051 dy /= 2; 1109 dy /= 2;
1052 1110
1053 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1111 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1054 szHint.width, szHint.height); 1112 szHint.width, szHint.height);
1055#else 1113#else
1056 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1114 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1057#endif 1115#endif
1058 } 1116 }
1059 1117
1060 if (set_hint) 1118 if (set_hint)
1061 XSetWMNormalHints (dpy, parent[0], &szHint); 1119 XSetWMNormalHints (dpy, parent, &szHint);
1062 1120
1063 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1121 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1064 1122
1065 if (fix_screen || newwidth != old_width || newheight != old_height) 1123 if (fix_screen || newwidth != old_width || newheight != old_height)
1066 { 1124 {
1067 if (scrollBar.state) 1125 if (scrollBar.state)
1068 scrollBar.resize (); 1126 scrollBar.resize ();
1069 1127
1070 XMoveResizeWindow (dpy, vt, 1128 XMoveResizeWindow (dpy, vt,
1071 window_vt_x, window_vt_y, 1129 window_vt_x, window_vt_y,
1072 width, height); 1130 vt_width, vt_height);
1131
1132 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1073 1133
1074#ifdef HAVE_BG_PIXMAP 1134#ifdef HAVE_BG_PIXMAP
1075 if (bgPixmap.window_size_sensitive ()) 1135 if (bg_window_size_sensitive ())
1076 update_background (); 1136 update_background ();
1077#endif 1137#endif
1078 } 1138 }
1079 1139
1080 if (fix_screen || old_height == 0) 1140 if (fix_screen || old_height == 0)
1081 scr_reset (); 1141 scr_reset ();
1082 1142
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 1143#if USE_XIM
1090 IMSetPosition (); 1144 im_set_position ();
1091#endif 1145#endif
1092} 1146}
1093 1147
1094/* 1148/*
1095 * Set the width/height of the vt window in characters. Units are pixels. 1149 * Set the width/height of the vt window in characters. Units are pixels.
… …
1108 newwidth = wattr.width - szHint.base_width; 1162 newwidth = wattr.width - szHint.base_width;
1109 if (newheight == 0) 1163 if (newheight == 0)
1110 newheight = wattr.height - szHint.base_height; 1164 newheight = wattr.height - szHint.base_height;
1111 } 1165 }
1112 1166
1113 if (newwidth != width || newheight != height) 1167 if (newwidth != vt_width || newheight != vt_height)
1114 { 1168 {
1115 newwidth += szHint.base_width; 1169 newwidth += szHint.base_width;
1116 newheight += szHint.base_height; 1170 newheight += szHint.base_height;
1117 resize_all_windows (newwidth, newheight, 0); 1171 resize_all_windows (newwidth, newheight, 0);
1118 } 1172 }
1119} 1173}
1120 1174
1121/* -------------------------------------------------------------------- * 1175/* -------------------------------------------------------------------- *
1122 * - X INPUT METHOD ROUTINES - * 1176 * - X INPUT METHOD ROUTINES - *
1123 * -------------------------------------------------------------------- */ 1177 * -------------------------------------------------------------------- */
1124#ifdef USE_XIM 1178#if USE_XIM
1125 1179
1126void 1180void
1127rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1181rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1128{ 1182{
1129 fg = pix_colors [Color_fg]; 1183 fg = pix_colors [Color_fg];
… …
1156 status_rect.height = fheight; 1210 status_rect.height = fheight;
1157} 1211}
1158 1212
1159/* Checking whether input method is running. */ 1213/* Checking whether input method is running. */
1160bool 1214bool
1161rxvt_term::IMisRunning () 1215rxvt_term::im_is_running ()
1162{ 1216{
1163 Atom atom; 1217 Atom atom;
1164 Window win; 1218 Window win;
1165 char server[IMBUFSIZ]; 1219 char server[IMBUFSIZ];
1166 1220
… …
1175 1229
1176 atom = XInternAtom (dpy, server, False); 1230 atom = XInternAtom (dpy, server, False);
1177 win = XGetSelectionOwner (dpy, atom); 1231 win = XGetSelectionOwner (dpy, atom);
1178 1232
1179 if (win != None) 1233 if (win != None)
1180 return True; 1234 return true;
1181 } 1235 }
1182 1236
1183 return False; 1237 return false;
1184} 1238}
1185 1239
1186void 1240void
1187rxvt_term::IMSendSpot () 1241rxvt_term::im_send_spot ()
1188{ 1242{
1189 XPoint nspot; 1243 XPoint nspot;
1190 XVaNestedList preedit_attr; 1244 XVaNestedList preedit_attr;
1191 1245
1192 if (!Input_Context 1246 if (!Input_Context
… …
1298/* 1352/*
1299 * Try to open a XIM with the current modifiers, then see if we can 1353 * Try to open a XIM with the current modifiers, then see if we can
1300 * open a suitable preedit type 1354 * open a suitable preedit type
1301 */ 1355 */
1302bool 1356bool
1303rxvt_term::IM_get_IC (const char *modifiers) 1357rxvt_term::im_get_ic (const char *modifiers)
1304{ 1358{
1305 int i, j, found; 1359 int i, j, found;
1306 XIM xim; 1360 XIM xim;
1307 XPoint spot; 1361 XPoint spot;
1308 XRectangle rect, status_rect, needed_rect; 1362 XRectangle rect, status_rect, needed_rect;
1309 unsigned long fg, bg; 1363 unsigned long fg, bg;
1310 const char *p; 1364 const char *p;
1311 char **s; 1365 char **s;
1312 XIMStyles *xim_styles; 1366 XIMStyles *xim_styles;
1313#ifdef ENABLE_XIM_ONTHESPOT
1314 XIMCallback xcb[4];
1315#endif
1316 1367
1317 set_environ (envv); 1368 set_environ (envv);
1318 1369
1319 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1370 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1320 return false; 1371 return false;
… …
1341 p = pet[pi]; 1392 p = pet[pi];
1342 1393
1343 if (!p) 1394 if (!p)
1344 continue; 1395 continue;
1345 1396
1346 s = rxvt_splitcommastring (p); 1397 s = rxvt_strsplit (',', p);
1347 1398
1348 for (i = found = 0; !found && s[i]; i++) 1399 for (i = found = 0; !found && s[i]; i++)
1349 { 1400 {
1350 if (!strcmp (s[i], "OverTheSpot")) 1401 if (!strcmp (s[i], "OverTheSpot"))
1351 input_style = XIMPreeditPosition | XIMStatusNothing; 1402 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1363 input_style = XIMPreeditNothing | XIMStatusNothing; 1414 input_style = XIMPreeditNothing | XIMStatusNothing;
1364 1415
1365 for (j = 0; j < xim_styles->count_styles; j++) 1416 for (j = 0; j < xim_styles->count_styles; j++)
1366 if (input_style == xim_styles->supported_styles[j]) 1417 if (input_style == xim_styles->supported_styles[j])
1367 { 1418 {
1368 rxvt_freecommastring (s); 1419 rxvt_free_strsplit (s);
1369 1420
1370 found = 1; 1421 found = 1;
1371 goto foundpet; 1422 goto foundpet;
1372 } 1423 }
1373 1424
1374 } 1425 }
1375 1426
1376 rxvt_freecommastring (s); 1427 rxvt_free_strsplit (s);
1377 } 1428 }
1378 1429
1379foundpet: 1430foundpet:
1380 1431
1381 XFree (xim_styles); 1432 XFree (xim_styles);
… …
1460 NULL); 1511 NULL);
1461 } 1512 }
1462#if ENABLE_XIM_ONTHESPOT 1513#if ENABLE_XIM_ONTHESPOT
1463 else if (input_style & XIMPreeditCallbacks) 1514 else if (input_style & XIMPreeditCallbacks)
1464 { 1515 {
1516 XIMCallback xcb[4];
1517
1465 im_set_position (spot); 1518 im_set_position (spot);
1466 1519
1467 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1520 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; 1521 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; 1522 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1484#endif 1537#endif
1485 1538
1486 Input_Context = XCreateIC (xim, 1539 Input_Context = XCreateIC (xim,
1487 XNInputStyle, input_style, 1540 XNInputStyle, input_style,
1488 XNClientWindow, vt, 1541 XNClientWindow, vt,
1489 XNFocusWindow, parent[0], 1542 XNFocusWindow, parent,
1490 preedit_attr ? XNPreeditAttributes : NULL, 1543 preedit_attr ? XNPreeditAttributes : NULL,
1491 preedit_attr, 1544 preedit_attr,
1492 status_attr ? XNStatusAttributes : NULL, 1545 status_attr ? XNStatusAttributes : NULL,
1493 status_attr, NULL); 1546 status_attr, NULL);
1494 1547
… …
1507 // unfortunately, only the focus window is used by XIM, hard to fix 1560 // unfortunately, only the focus window is used by XIM, hard to fix
1508 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1561 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1509 vt_select_input (); 1562 vt_select_input ();
1510#endif 1563#endif
1511 1564
1512 IMSetPosition (); 1565 im_set_position ();
1513 1566
1514 return true; 1567 return true;
1515} 1568}
1516 1569
1517void 1570void
… …
1527 im_destroy (); 1580 im_destroy ();
1528 1581
1529 if (Input_Context) 1582 if (Input_Context)
1530 return; 1583 return;
1531 1584
1532#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1533 if (rs[Rs_imLocale]) 1585 if (rs[Rs_imLocale])
1534 SET_LOCALE (rs[Rs_imLocale]); 1586 SET_LOCALE (rs[Rs_imLocale]);
1535#endif
1536 1587
1537 p = rs[Rs_inputMethod]; 1588 p = rs[Rs_inputMethod];
1538 if (p && *p) 1589 if (p && *p)
1539 { 1590 {
1540 bool found = false; 1591 bool found = false;
1541 1592
1542 s = rxvt_splitcommastring (p); 1593 s = rxvt_strsplit (',', p);
1543 1594
1544 for (i = 0; s[i]; i++) 1595 for (i = 0; s[i]; i++)
1545 { 1596 {
1546 if (*s[i]) 1597 if (*s[i])
1547 { 1598 {
1548 strcpy (buf, "@im="); 1599 strcpy (buf, "@im=");
1549 strncat (buf, s[i], IMBUFSIZ - 5); 1600 strncat (buf, s[i], IMBUFSIZ - 5);
1550 if (IM_get_IC (buf)) 1601 if (im_get_ic (buf))
1551 { 1602 {
1552 found = true; 1603 found = true;
1553 break; 1604 break;
1554 } 1605 }
1555 } 1606 }
1556 } 1607 }
1557 1608
1558 rxvt_freecommastring (s); 1609 rxvt_free_strsplit (s);
1559 1610
1560 if (found) 1611 if (found)
1561 goto done; 1612 goto done;
1562 } 1613 }
1563 1614
1564 /* try with XMODIFIERS env. var. */ 1615 /* try with XMODIFIERS env. var. */
1565 if (IM_get_IC ("")) 1616 if (im_get_ic (""))
1566 goto done; 1617 goto done;
1567 1618
1568 /* try with no modifiers base IF the user didn't specify an IM */ 1619 /* try with no modifiers base IF the user didn't specify an IM */
1569 if (IM_get_IC ("@im=none")) 1620 if (im_get_ic ("@im=none"))
1570 goto done; 1621 goto done;
1571 1622
1572done: 1623done:
1573#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1574 if (rs[Rs_imLocale]) 1624 if (rs[Rs_imLocale])
1575 SET_LOCALE (locale); 1625 SET_LOCALE (locale);
1576#endif
1577} 1626}
1578 1627
1579void 1628void
1580rxvt_term::IMSetPosition () 1629rxvt_term::im_set_position ()
1581{ 1630{
1582 XRectangle preedit_rect, status_rect, *needed_rect; 1631 XRectangle preedit_rect, status_rect, *needed_rect;
1583 XVaNestedList preedit_attr, status_attr; 1632 XVaNestedList preedit_attr, status_attr;
1584 1633
1585 if (!Input_Context 1634 if (!Input_Context
1586 || !focus 1635 || !focus
1587 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1636 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1588 || !IMisRunning ()) 1637 || !im_is_running ())
1589 return; 1638 return;
1590 1639
1591 if (input_style & XIMPreeditPosition) 1640 if (input_style & XIMPreeditPosition)
1592 { 1641 {
1593 im_set_size (preedit_rect); 1642 im_set_size (preedit_rect);
… …
1623 1672
1624void 1673void
1625rxvt_term::get_window_origin (int &x, int &y) 1674rxvt_term::get_window_origin (int &x, int &y)
1626{ 1675{
1627 Window cr; 1676 Window cr;
1628 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1677 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} 1678}
1650 1679
1651#ifdef HAVE_BG_PIXMAP 1680#ifdef HAVE_BG_PIXMAP
1652 1681
1653void 1682void
1654rxvt_term::update_background () 1683rxvt_term::update_background ()
1655{ 1684{
1656 if (update_background_ev.is_active ()) 1685 if (update_background_ev.is_active ())
1657 return; 1686 return;
1658 1687
1659 bgPixmap.invalidate (); 1688 bg_invalidate ();
1660 1689
1690 if (!mapped)
1691 return;
1692
1661 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1693 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1662 1694
1663 if (to_wait <= 0.) 1695 if (to_wait <= 0.)
1664 bgPixmap.render (); 1696 bg_render ();
1665 else 1697 else
1666 update_background_ev.start (to_wait); 1698 update_background_ev.start (to_wait);
1667} 1699}
1668 1700
1669void 1701void
1670rxvt_term::update_background_cb (ev::timer &w, int revents) 1702rxvt_term::update_background_cb (ev::timer &w, int revents)
1671{ 1703{
1672 make_current (); 1704 make_current ();
1673 1705
1674 update_background_ev.stop (); 1706 update_background_ev.stop ();
1675 bgPixmap.render (); 1707 bg_render ();
1676 refresh_check (); 1708 refresh_check ();
1677} 1709}
1678 1710
1679#endif /* HAVE_BG_PIXMAP */ 1711#endif /* HAVE_BG_PIXMAP */
1680 1712

Diff Legend

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