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

Diff Legend

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