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.337 by root, Tue Dec 7 19:10:00 2010 UTC vs.
Revision 1.389 by root, Sun Feb 17 00:52:04 2013 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));
… …
172 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);
173#endif 169#endif
174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175 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);
176#endif 172#endif
177#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if BG_IMAGE_FROM_ROOT || 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 229#endif
235#ifdef HAVE_AFTERIMAGE 230
236 if (asv) 231#if HAVE_IMG
237 destroy_asvisual (asv, 0); 232 delete bg_img;
238 if (asimman)
239 destroy_image_manager (asimman, 0);
240#endif 233#endif
241 234
242 if (display) 235 if (display)
243 { 236 {
244 selection_clear (); 237 selection_clear ();
245 selection_clear (true); 238 selection_clear (true);
246 239
247#ifdef USE_XIM 240#if USE_XIM
248 im_destroy (); 241 im_destroy ();
249#endif 242#endif
250 scrollBar.destroy (); 243 scrollBar.destroy ();
244
245 if (gc)
251 if (gc) XFreeGC (dpy, gc); 246 XFreeGC (dpy, gc);
252 247
253 delete drawable; 248 delete drawable;
249
254 // destroy all windows 250 // destroy all windows
255 if (parent[0]) 251 if (parent)
256 XDestroyWindow (dpy, parent[0]); 252 XDestroyWindow (dpy, parent);
257 253
258 for (int i = 0; i < TOTAL_COLORS; i++) 254 for (int i = 0; i < TOTAL_COLORS; i++)
259 if (ISSET_PIXCOLOR (i)) 255 if (ISSET_PIXCOLOR (i))
260 { 256 {
261 pix_colors_focused [i].free (this); 257 pix_colors_focused [i].free (this);
… …
276 for (int i = 0; i < allocated.size (); i++) 272 for (int i = 0; i < allocated.size (); i++)
277 free (allocated [i]); 273 free (allocated [i]);
278 274
279 free (selection.text); 275 free (selection.text);
280 free (selection.clip_text); 276 free (selection.clip_text);
281 // TODO: manage env vars in child only(!)
282 free (env_display);
283 free (env_term);
284 free (locale); 277 free (locale);
285 free (v_buffer); 278 free (v_buffer);
286 free (incr_buf); 279
280 delete selection_req;
287 281
288 delete envv; 282 delete envv;
289 delete argv; 283 delete argv;
290 284
291#ifdef KEYSYM_RESOURCE 285#ifdef KEYSYM_RESOURCE
… …
324 { 318 {
325#if USE_XIM 319#if USE_XIM
326 im_ev.stop (display); 320 im_ev.stop (display);
327#endif 321#endif
328 scrollbar_ev.stop (display); 322 scrollbar_ev.stop (display);
329#if ENABLE_TRANSPARENCY || ENABLE_PERL 323#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
330 rootwin_ev.stop (display); 324 rootwin_ev.stop (display);
331#endif 325#endif
332 incr_ev.stop ();
333 termwin_ev.stop (display); 326 termwin_ev.stop (display);
334 vt_ev.stop (display); 327 vt_ev.stop (display);
335 } 328 }
336 329
337 flush_ev.stop (); 330 flush_ev.stop ();
… …
362 355
363 delete this; 356 delete this;
364} 357}
365 358
366void 359void
367rxvt_term::set_option (uint8_t opt, bool set) 360rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
368{ 361{
369 if (!opt) 362 if (!opt)
370 return; 363 return;
371 364
372 uint8_t mask = 1 << (opt & 7); 365 uint8_t mask = 1 << (opt & 7);
373 uint8_t &val = options [opt >> 3]; 366 uint8_t &val = options [opt >> 3];
374 367
375 val = val & ~mask | (set ? 0 : mask); 368 val = val & ~mask | (set ? mask : 0);
376} 369}
377 370
378/*----------------------------------------------------------------------*/ 371/*----------------------------------------------------------------------*/
379/* 372/*
380 * Exit gracefully, clearing the utmp entry and restoring tty attributes 373 * 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 */ 374 */
383static XErrorHandler old_xerror_handler; 375static XErrorHandler old_xerror_handler;
384 376
385static void 377static void
386rxvt_emergency_cleanup () 378rxvt_emergency_cleanup ()
… …
388 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 380 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
389 (*t)->emergency_cleanup (); 381 (*t)->emergency_cleanup ();
390} 382}
391 383
392#if !ENABLE_MINIMAL 384#if !ENABLE_MINIMAL
393static void 385static void ecb_cold
394print_x_error (Display *dpy, XErrorEvent *event) 386print_x_error (Display *dpy, XErrorEvent *event)
395{ 387{
396 char buffer[BUFSIZ]; 388 char buffer[BUFSIZ];
397 char mesg[BUFSIZ]; 389 char mesg[BUFSIZ];
398 char number[32]; 390 char number[32];
399 char *mtype = "XlibMessage"; 391
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"); 392 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
393
394 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
395 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
396
397 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
398 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
403 rxvt_warn ("%s: %s\n", mesg, buffer); 399 rxvt_warn ("+ %s: %s\n", mesg, buffer);
400
404 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 401 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
405 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 402 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
406 sprintf(number, "%d", event->request_code); 403
407 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
408 rxvt_warn ("(which is %s)\n", buffer);
409 if (event->request_code >= 128) { 404 if (event->request_code >= 128)
405 {
406#if 0
407 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
408 int nexts;
409 char **exts = XListExtensions (dpy, &nexts);
410
411 while (nexts)
412 {
413 char *extname = exts [nexts - 1];
414 int major, first_event, first_error;
415
416 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
417 {
418 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
419 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
420
421 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
422 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
423 rxvt_warn ("+ (which is %s)\n", buffer);
424
425 break;
426 }
427
428 printf ("nextss %d %s\n", nexts, extname);//D
429 --nexts;
430 ++exts;
431 }
432#else
433 int nexts = 0;
434 char **exts = 0;
435#endif
436
437 if (!nexts)
438 {
439 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
440
410 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 441 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
411 mesg, BUFSIZ); 442 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 443
444#if 0
445 sprintf (number, "RENDER.%d", event->minor_code);
446 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
447 rxvt_warn ("+ (which is %s)\n", buffer);
448#endif
449 }
450
451 XFreeExtensionList (exts);
413 } 452 }
453 else
454 {
455 sprintf (number, "%d", event->request_code);
456 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
457 rxvt_warn ("+ (which is %s)\n", buffer);
458 }
459
414 if ((event->error_code == BadWindow) || 460 if (event->error_code == BadWindow
415 (event->error_code == BadPixmap) || 461 || event->error_code == BadPixmap
416 (event->error_code == BadCursor) || 462 || event->error_code == BadCursor
417 (event->error_code == BadFont) || 463 || event->error_code == BadFont
418 (event->error_code == BadDrawable) || 464 || event->error_code == BadDrawable
419 (event->error_code == BadColor) || 465 || event->error_code == BadColor
420 (event->error_code == BadGC) || 466 || event->error_code == BadGC
421 (event->error_code == BadIDChoice) || 467 || event->error_code == BadIDChoice
422 (event->error_code == BadValue) || 468 || event->error_code == BadValue
423 (event->error_code == BadAtom)) { 469 || event->error_code == BadAtom)
470 {
424 if (event->error_code == BadValue) 471 if (event->error_code == BadValue)
425 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 472 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
426 mesg, BUFSIZ);
427 else if (event->error_code == BadAtom) 473 else if (event->error_code == BadAtom)
428 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 474 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
429 mesg, BUFSIZ);
430 else 475 else
431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 476 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 477
441int 478 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
479 }
480}
481#endif
482
483int ecb_cold
442rxvt_xerror_handler (Display *display, XErrorEvent *event) 484rxvt_xerror_handler (Display *display, XErrorEvent *event)
443{ 485{
444 if (GET_R->allowedxerror == -1) 486 if (GET_R->allowedxerror == -1)
445 GET_R->allowedxerror = event->error_code; 487 GET_R->allowedxerror = event->error_code;
446 else 488 else
… …
455 } 497 }
456 498
457 return 0; 499 return 0;
458} 500}
459 501
460int 502int ecb_cold
461rxvt_xioerror_handler (Display *display) 503rxvt_xioerror_handler (Display *display)
462{ 504{
463 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 505 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
464 DisplayString (display)); 506 DisplayString (display));
465 rxvt_emergency_cleanup (); 507 rxvt_emergency_cleanup ();
… …
585 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 627 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
586 // TODO: handle this with exceptions and tolerate the memory loss 628 // TODO: handle this with exceptions and tolerate the memory loss
587 XSetIOErrorHandler (rxvt_xioerror_handler); 629 XSetIOErrorHandler (rxvt_xioerror_handler);
588 630
589 XrmInitialize (); 631 XrmInitialize ();
632
633#if HAVE_PIXBUF
634 g_type_init ();
635#endif
590} 636}
591 637
592/*----------------------------------------------------------------------*/ 638/*----------------------------------------------------------------------*/
593/* 639/*
594 * window size/position calculations for XSizeHint and other storage. 640 * window size/position calculations for XSizeHint and other storage.
… …
715 if (recalc_y) 761 if (recalc_y)
716 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 762 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
717 763
718 ncol = width / fwidth; 764 ncol = width / fwidth;
719 nrow = height / fheight; 765 nrow = height / fheight;
766
767 // When the size of the vt window is not a multiple of the cell
768 // size, i.e., when the wm does not honour our size hints, there are
769 // extra areas not covered by the terminal screen. Such gaps, when a
770 // bg pixmap is set, would have to be cleared manually to properly
771 // refresh the background. We take the simpler route and shrink the
772 // vt window so as to avoid creating gaps.
773 vt_width = ncol * fwidth;
774 vt_height = nrow * fheight;
720} 775}
721 776
722/*----------------------------------------------------------------------*/ 777/*----------------------------------------------------------------------*/
723/* 778/*
724 * Tell the teletype handler what size the window is. 779 * Tell the teletype handler what size the window is.
… …
732 787
733 struct winsize ws; 788 struct winsize ws;
734 789
735 ws.ws_col = ncol; 790 ws.ws_col = ncol;
736 ws.ws_row = nrow; 791 ws.ws_row = nrow;
737 ws.ws_xpixel = width; 792 ws.ws_xpixel = vt_width;
738 ws.ws_ypixel = height; 793 ws.ws_ypixel = vt_height;
739 ioctl (pty->pty, TIOCSWINSZ, &ws); 794 ioctl (pty->pty, TIOCSWINSZ, &ws);
740 795
741#if 0 796#if 0
742 // TIOCSWINSZ is supposed to do this automatically and correctly 797 // TIOCSWINSZ is supposed to do this automatically and correctly
743 if (cmd_pid) /* force through to the command */ 798 if (cmd_pid) /* force through to the command */
744 kill (-cmd_pid, SIGWINCH); 799 kill (-cmd_pid, SIGWINCH);
745#endif 800#endif
746} 801}
747 802
748/*----------------------------------------------------------------------*/ 803/*----------------------------------------------------------------------*/
749/* set_fonts () - load and set the various fonts 804/* 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 805bool
757rxvt_term::set_fonts () 806rxvt_term::set_fonts ()
758{ 807{
759 rxvt_fontset *fs = new rxvt_fontset (this); 808 rxvt_fontset *fs = new rxvt_fontset (this);
760 rxvt_fontprop prop; 809 rxvt_fontprop prop;
… …
775 824
776 delete fontset[0]; 825 delete fontset[0];
777 fontset[0] = fs; 826 fontset[0] = fs;
778 827
779 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 828 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
780 prop.height += lineSpace; 829 prop.width = max (prop.width + letterSpace, 1);
781 prop.width += letterSpace;
782 830
783 fs->set_prop (prop, false); 831 fs->set_prop (prop, false);
784 832
785 fwidth = prop.width; 833 fwidth = prop.width;
786 fheight = prop.height; 834 fheight = prop.height + lineSpace;
787 fbase = prop.ascent; 835 fbase = prop.ascent;
788 836
789 for (int style = 1; style < 4; style++) 837 for (int style = 1; style < 4; style++)
790 { 838 {
791#if ENABLE_STYLES 839#if ENABLE_STYLES
… …
817#else 865#else
818 fontset[style] = fontset[0]; 866 fontset[style] = fontset[0];
819#endif 867#endif
820 } 868 }
821 869
822 if (parent[0]) 870 if (parent)
823 { 871 {
824 resize_all_windows (0, 0, 0); 872 resize_all_windows (0, 0, 0);
825 scr_remap_chars (); 873 scr_remap_chars ();
826 scr_touch (true); 874 scr_touch (true);
827 } 875 }
… …
830} 878}
831 879
832void 880void
833rxvt_term::set_string_property (Atom prop, const char *str, int len) 881rxvt_term::set_string_property (Atom prop, const char *str, int len)
834{ 882{
835 XChangeProperty (dpy, parent[0], 883 XChangeProperty (dpy, parent,
836 prop, XA_STRING, 8, PropModeReplace, 884 prop, XA_STRING, 8, PropModeReplace,
837 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 885 (const unsigned char *)str, len >= 0 ? len : strlen (str));
838} 886}
839 887
840void 888void
… …
842{ 890{
843 XTextProperty ct; 891 XTextProperty ct;
844 892
845 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 893 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
846 { 894 {
847 XSetTextProperty (dpy, parent[0], &ct, prop); 895 XSetTextProperty (dpy, parent, &ct, prop);
848 XFree (ct.value); 896 XFree (ct.value);
849 } 897 }
850} 898}
851 899
852void 900void
853rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 901rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
854{ 902{
855 wchar_t *ws = rxvt_mbstowcs (str, len); 903 wchar_t *ws = rxvt_mbstowcs (str, len);
856 char *s = rxvt_wcstoutf8 (ws); 904 char *s = rxvt_wcstoutf8 (ws);
857 905
858 XChangeProperty (dpy, parent[0], 906 XChangeProperty (dpy, parent,
859 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 907 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
860 (const unsigned char *)s, strlen (s)); 908 (const unsigned char *)s, strlen (s));
861 909
862 free (s); 910 free (s);
863 free (ws); 911 free (ws);
… …
953 1001
954/*----------------------------------------------------------------------*/ 1002/*----------------------------------------------------------------------*/
955/* 1003/*
956 * find if fg/bg matches any of the normal (low-intensity) colors 1004 * find if fg/bg matches any of the normal (low-intensity) colors
957 */ 1005 */
958void 1006char *
959rxvt_term::set_colorfgbg () 1007rxvt_term::get_colorfgbg ()
960{ 1008{
961 unsigned int i; 1009 unsigned int i;
962 const char *xpmb = ""; 1010 const char *xpmb = "";
963 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1011 char fstr[] = "default";
1012 char bstr[] = "default";
1013 char *env_colorfgbg;
964 1014
965 strcpy (fstr, "default");
966 strcpy (bstr, "default");
967 for (i = Color_Black; i <= Color_White; i++) 1015 for (i = Color_Black; i <= Color_White; i++)
968 if (pix_colors[Color_fg] == pix_colors[i]) 1016 if (pix_colors[Color_fg] == pix_colors[i])
969 { 1017 {
970 sprintf (fstr, "%d", (i - Color_Black)); 1018 sprintf (fstr, "%d", i - Color_Black);
971 break; 1019 break;
972 } 1020 }
973 1021
974 for (i = Color_Black; i <= Color_White; i++) 1022 for (i = Color_Black; i <= Color_White; i++)
975 if (pix_colors[Color_bg] == pix_colors[i]) 1023 if (pix_colors[Color_bg] == pix_colors[i])
976 { 1024 {
977 sprintf (bstr, "%d", (i - Color_Black)); 1025 sprintf (bstr, "%d", i - Color_Black);
978#ifdef BG_IMAGE_FROM_FILE 1026#if BG_IMAGE_FROM_FILE
979 xpmb = "default;"; 1027 xpmb = "default;";
980#endif 1028#endif
981 break; 1029 break;
982 } 1030 }
983 1031
1032 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
984 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1033 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1034 return env_colorfgbg;
985} 1035}
986 1036
987/*----------------------------------------------------------------------*/ 1037/*----------------------------------------------------------------------*/
988 1038
989bool 1039bool
… …
1018 1068
1019 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1069 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1020 if (set_hint) 1070 if (set_hint)
1021 { 1071 {
1022 szHint.flags &= ~(PBaseSize | PResizeInc); 1072 szHint.flags &= ~(PBaseSize | PResizeInc);
1023 XSetWMNormalHints (dpy, parent[0], &szHint); 1073 XSetWMNormalHints (dpy, parent, &szHint);
1024 szHint.flags |= PBaseSize | PResizeInc; 1074 szHint.flags |= PBaseSize | PResizeInc;
1025 } 1075 }
1026 1076
1027 if (!ignoreparent) 1077 if (!ignoreparent)
1028 { 1078 {
… …
1034 int x, y, x1, y1; 1084 int x, y, x1, y1;
1035 int dx, dy; 1085 int dx, dy;
1036 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1086 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1037 Window unused_cr; 1087 Window unused_cr;
1038 1088
1039 XTranslateCoordinates (dpy, parent[0], display->root, 1089 XTranslateCoordinates (dpy, parent, display->root,
1040 0, 0, &x, &y, &unused_cr); 1090 0, 0, &x, &y, &unused_cr);
1041 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1091 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1042 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1092 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1043 /* 1093 /*
1044 * if display->root isn't the parent window, a WM will probably have offset 1094 * if display->root isn't the parent window, a WM will probably have offset
1045 * our position for handles and decorations. Counter it 1095 * our position for handles and decorations. Counter it
1046 */ 1096 */
… …
1063 if (y < y1) /* top half */ 1113 if (y < y1) /* top half */
1064 dy = 0; 1114 dy = 0;
1065 else if (y == y1) /* exact center */ 1115 else if (y == y1) /* exact center */
1066 dy /= 2; 1116 dy /= 2;
1067 1117
1068 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1118 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1069 szHint.width, szHint.height); 1119 szHint.width, szHint.height);
1070#else 1120#else
1071 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1121 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1072#endif 1122#endif
1073 } 1123 }
1074 1124
1075 if (set_hint) 1125 if (set_hint)
1076 XSetWMNormalHints (dpy, parent[0], &szHint); 1126 XSetWMNormalHints (dpy, parent, &szHint);
1077 1127
1078 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1128 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1079 1129
1080 if (fix_screen || newwidth != old_width || newheight != old_height) 1130 if (fix_screen || newwidth != old_width || newheight != old_height)
1081 { 1131 {
1082 if (scrollBar.state) 1132 if (scrollBar.state)
1083 scrollBar.resize (); 1133 scrollBar.resize ();
1084 1134
1085 XMoveResizeWindow (dpy, vt, 1135 XMoveResizeWindow (dpy, vt,
1086 window_vt_x, window_vt_y, 1136 window_vt_x, window_vt_y,
1087 width, height); 1137 vt_width, vt_height);
1138
1139 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1088 1140
1089#ifdef HAVE_BG_PIXMAP 1141#ifdef HAVE_BG_PIXMAP
1090 if (bgPixmap.window_size_sensitive ()) 1142 if (bg_window_size_sensitive ())
1091 update_background (); 1143 update_background ();
1092#endif 1144#endif
1093 } 1145 }
1094 1146
1095 if (fix_screen || old_height == 0) 1147 if (fix_screen || old_height == 0)
1096 scr_reset (); 1148 scr_reset ();
1097 1149
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 1150#if USE_XIM
1105 IMSetPosition (); 1151 im_set_position ();
1106#endif 1152#endif
1107} 1153}
1108 1154
1109/* 1155/*
1110 * Set the width/height of the vt window in characters. Units are pixels. 1156 * Set the width/height of the vt window in characters. Units are pixels.
… …
1123 newwidth = wattr.width - szHint.base_width; 1169 newwidth = wattr.width - szHint.base_width;
1124 if (newheight == 0) 1170 if (newheight == 0)
1125 newheight = wattr.height - szHint.base_height; 1171 newheight = wattr.height - szHint.base_height;
1126 } 1172 }
1127 1173
1128 if (newwidth != width || newheight != height) 1174 if (newwidth != vt_width || newheight != vt_height)
1129 { 1175 {
1130 newwidth += szHint.base_width; 1176 newwidth += szHint.base_width;
1131 newheight += szHint.base_height; 1177 newheight += szHint.base_height;
1132 resize_all_windows (newwidth, newheight, 0); 1178 resize_all_windows (newwidth, newheight, 0);
1133 } 1179 }
1134} 1180}
1135 1181
1136/* -------------------------------------------------------------------- * 1182/* -------------------------------------------------------------------- *
1137 * - X INPUT METHOD ROUTINES - * 1183 * - X INPUT METHOD ROUTINES - *
1138 * -------------------------------------------------------------------- */ 1184 * -------------------------------------------------------------------- */
1139#ifdef USE_XIM 1185#if USE_XIM
1140 1186
1141void 1187void
1142rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1188rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1143{ 1189{
1144 fg = pix_colors [Color_fg]; 1190 fg = pix_colors [Color_fg];
… …
1171 status_rect.height = fheight; 1217 status_rect.height = fheight;
1172} 1218}
1173 1219
1174/* Checking whether input method is running. */ 1220/* Checking whether input method is running. */
1175bool 1221bool
1176rxvt_term::IMisRunning () 1222rxvt_term::im_is_running ()
1177{ 1223{
1178 Atom atom; 1224 Atom atom;
1179 Window win; 1225 Window win;
1180 char server[IMBUFSIZ]; 1226 char server[IMBUFSIZ];
1181 1227
… …
1190 1236
1191 atom = XInternAtom (dpy, server, False); 1237 atom = XInternAtom (dpy, server, False);
1192 win = XGetSelectionOwner (dpy, atom); 1238 win = XGetSelectionOwner (dpy, atom);
1193 1239
1194 if (win != None) 1240 if (win != None)
1195 return True; 1241 return true;
1196 } 1242 }
1197 1243
1198 return False; 1244 return false;
1199} 1245}
1200 1246
1201void 1247void
1202rxvt_term::IMSendSpot () 1248rxvt_term::im_send_spot ()
1203{ 1249{
1204 XPoint nspot; 1250 XPoint nspot;
1205 XVaNestedList preedit_attr; 1251 XVaNestedList preedit_attr;
1206 1252
1207 if (!Input_Context 1253 if (!Input_Context
… …
1313/* 1359/*
1314 * Try to open a XIM with the current modifiers, then see if we can 1360 * Try to open a XIM with the current modifiers, then see if we can
1315 * open a suitable preedit type 1361 * open a suitable preedit type
1316 */ 1362 */
1317bool 1363bool
1318rxvt_term::IM_get_IC (const char *modifiers) 1364rxvt_term::im_get_ic (const char *modifiers)
1319{ 1365{
1320 int i, j, found; 1366 int i, j, found;
1321 XIM xim; 1367 XIM xim;
1322 XPoint spot; 1368 XPoint spot;
1323 XRectangle rect, status_rect, needed_rect; 1369 XRectangle rect, status_rect, needed_rect;
1324 unsigned long fg, bg; 1370 unsigned long fg, bg;
1325 const char *p; 1371 const char *p;
1326 char **s; 1372 char **s;
1327 XIMStyles *xim_styles; 1373 XIMStyles *xim_styles;
1328#ifdef ENABLE_XIM_ONTHESPOT
1329 XIMCallback xcb[4];
1330#endif
1331 1374
1332 set_environ (envv); 1375 set_environ (envv);
1333 1376
1334 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1377 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1335 return false; 1378 return false;
1336 1379
1337 input_method = display->get_xim (locale, modifiers); 1380 input_method = display->get_xim (locale, modifiers);
1338 if (input_method == NULL) 1381 if (input_method == NULL)
1339 return false; 1382 return false;
… …
1356 p = pet[pi]; 1399 p = pet[pi];
1357 1400
1358 if (!p) 1401 if (!p)
1359 continue; 1402 continue;
1360 1403
1361 s = rxvt_splitcommastring (p); 1404 s = rxvt_strsplit (',', p);
1362 1405
1363 for (i = found = 0; !found && s[i]; i++) 1406 for (i = found = 0; !found && s[i]; i++)
1364 { 1407 {
1365 if (!strcmp (s[i], "OverTheSpot")) 1408 if (!strcmp (s[i], "OverTheSpot"))
1366 input_style = XIMPreeditPosition | XIMStatusNothing; 1409 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1378 input_style = XIMPreeditNothing | XIMStatusNothing; 1421 input_style = XIMPreeditNothing | XIMStatusNothing;
1379 1422
1380 for (j = 0; j < xim_styles->count_styles; j++) 1423 for (j = 0; j < xim_styles->count_styles; j++)
1381 if (input_style == xim_styles->supported_styles[j]) 1424 if (input_style == xim_styles->supported_styles[j])
1382 { 1425 {
1383 rxvt_freecommastring (s); 1426 rxvt_free_strsplit (s);
1384 1427
1385 found = 1; 1428 found = 1;
1386 goto foundpet; 1429 goto foundpet;
1387 } 1430 }
1388 1431
1389 } 1432 }
1390 1433
1391 rxvt_freecommastring (s); 1434 rxvt_free_strsplit (s);
1392 } 1435 }
1393 1436
1394foundpet: 1437foundpet:
1395 1438
1396 XFree (xim_styles); 1439 XFree (xim_styles);
… …
1475 NULL); 1518 NULL);
1476 } 1519 }
1477#if ENABLE_XIM_ONTHESPOT 1520#if ENABLE_XIM_ONTHESPOT
1478 else if (input_style & XIMPreeditCallbacks) 1521 else if (input_style & XIMPreeditCallbacks)
1479 { 1522 {
1523 XIMCallback xcb[4];
1524
1480 im_set_position (spot); 1525 im_set_position (spot);
1481 1526
1482 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1527 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; 1528 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; 1529 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1499#endif 1544#endif
1500 1545
1501 Input_Context = XCreateIC (xim, 1546 Input_Context = XCreateIC (xim,
1502 XNInputStyle, input_style, 1547 XNInputStyle, input_style,
1503 XNClientWindow, vt, 1548 XNClientWindow, vt,
1504 XNFocusWindow, parent[0], 1549 XNFocusWindow, parent,
1505 preedit_attr ? XNPreeditAttributes : NULL, 1550 preedit_attr ? XNPreeditAttributes : NULL,
1506 preedit_attr, 1551 preedit_attr,
1507 status_attr ? XNStatusAttributes : NULL, 1552 status_attr ? XNStatusAttributes : NULL,
1508 status_attr, NULL); 1553 status_attr, NULL);
1509 1554
… …
1522 // unfortunately, only the focus window is used by XIM, hard to fix 1567 // unfortunately, only the focus window is used by XIM, hard to fix
1523 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1568 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1524 vt_select_input (); 1569 vt_select_input ();
1525#endif 1570#endif
1526 1571
1527 IMSetPosition (); 1572 im_set_position ();
1528 1573
1529 return true; 1574 return true;
1530} 1575}
1531 1576
1532void 1577void
… …
1542 im_destroy (); 1587 im_destroy ();
1543 1588
1544 if (Input_Context) 1589 if (Input_Context)
1545 return; 1590 return;
1546 1591
1547#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1548 if (rs[Rs_imLocale]) 1592 if (rs[Rs_imLocale])
1549 SET_LOCALE (rs[Rs_imLocale]); 1593 SET_LOCALE (rs[Rs_imLocale]);
1550#endif
1551 1594
1552 p = rs[Rs_inputMethod]; 1595 p = rs[Rs_inputMethod];
1553 if (p && *p) 1596 if (p && *p)
1554 { 1597 {
1555 bool found = false; 1598 bool found = false;
1556 1599
1557 s = rxvt_splitcommastring (p); 1600 s = rxvt_strsplit (',', p);
1558 1601
1559 for (i = 0; s[i]; i++) 1602 for (i = 0; s[i]; i++)
1560 { 1603 {
1561 if (*s[i]) 1604 if (*s[i])
1562 { 1605 {
1563 strcpy (buf, "@im="); 1606 strcpy (buf, "@im=");
1564 strncat (buf, s[i], IMBUFSIZ - 5); 1607 strncat (buf, s[i], IMBUFSIZ - 5);
1565 if (IM_get_IC (buf)) 1608 if (im_get_ic (buf))
1566 { 1609 {
1567 found = true; 1610 found = true;
1568 break; 1611 break;
1569 } 1612 }
1570 } 1613 }
1571 } 1614 }
1572 1615
1573 rxvt_freecommastring (s); 1616 rxvt_free_strsplit (s);
1574 1617
1575 if (found) 1618 if (found)
1576 goto done; 1619 goto done;
1577 } 1620 }
1578 1621
1579 /* try with XMODIFIERS env. var. */ 1622 /* try with XMODIFIERS env. var. */
1580 if (IM_get_IC ("")) 1623 if (im_get_ic (""))
1581 goto done; 1624 goto done;
1582 1625
1583 /* try with no modifiers base IF the user didn't specify an IM */ 1626 /* try with no modifiers base IF the user didn't specify an IM */
1584 if (IM_get_IC ("@im=none")) 1627 if (im_get_ic ("@im=none"))
1585 goto done; 1628 goto done;
1586 1629
1587done: 1630done:
1588#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1589 if (rs[Rs_imLocale]) 1631 if (rs[Rs_imLocale])
1590 SET_LOCALE (locale); 1632 SET_LOCALE (locale);
1591#endif
1592} 1633}
1593 1634
1594void 1635void
1595rxvt_term::IMSetPosition () 1636rxvt_term::im_set_position ()
1596{ 1637{
1597 XRectangle preedit_rect, status_rect, *needed_rect; 1638 XRectangle preedit_rect, status_rect, *needed_rect;
1598 XVaNestedList preedit_attr, status_attr; 1639 XVaNestedList preedit_attr, status_attr;
1599 1640
1600 if (!Input_Context 1641 if (!Input_Context
1601 || !focus 1642 || !focus
1602 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1643 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1603 || !IMisRunning ()) 1644 || !im_is_running ())
1604 return; 1645 return;
1605 1646
1606 if (input_style & XIMPreeditPosition) 1647 if (input_style & XIMPreeditPosition)
1607 { 1648 {
1608 im_set_size (preedit_rect); 1649 im_set_size (preedit_rect);
… …
1638 1679
1639void 1680void
1640rxvt_term::get_window_origin (int &x, int &y) 1681rxvt_term::get_window_origin (int &x, int &y)
1641{ 1682{
1642 Window cr; 1683 Window cr;
1643 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1684 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} 1685}
1665 1686
1666#ifdef HAVE_BG_PIXMAP 1687#ifdef HAVE_BG_PIXMAP
1667 1688
1668void 1689void
1669rxvt_term::update_background () 1690rxvt_term::update_background ()
1670{ 1691{
1671 if (update_background_ev.is_active ()) 1692 if (update_background_ev.is_active ())
1672 return; 1693 return;
1673 1694
1674 bgPixmap.invalidate ();
1675
1676 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1695 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1677 1696
1678 if (to_wait <= 0.) 1697 if (to_wait <= 0.)
1679 bgPixmap.render (); 1698 bg_render ();
1680 else 1699 else
1681 update_background_ev.start (to_wait); 1700 update_background_ev.start (to_wait);
1682} 1701}
1683 1702
1684void 1703void
1685rxvt_term::update_background_cb (ev::timer &w, int revents) 1704rxvt_term::update_background_cb (ev::timer &w, int revents)
1686{ 1705{
1687 make_current (); 1706 make_current ();
1688 1707
1689 update_background_ev.stop (); 1708 update_background_ev.stop ();
1690 bgPixmap.render (); 1709 bg_render ();
1691 refresh_check (); 1710 refresh_check ();
1692} 1711}
1693 1712
1694#endif /* HAVE_BG_PIXMAP */ 1713#endif /* HAVE_BG_PIXMAP */
1695 1714

Diff Legend

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