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.346 by sf-exg, Sat Jan 8 10:37:21 2011 UTC vs.
Revision 1.384 by sf-exg, Sat Dec 29 14:23:35 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
… …
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 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
113 111
114 // allocate a new combination 112 // allocate a new combination
115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
… …
170 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this); 168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
171#endif 169#endif
172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174#endif 172#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177#endif 175#endif
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#ifdef USE_XIM 177#if USE_XIM
180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
181#endif 179#endif
182#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif 182#endif
… …
187#endif 185#endif
188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
192 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
193 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195 192
196 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
197 194
… …
226 delete fontset[i]; 223 delete fontset[i];
227#endif 224#endif
228 delete fontset[0]; 225 delete fontset[0];
229 226
230#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
231 bgPixmap.destroy (); 228 bg_destroy ();
232#endif
233#ifdef HAVE_AFTERIMAGE
234 if (asv)
235 destroy_asvisual (asv, 0);
236 if (asimman)
237 destroy_image_manager (asimman, 0);
238#endif 229#endif
239 230
240 if (display) 231 if (display)
241 { 232 {
242 selection_clear (); 233 selection_clear ();
243 selection_clear (true); 234 selection_clear (true);
244 235
245#ifdef USE_XIM 236#if USE_XIM
246 im_destroy (); 237 im_destroy ();
247#endif 238#endif
248 scrollBar.destroy (); 239 scrollBar.destroy ();
249 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
250 241
251 delete drawable; 242 delete drawable;
252 // destroy all windows 243 // destroy all windows
253 if (parent[0]) 244 if (parent)
254 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
255 246
256 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
257 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
258 { 249 {
259 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
274 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
275 free (allocated [i]); 266 free (allocated [i]);
276 267
277 free (selection.text); 268 free (selection.text);
278 free (selection.clip_text); 269 free (selection.clip_text);
279 // TODO: manage env vars in child only(!)
280 free (env_display);
281 free (env_term);
282 free (locale); 270 free (locale);
283 free (v_buffer); 271 free (v_buffer);
284 free (incr_buf); 272
273 delete selection_req;
285 274
286 delete envv; 275 delete envv;
287 delete argv; 276 delete argv;
288 277
289#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
… …
322 { 311 {
323#if USE_XIM 312#if USE_XIM
324 im_ev.stop (display); 313 im_ev.stop (display);
325#endif 314#endif
326 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
327#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
328 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
329#endif 318#endif
330 incr_ev.stop ();
331 termwin_ev.stop (display); 319 termwin_ev.stop (display);
332 vt_ev.stop (display); 320 vt_ev.stop (display);
333 } 321 }
334 322
335 flush_ev.stop (); 323 flush_ev.stop ();
… …
360 348
361 delete this; 349 delete this;
362} 350}
363 351
364void 352void
365rxvt_term::set_option (uint8_t opt, bool set) 353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
366{ 354{
367 if (!opt) 355 if (!opt)
368 return; 356 return;
369 357
370 uint8_t mask = 1 << (opt & 7); 358 uint8_t mask = 1 << (opt & 7);
… …
374} 362}
375 363
376/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
377/* 365/*
378 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
379 * TODO: if debugging, this should free up any known resources if we can
380 */ 367 */
381static XErrorHandler old_xerror_handler; 368static XErrorHandler old_xerror_handler;
382 369
383static void 370static void
384rxvt_emergency_cleanup () 371rxvt_emergency_cleanup ()
… …
386 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++)
387 (*t)->emergency_cleanup (); 374 (*t)->emergency_cleanup ();
388} 375}
389 376
390#if !ENABLE_MINIMAL 377#if !ENABLE_MINIMAL
391static void 378static void ecb_cold
392print_x_error (Display *dpy, XErrorEvent *event) 379print_x_error (Display *dpy, XErrorEvent *event)
393{ 380{
394 char buffer[BUFSIZ]; 381 char buffer[BUFSIZ];
395 char mesg[BUFSIZ]; 382 char mesg[BUFSIZ];
396 char number[32]; 383 char number[32];
397 const char mtype[] = "XlibMessage"; 384
398 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
399 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
400 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);
401 rxvt_warn ("%s: %s\n", mesg, buffer); 392 rxvt_warn ("+ %s: %s\n", mesg, buffer);
393
402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 394 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 395 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
404 sprintf(number, "%d", event->request_code); 396
405 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
406 rxvt_warn ("(which is %s)\n", buffer);
407 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
408 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 434 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
409 mesg, BUFSIZ); 435 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
410 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);
411 } 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
412 if ((event->error_code == BadWindow) || 453 if (event->error_code == BadWindow
413 (event->error_code == BadPixmap) || 454 || event->error_code == BadPixmap
414 (event->error_code == BadCursor) || 455 || event->error_code == BadCursor
415 (event->error_code == BadFont) || 456 || event->error_code == BadFont
416 (event->error_code == BadDrawable) || 457 || event->error_code == BadDrawable
417 (event->error_code == BadColor) || 458 || event->error_code == BadColor
418 (event->error_code == BadGC) || 459 || event->error_code == BadGC
419 (event->error_code == BadIDChoice) || 460 || event->error_code == BadIDChoice
420 (event->error_code == BadValue) || 461 || event->error_code == BadValue
421 (event->error_code == BadAtom)) { 462 || event->error_code == BadAtom)
463 {
422 if (event->error_code == BadValue) 464 if (event->error_code == BadValue)
423 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 465 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
424 mesg, BUFSIZ);
425 else if (event->error_code == BadAtom) 466 else if (event->error_code == BadAtom)
426 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 467 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
427 mesg, BUFSIZ);
428 else 468 else
429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 469 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
430 mesg, BUFSIZ);
431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432 }
433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434 mesg, BUFSIZ);
435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436}
437#endif
438 470
439int 471 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
472 }
473}
474#endif
475
476int ecb_cold
440rxvt_xerror_handler (Display *display, XErrorEvent *event) 477rxvt_xerror_handler (Display *display, XErrorEvent *event)
441{ 478{
442 if (GET_R->allowedxerror == -1) 479 if (GET_R->allowedxerror == -1)
443 GET_R->allowedxerror = event->error_code; 480 GET_R->allowedxerror = event->error_code;
444 else 481 else
… …
453 } 490 }
454 491
455 return 0; 492 return 0;
456} 493}
457 494
458int 495int ecb_cold
459rxvt_xioerror_handler (Display *display) 496rxvt_xioerror_handler (Display *display)
460{ 497{
461 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",
462 DisplayString (display)); 499 DisplayString (display));
463 rxvt_emergency_cleanup (); 500 rxvt_emergency_cleanup ();
… …
583 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 620 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
584 // TODO: handle this with exceptions and tolerate the memory loss 621 // TODO: handle this with exceptions and tolerate the memory loss
585 XSetIOErrorHandler (rxvt_xioerror_handler); 622 XSetIOErrorHandler (rxvt_xioerror_handler);
586 623
587 XrmInitialize (); 624 XrmInitialize ();
625
626#if HAVE_PIXBUF
627 g_type_init ();
628#endif
588} 629}
589 630
590/*----------------------------------------------------------------------*/ 631/*----------------------------------------------------------------------*/
591/* 632/*
592 * window size/position calculations for XSizeHint and other storage. 633 * window size/position calculations for XSizeHint and other storage.
… …
713 if (recalc_y) 754 if (recalc_y)
714 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 755 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
715 756
716 ncol = width / fwidth; 757 ncol = width / fwidth;
717 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;
718} 768}
719 769
720/*----------------------------------------------------------------------*/ 770/*----------------------------------------------------------------------*/
721/* 771/*
722 * Tell the teletype handler what size the window is. 772 * Tell the teletype handler what size the window is.
… …
730 780
731 struct winsize ws; 781 struct winsize ws;
732 782
733 ws.ws_col = ncol; 783 ws.ws_col = ncol;
734 ws.ws_row = nrow; 784 ws.ws_row = nrow;
735 ws.ws_xpixel = width; 785 ws.ws_xpixel = vt_width;
736 ws.ws_ypixel = height; 786 ws.ws_ypixel = vt_height;
737 ioctl (pty->pty, TIOCSWINSZ, &ws); 787 ioctl (pty->pty, TIOCSWINSZ, &ws);
738 788
739#if 0 789#if 0
740 // TIOCSWINSZ is supposed to do this automatically and correctly 790 // TIOCSWINSZ is supposed to do this automatically and correctly
741 if (cmd_pid) /* force through to the command */ 791 if (cmd_pid) /* force through to the command */
742 kill (-cmd_pid, SIGWINCH); 792 kill (-cmd_pid, SIGWINCH);
743#endif 793#endif
744} 794}
745 795
746/*----------------------------------------------------------------------*/ 796/*----------------------------------------------------------------------*/
747/* set_fonts () - load and set the various fonts 797/* load and set the various fonts */
748 *
749 * init = 1 - initialize
750 *
751 * fontname == FONT_UP - switch to bigger font
752 * fontname == FONT_DN - switch to smaller font
753 */
754bool 798bool
755rxvt_term::set_fonts () 799rxvt_term::set_fonts ()
756{ 800{
757 rxvt_fontset *fs = new rxvt_fontset (this); 801 rxvt_fontset *fs = new rxvt_fontset (this);
758 rxvt_fontprop prop; 802 rxvt_fontprop prop;
… …
773 817
774 delete fontset[0]; 818 delete fontset[0];
775 fontset[0] = fs; 819 fontset[0] = fs;
776 820
777 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 821 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
778 prop.height += lineSpace; 822 prop.width = max (prop.width + letterSpace, 1);
779 prop.width += letterSpace;
780 823
781 fs->set_prop (prop, false); 824 fs->set_prop (prop, false);
782 825
783 fwidth = prop.width; 826 fwidth = prop.width;
784 fheight = prop.height; 827 fheight = prop.height + lineSpace;
785 fbase = prop.ascent; 828 fbase = prop.ascent;
786 829
787 for (int style = 1; style < 4; style++) 830 for (int style = 1; style < 4; style++)
788 { 831 {
789#if ENABLE_STYLES 832#if ENABLE_STYLES
… …
815#else 858#else
816 fontset[style] = fontset[0]; 859 fontset[style] = fontset[0];
817#endif 860#endif
818 } 861 }
819 862
820 if (parent[0]) 863 if (parent)
821 { 864 {
822 resize_all_windows (0, 0, 0); 865 resize_all_windows (0, 0, 0);
823 scr_remap_chars (); 866 scr_remap_chars ();
824 scr_touch (true); 867 scr_touch (true);
825 } 868 }
… …
828} 871}
829 872
830void 873void
831rxvt_term::set_string_property (Atom prop, const char *str, int len) 874rxvt_term::set_string_property (Atom prop, const char *str, int len)
832{ 875{
833 XChangeProperty (dpy, parent[0], 876 XChangeProperty (dpy, parent,
834 prop, XA_STRING, 8, PropModeReplace, 877 prop, XA_STRING, 8, PropModeReplace,
835 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 878 (const unsigned char *)str, len >= 0 ? len : strlen (str));
836} 879}
837 880
838void 881void
… …
840{ 883{
841 XTextProperty ct; 884 XTextProperty ct;
842 885
843 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 886 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
844 { 887 {
845 XSetTextProperty (dpy, parent[0], &ct, prop); 888 XSetTextProperty (dpy, parent, &ct, prop);
846 XFree (ct.value); 889 XFree (ct.value);
847 } 890 }
848} 891}
849 892
850void 893void
851rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 894rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
852{ 895{
853 wchar_t *ws = rxvt_mbstowcs (str, len); 896 wchar_t *ws = rxvt_mbstowcs (str, len);
854 char *s = rxvt_wcstoutf8 (ws); 897 char *s = rxvt_wcstoutf8 (ws);
855 898
856 XChangeProperty (dpy, parent[0], 899 XChangeProperty (dpy, parent,
857 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 900 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
858 (const unsigned char *)s, strlen (s)); 901 (const unsigned char *)s, strlen (s));
859 902
860 free (s); 903 free (s);
861 free (ws); 904 free (ws);
… …
951 994
952/*----------------------------------------------------------------------*/ 995/*----------------------------------------------------------------------*/
953/* 996/*
954 * 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
955 */ 998 */
956void 999char *
957rxvt_term::set_colorfgbg () 1000rxvt_term::get_colorfgbg ()
958{ 1001{
959 unsigned int i; 1002 unsigned int i;
960 const char *xpmb = ""; 1003 const char *xpmb = "";
961 char fstr[] = "default"; 1004 char fstr[] = "default";
962 char bstr[] = "default"; 1005 char bstr[] = "default";
1006 char *env_colorfgbg;
963 1007
964 for (i = Color_Black; i <= Color_White; i++) 1008 for (i = Color_Black; i <= Color_White; i++)
965 if (pix_colors[Color_fg] == pix_colors[i]) 1009 if (pix_colors[Color_fg] == pix_colors[i])
966 { 1010 {
967 sprintf (fstr, "%d", i - Color_Black); 1011 sprintf (fstr, "%d", i - Color_Black);
… …
970 1014
971 for (i = Color_Black; i <= Color_White; i++) 1015 for (i = Color_Black; i <= Color_White; i++)
972 if (pix_colors[Color_bg] == pix_colors[i]) 1016 if (pix_colors[Color_bg] == pix_colors[i])
973 { 1017 {
974 sprintf (bstr, "%d", i - Color_Black); 1018 sprintf (bstr, "%d", i - Color_Black);
975#ifdef BG_IMAGE_FROM_FILE 1019#if BG_IMAGE_FROM_FILE
976 xpmb = "default;"; 1020 xpmb = "default;";
977#endif 1021#endif
978 break; 1022 break;
979 } 1023 }
980 1024
1025 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
981 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;
982} 1028}
983 1029
984/*----------------------------------------------------------------------*/ 1030/*----------------------------------------------------------------------*/
985 1031
986bool 1032bool
… …
1015 1061
1016 // 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
1017 if (set_hint) 1063 if (set_hint)
1018 { 1064 {
1019 szHint.flags &= ~(PBaseSize | PResizeInc); 1065 szHint.flags &= ~(PBaseSize | PResizeInc);
1020 XSetWMNormalHints (dpy, parent[0], &szHint); 1066 XSetWMNormalHints (dpy, parent, &szHint);
1021 szHint.flags |= PBaseSize | PResizeInc; 1067 szHint.flags |= PBaseSize | PResizeInc;
1022 } 1068 }
1023 1069
1024 if (!ignoreparent) 1070 if (!ignoreparent)
1025 { 1071 {
… …
1031 int x, y, x1, y1; 1077 int x, y, x1, y1;
1032 int dx, dy; 1078 int dx, dy;
1033 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1079 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1034 Window unused_cr; 1080 Window unused_cr;
1035 1081
1036 XTranslateCoordinates (dpy, parent[0], display->root, 1082 XTranslateCoordinates (dpy, parent, display->root,
1037 0, 0, &x, &y, &unused_cr); 1083 0, 0, &x, &y, &unused_cr);
1038 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1084 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1039 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1085 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1040 /* 1086 /*
1041 * 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
1042 * our position for handles and decorations. Counter it 1088 * our position for handles and decorations. Counter it
1043 */ 1089 */
… …
1060 if (y < y1) /* top half */ 1106 if (y < y1) /* top half */
1061 dy = 0; 1107 dy = 0;
1062 else if (y == y1) /* exact center */ 1108 else if (y == y1) /* exact center */
1063 dy /= 2; 1109 dy /= 2;
1064 1110
1065 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1111 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1066 szHint.width, szHint.height); 1112 szHint.width, szHint.height);
1067#else 1113#else
1068 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1114 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1069#endif 1115#endif
1070 } 1116 }
1071 1117
1072 if (set_hint) 1118 if (set_hint)
1073 XSetWMNormalHints (dpy, parent[0], &szHint); 1119 XSetWMNormalHints (dpy, parent, &szHint);
1074 1120
1075 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1121 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1076 1122
1077 if (fix_screen || newwidth != old_width || newheight != old_height) 1123 if (fix_screen || newwidth != old_width || newheight != old_height)
1078 { 1124 {
1079 if (scrollBar.state) 1125 if (scrollBar.state)
1080 scrollBar.resize (); 1126 scrollBar.resize ();
1081 1127
1082 XMoveResizeWindow (dpy, vt, 1128 XMoveResizeWindow (dpy, vt,
1083 window_vt_x, window_vt_y, 1129 window_vt_x, window_vt_y,
1084 width, height); 1130 vt_width, vt_height);
1131
1132 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1085 1133
1086#ifdef HAVE_BG_PIXMAP 1134#ifdef HAVE_BG_PIXMAP
1087 if (bgPixmap.window_size_sensitive ()) 1135 if (bg_window_size_sensitive ())
1088 update_background (); 1136 update_background ();
1089#endif 1137#endif
1090 } 1138 }
1091 1139
1092 if (fix_screen || old_height == 0) 1140 if (fix_screen || old_height == 0)
1093 scr_reset (); 1141 scr_reset ();
1094 1142
1095#ifdef HAVE_BG_PIXMAP
1096// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1097// if (bgPixmap.pixmap)
1098// scr_touch (false);
1099#endif
1100
1101#ifdef USE_XIM 1143#if USE_XIM
1102 IMSetPosition (); 1144 im_set_position ();
1103#endif 1145#endif
1104} 1146}
1105 1147
1106/* 1148/*
1107 * 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.
… …
1120 newwidth = wattr.width - szHint.base_width; 1162 newwidth = wattr.width - szHint.base_width;
1121 if (newheight == 0) 1163 if (newheight == 0)
1122 newheight = wattr.height - szHint.base_height; 1164 newheight = wattr.height - szHint.base_height;
1123 } 1165 }
1124 1166
1125 if (newwidth != width || newheight != height) 1167 if (newwidth != vt_width || newheight != vt_height)
1126 { 1168 {
1127 newwidth += szHint.base_width; 1169 newwidth += szHint.base_width;
1128 newheight += szHint.base_height; 1170 newheight += szHint.base_height;
1129 resize_all_windows (newwidth, newheight, 0); 1171 resize_all_windows (newwidth, newheight, 0);
1130 } 1172 }
1131} 1173}
1132 1174
1133/* -------------------------------------------------------------------- * 1175/* -------------------------------------------------------------------- *
1134 * - X INPUT METHOD ROUTINES - * 1176 * - X INPUT METHOD ROUTINES - *
1135 * -------------------------------------------------------------------- */ 1177 * -------------------------------------------------------------------- */
1136#ifdef USE_XIM 1178#if USE_XIM
1137 1179
1138void 1180void
1139rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1181rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1140{ 1182{
1141 fg = pix_colors [Color_fg]; 1183 fg = pix_colors [Color_fg];
… …
1168 status_rect.height = fheight; 1210 status_rect.height = fheight;
1169} 1211}
1170 1212
1171/* Checking whether input method is running. */ 1213/* Checking whether input method is running. */
1172bool 1214bool
1173rxvt_term::IMisRunning () 1215rxvt_term::im_is_running ()
1174{ 1216{
1175 Atom atom; 1217 Atom atom;
1176 Window win; 1218 Window win;
1177 char server[IMBUFSIZ]; 1219 char server[IMBUFSIZ];
1178 1220
… …
1187 1229
1188 atom = XInternAtom (dpy, server, False); 1230 atom = XInternAtom (dpy, server, False);
1189 win = XGetSelectionOwner (dpy, atom); 1231 win = XGetSelectionOwner (dpy, atom);
1190 1232
1191 if (win != None) 1233 if (win != None)
1192 return True; 1234 return true;
1193 } 1235 }
1194 1236
1195 return False; 1237 return false;
1196} 1238}
1197 1239
1198void 1240void
1199rxvt_term::IMSendSpot () 1241rxvt_term::im_send_spot ()
1200{ 1242{
1201 XPoint nspot; 1243 XPoint nspot;
1202 XVaNestedList preedit_attr; 1244 XVaNestedList preedit_attr;
1203 1245
1204 if (!Input_Context 1246 if (!Input_Context
… …
1310/* 1352/*
1311 * 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
1312 * open a suitable preedit type 1354 * open a suitable preedit type
1313 */ 1355 */
1314bool 1356bool
1315rxvt_term::IM_get_IC (const char *modifiers) 1357rxvt_term::im_get_ic (const char *modifiers)
1316{ 1358{
1317 int i, j, found; 1359 int i, j, found;
1318 XIM xim; 1360 XIM xim;
1319 XPoint spot; 1361 XPoint spot;
1320 XRectangle rect, status_rect, needed_rect; 1362 XRectangle rect, status_rect, needed_rect;
1321 unsigned long fg, bg; 1363 unsigned long fg, bg;
1322 const char *p; 1364 const char *p;
1323 char **s; 1365 char **s;
1324 XIMStyles *xim_styles; 1366 XIMStyles *xim_styles;
1325#ifdef ENABLE_XIM_ONTHESPOT
1326 XIMCallback xcb[4];
1327#endif
1328 1367
1329 set_environ (envv); 1368 set_environ (envv);
1330 1369
1331 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1370 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1332 return false; 1371 return false;
… …
1353 p = pet[pi]; 1392 p = pet[pi];
1354 1393
1355 if (!p) 1394 if (!p)
1356 continue; 1395 continue;
1357 1396
1358 s = rxvt_splitcommastring (p); 1397 s = rxvt_strsplit (',', p);
1359 1398
1360 for (i = found = 0; !found && s[i]; i++) 1399 for (i = found = 0; !found && s[i]; i++)
1361 { 1400 {
1362 if (!strcmp (s[i], "OverTheSpot")) 1401 if (!strcmp (s[i], "OverTheSpot"))
1363 input_style = XIMPreeditPosition | XIMStatusNothing; 1402 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1375 input_style = XIMPreeditNothing | XIMStatusNothing; 1414 input_style = XIMPreeditNothing | XIMStatusNothing;
1376 1415
1377 for (j = 0; j < xim_styles->count_styles; j++) 1416 for (j = 0; j < xim_styles->count_styles; j++)
1378 if (input_style == xim_styles->supported_styles[j]) 1417 if (input_style == xim_styles->supported_styles[j])
1379 { 1418 {
1380 rxvt_freecommastring (s); 1419 rxvt_free_strsplit (s);
1381 1420
1382 found = 1; 1421 found = 1;
1383 goto foundpet; 1422 goto foundpet;
1384 } 1423 }
1385 1424
1386 } 1425 }
1387 1426
1388 rxvt_freecommastring (s); 1427 rxvt_free_strsplit (s);
1389 } 1428 }
1390 1429
1391foundpet: 1430foundpet:
1392 1431
1393 XFree (xim_styles); 1432 XFree (xim_styles);
… …
1472 NULL); 1511 NULL);
1473 } 1512 }
1474#if ENABLE_XIM_ONTHESPOT 1513#if ENABLE_XIM_ONTHESPOT
1475 else if (input_style & XIMPreeditCallbacks) 1514 else if (input_style & XIMPreeditCallbacks)
1476 { 1515 {
1516 XIMCallback xcb[4];
1517
1477 im_set_position (spot); 1518 im_set_position (spot);
1478 1519
1479 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;
1480 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;
1481 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;
… …
1496#endif 1537#endif
1497 1538
1498 Input_Context = XCreateIC (xim, 1539 Input_Context = XCreateIC (xim,
1499 XNInputStyle, input_style, 1540 XNInputStyle, input_style,
1500 XNClientWindow, vt, 1541 XNClientWindow, vt,
1501 XNFocusWindow, parent[0], 1542 XNFocusWindow, parent,
1502 preedit_attr ? XNPreeditAttributes : NULL, 1543 preedit_attr ? XNPreeditAttributes : NULL,
1503 preedit_attr, 1544 preedit_attr,
1504 status_attr ? XNStatusAttributes : NULL, 1545 status_attr ? XNStatusAttributes : NULL,
1505 status_attr, NULL); 1546 status_attr, NULL);
1506 1547
… …
1519 // 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
1520 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1561 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1521 vt_select_input (); 1562 vt_select_input ();
1522#endif 1563#endif
1523 1564
1524 IMSetPosition (); 1565 im_set_position ();
1525 1566
1526 return true; 1567 return true;
1527} 1568}
1528 1569
1529void 1570void
… …
1539 im_destroy (); 1580 im_destroy ();
1540 1581
1541 if (Input_Context) 1582 if (Input_Context)
1542 return; 1583 return;
1543 1584
1544#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1545 if (rs[Rs_imLocale]) 1585 if (rs[Rs_imLocale])
1546 SET_LOCALE (rs[Rs_imLocale]); 1586 SET_LOCALE (rs[Rs_imLocale]);
1547#endif
1548 1587
1549 p = rs[Rs_inputMethod]; 1588 p = rs[Rs_inputMethod];
1550 if (p && *p) 1589 if (p && *p)
1551 { 1590 {
1552 bool found = false; 1591 bool found = false;
1553 1592
1554 s = rxvt_splitcommastring (p); 1593 s = rxvt_strsplit (',', p);
1555 1594
1556 for (i = 0; s[i]; i++) 1595 for (i = 0; s[i]; i++)
1557 { 1596 {
1558 if (*s[i]) 1597 if (*s[i])
1559 { 1598 {
1560 strcpy (buf, "@im="); 1599 strcpy (buf, "@im=");
1561 strncat (buf, s[i], IMBUFSIZ - 5); 1600 strncat (buf, s[i], IMBUFSIZ - 5);
1562 if (IM_get_IC (buf)) 1601 if (im_get_ic (buf))
1563 { 1602 {
1564 found = true; 1603 found = true;
1565 break; 1604 break;
1566 } 1605 }
1567 } 1606 }
1568 } 1607 }
1569 1608
1570 rxvt_freecommastring (s); 1609 rxvt_free_strsplit (s);
1571 1610
1572 if (found) 1611 if (found)
1573 goto done; 1612 goto done;
1574 } 1613 }
1575 1614
1576 /* try with XMODIFIERS env. var. */ 1615 /* try with XMODIFIERS env. var. */
1577 if (IM_get_IC ("")) 1616 if (im_get_ic (""))
1578 goto done; 1617 goto done;
1579 1618
1580 /* 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 */
1581 if (IM_get_IC ("@im=none")) 1620 if (im_get_ic ("@im=none"))
1582 goto done; 1621 goto done;
1583 1622
1584done: 1623done:
1585#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1586 if (rs[Rs_imLocale]) 1624 if (rs[Rs_imLocale])
1587 SET_LOCALE (locale); 1625 SET_LOCALE (locale);
1588#endif
1589} 1626}
1590 1627
1591void 1628void
1592rxvt_term::IMSetPosition () 1629rxvt_term::im_set_position ()
1593{ 1630{
1594 XRectangle preedit_rect, status_rect, *needed_rect; 1631 XRectangle preedit_rect, status_rect, *needed_rect;
1595 XVaNestedList preedit_attr, status_attr; 1632 XVaNestedList preedit_attr, status_attr;
1596 1633
1597 if (!Input_Context 1634 if (!Input_Context
1598 || !focus 1635 || !focus
1599 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1636 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1600 || !IMisRunning ()) 1637 || !im_is_running ())
1601 return; 1638 return;
1602 1639
1603 if (input_style & XIMPreeditPosition) 1640 if (input_style & XIMPreeditPosition)
1604 { 1641 {
1605 im_set_size (preedit_rect); 1642 im_set_size (preedit_rect);
… …
1635 1672
1636void 1673void
1637rxvt_term::get_window_origin (int &x, int &y) 1674rxvt_term::get_window_origin (int &x, int &y)
1638{ 1675{
1639 Window cr; 1676 Window cr;
1640 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1677 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1641}
1642
1643Pixmap
1644rxvt_term::get_pixmap_property (Atom property)
1645{
1646 Pixmap pixmap = None;
1647
1648 int aformat;
1649 unsigned long nitems, bytes_after;
1650 Atom atype;
1651 unsigned char *prop;
1652 int result = XGetWindowProperty (dpy, display->root, property,
1653 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1654 &nitems, &bytes_after, &prop);
1655 if (result == Success)
1656 {
1657 if (atype == XA_PIXMAP)
1658 pixmap = *(Pixmap *)prop;
1659 XFree (prop);
1660 }
1661
1662 return pixmap;
1663} 1678}
1664 1679
1665#ifdef HAVE_BG_PIXMAP 1680#ifdef HAVE_BG_PIXMAP
1666 1681
1667void 1682void
1668rxvt_term::update_background () 1683rxvt_term::update_background ()
1669{ 1684{
1670 if (update_background_ev.is_active ()) 1685 if (update_background_ev.is_active ())
1671 return; 1686 return;
1672 1687
1673 bgPixmap.invalidate (); 1688 bg_invalidate ();
1674 1689
1690 if (!mapped)
1691 return;
1692
1675 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1693 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1676 1694
1677 if (to_wait <= 0.) 1695 if (to_wait <= 0.)
1678 bgPixmap.render (); 1696 bg_render ();
1679 else 1697 else
1680 update_background_ev.start (to_wait); 1698 update_background_ev.start (to_wait);
1681} 1699}
1682 1700
1683void 1701void
1684rxvt_term::update_background_cb (ev::timer &w, int revents) 1702rxvt_term::update_background_cb (ev::timer &w, int revents)
1685{ 1703{
1686 make_current (); 1704 make_current ();
1687 1705
1688 update_background_ev.stop (); 1706 update_background_ev.stop ();
1689 bgPixmap.render (); 1707 bg_render ();
1690 refresh_check (); 1708 refresh_check ();
1691} 1709}
1692 1710
1693#endif /* HAVE_BG_PIXMAP */ 1711#endif /* HAVE_BG_PIXMAP */
1694 1712

Diff Legend

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