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.355 by sf-exg, Thu Apr 7 12:19:40 2011 UTC vs.
Revision 1.399 by sf-exg, Tue Oct 13 08:10:43 2015 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 <schmorp@schmorp.de> 16 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
17 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
17 * 18 *
18 * This program is free software; you can redistribute it and/or modify 19 * 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 20 * 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 21 * the Free Software Foundation; either version 3 of the License, or
21 * (at your option) any later version. 22 * (at your option) any later version.
22 * 23 *
23 * This program is distributed in the hope that it will be useful, 24 * This program is distributed in the hope that it will be useful,
24 * but WITHOUT ANY WARRANTY; without even the implied warranty of 25 * but WITHOUT ANY WARRANTY; without even the implied warranty of
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
36#include "keyboard.h" 37#include "keyboard.h"
37#include "rxvtperl.h" 38#include "rxvtperl.h"
38 39
39#include <limits> 40#include <limits>
40 41
41#include <cassert> 42#include <assert.h>
42#include <csignal> 43#include <signal.h>
43#include <cstring> 44#include <string.h>
44 45
45#include <termios.h> 46#include <termios.h>
46 47
47#ifdef HAVE_XSETLOCALE 48#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 49# define X_LOCALE
49# include <X11/Xlocale.h> 50# include <X11/Xlocale.h>
50#else 51#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 52# include <locale.h>
53# endif
54#endif 53#endif
55 54
56struct termios rxvt_term::def_tio; 55struct termios rxvt_term::def_tio;
57vector<rxvt_term *> rxvt_term::termlist; 56vector<rxvt_term *> rxvt_term::termlist;
58 57
… …
105 if (cc->c2 == c2) return c1; 104 if (cc->c2 == c2) return c1;
106 cc = (*this)[cc->c1]; 105 cc = (*this)[cc->c1];
107 } 106 }
108 107
109 // check to see whether this combination already exists otherwise 108 // check to see whether this combination already exists otherwise
110 for (cc = v.end (); cc-- > v.begin (); ) 109 for (cc = v.begin (); cc < v.end (); cc++)
111 if (cc->c1 == c1 && cc->c2 == c2) 110 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 111 return COMPOSE_LO + (cc - v.begin ());
113 112
114 // allocate a new combination 113 // allocate a new combination
115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
… …
170 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this); 169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
171#endif 170#endif
172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174#endif 173#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL 174#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177#endif 176#endif
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#ifdef USE_XIM 178#if USE_XIM
180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
181#endif 180#endif
182#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif 183#endif
… …
228 227
229#ifdef HAVE_BG_PIXMAP 228#ifdef HAVE_BG_PIXMAP
230 bg_destroy (); 229 bg_destroy ();
231#endif 230#endif
232 231
232#if HAVE_IMG
233 delete bg_img;
234#endif
235
233 if (display) 236 if (display)
234 { 237 {
235 selection_clear (); 238 selection_clear ();
236 selection_clear (true); 239 selection_clear (true);
237 240
238#ifdef USE_XIM 241#if USE_XIM
239 im_destroy (); 242 im_destroy ();
240#endif 243#endif
241 scrollBar.destroy (); 244 scrollBar.destroy ();
245
246 if (gc)
242 if (gc) XFreeGC (dpy, gc); 247 XFreeGC (dpy, gc);
243 248
244 delete drawable; 249 delete drawable;
250
245 // destroy all windows 251 // destroy all windows
246 if (parent) 252 if (parent)
247 XDestroyWindow (dpy, parent); 253 XDestroyWindow (dpy, parent);
248 254
249 for (int i = 0; i < TOTAL_COLORS; i++) 255 for (int i = 0; i < TOTAL_COLORS; i++)
250 if (ISSET_PIXCOLOR (i)) 256 if (ISSET_PIXCOLOR (i))
251 { 257 {
252 pix_colors_focused [i].free (this); 258 pix_colors_focused [i].free (this);
253#if OFF_FOCUS_FADING 259#if OFF_FOCUS_FADING
260 if (rs[Rs_fade])
254 pix_colors_unfocused [i].free (this); 261 pix_colors_unfocused [i].free (this);
255#endif 262#endif
256 } 263 }
257 264
258 clear (); 265 clear ();
259 266
… …
267 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
268 free (allocated [i]); 275 free (allocated [i]);
269 276
270 free (selection.text); 277 free (selection.text);
271 free (selection.clip_text); 278 free (selection.clip_text);
272 // TODO: manage env vars in child only(!)
273 free (env_display);
274 free (env_term);
275 free (locale); 279 free (locale);
276 free (v_buffer); 280 free (v_buffer);
277 281
278 delete selection_req; 282 delete selection_req;
279 283
284 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
285 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
286
287 delete [] env;
288
280 delete envv; 289 delete envv;
281 delete argv; 290 delete argv;
282 291
283#ifdef KEYSYM_RESOURCE 292#ifdef KEYSYM_RESOURCE
284 delete keyboard; 293 delete keyboard;
285#endif 294#endif
286#ifndef NO_RESOURCES 295#ifndef NO_RESOURCES
287 XrmDestroyDatabase (option_db); 296 XrmDestroyDatabase (option_db);
288#endif 297#endif
298
299 SET_R ((rxvt_term *)0);
289} 300}
290 301
291// child has exited, usually destroys 302// child has exited, usually destroys
292void 303void
293rxvt_term::child_cb (ev::child &w, int status) 304rxvt_term::child_cb (ev::child &w, int status)
… …
316 { 327 {
317#if USE_XIM 328#if USE_XIM
318 im_ev.stop (display); 329 im_ev.stop (display);
319#endif 330#endif
320 scrollbar_ev.stop (display); 331 scrollbar_ev.stop (display);
321#if ENABLE_TRANSPARENCY || ENABLE_PERL 332#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
322 rootwin_ev.stop (display); 333 rootwin_ev.stop (display);
323#endif 334#endif
324 termwin_ev.stop (display); 335 termwin_ev.stop (display);
325 vt_ev.stop (display); 336 vt_ev.stop (display);
326 } 337 }
… …
353 364
354 delete this; 365 delete this;
355} 366}
356 367
357void 368void
358rxvt_term::set_option (uint8_t opt, bool set) 369rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
359{ 370{
360 if (!opt) 371 if (!opt)
361 return; 372 return;
362 373
363 uint8_t mask = 1 << (opt & 7); 374 uint8_t mask = 1 << (opt & 7);
… …
367} 378}
368 379
369/*----------------------------------------------------------------------*/ 380/*----------------------------------------------------------------------*/
370/* 381/*
371 * Exit gracefully, clearing the utmp entry and restoring tty attributes 382 * Exit gracefully, clearing the utmp entry and restoring tty attributes
372 * TODO: if debugging, this should free up any known resources if we can
373 */ 383 */
374static XErrorHandler old_xerror_handler; 384static XErrorHandler old_xerror_handler;
375 385
376static void 386static void
377rxvt_emergency_cleanup () 387rxvt_emergency_cleanup ()
… …
379 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 389 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
380 (*t)->emergency_cleanup (); 390 (*t)->emergency_cleanup ();
381} 391}
382 392
383#if !ENABLE_MINIMAL 393#if !ENABLE_MINIMAL
384static void 394static void ecb_cold
385print_x_error (Display *dpy, XErrorEvent *event) 395print_x_error (Display *dpy, XErrorEvent *event)
386{ 396{
387 char buffer[BUFSIZ]; 397 char buffer[BUFSIZ];
388 char mesg[BUFSIZ]; 398 char mesg[BUFSIZ];
389 char number[32]; 399 char number[32];
390 const char mtype[] = "XlibMessage"; 400
391 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
392 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
393 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 401 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
402
403 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
404 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
405
406 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
407 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
394 rxvt_warn ("%s: %s\n", mesg, buffer); 408 rxvt_warn ("+ %s: %s\n", mesg, buffer);
409
395 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 410 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 411 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
412
413 if (event->request_code >= 128)
414 {
415#if 0
416 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
417 int nexts;
418 char **exts = XListExtensions (dpy, &nexts);
419
420 while (nexts)
421 {
422 char *extname = exts [nexts - 1];
423 int major, first_event, first_error;
424
425 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
426 {
427 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
428 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
429
430 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
431 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
432 rxvt_warn ("+ (which is %s)\n", buffer);
433
434 break;
435 }
436
437 printf ("nextss %d %s\n", nexts, extname);//D
438 --nexts;
439 ++exts;
440 }
441#else
442 int nexts = 0;
443 char **exts = 0;
444#endif
445
446 if (!nexts)
447 {
448 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
449
450 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
451 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
452
453#if 0
454 sprintf (number, "RENDER.%d", event->minor_code);
455 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
456 rxvt_warn ("+ (which is %s)\n", buffer);
457#endif
458 }
459
460 XFreeExtensionList (exts);
461 }
462 else
463 {
397 sprintf(number, "%d", event->request_code); 464 sprintf (number, "%d", event->request_code);
398 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 465 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
399 rxvt_warn ("(which is %s)\n", buffer); 466 rxvt_warn ("+ (which is %s)\n", buffer);
400 if (event->request_code >= 128) {
401 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
402 mesg, BUFSIZ);
403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
404 } 467 }
468
405 if ((event->error_code == BadWindow) || 469 if (event->error_code == BadWindow
406 (event->error_code == BadPixmap) || 470 || event->error_code == BadPixmap
407 (event->error_code == BadCursor) || 471 || event->error_code == BadCursor
408 (event->error_code == BadFont) || 472 || event->error_code == BadFont
409 (event->error_code == BadDrawable) || 473 || event->error_code == BadDrawable
410 (event->error_code == BadColor) || 474 || event->error_code == BadColor
411 (event->error_code == BadGC) || 475 || event->error_code == BadGC
412 (event->error_code == BadIDChoice) || 476 || event->error_code == BadIDChoice
413 (event->error_code == BadValue) || 477 || event->error_code == BadValue
414 (event->error_code == BadAtom)) { 478 || event->error_code == BadAtom)
479 {
415 if (event->error_code == BadValue) 480 if (event->error_code == BadValue)
416 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 481 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
417 mesg, BUFSIZ);
418 else if (event->error_code == BadAtom) 482 else if (event->error_code == BadAtom)
419 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 483 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
420 mesg, BUFSIZ);
421 else 484 else
422 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 485 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
423 mesg, BUFSIZ);
424 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
425 }
426 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
427 mesg, BUFSIZ);
428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
429}
430#endif
431 486
432int 487 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
488 }
489}
490#endif
491
492int ecb_cold
433rxvt_xerror_handler (Display *display, XErrorEvent *event) 493rxvt_xerror_handler (Display *display, XErrorEvent *event)
434{ 494{
435 if (GET_R->allowedxerror == -1) 495 if (GET_R && GET_R->allowedxerror == -1)
436 GET_R->allowedxerror = event->error_code; 496 GET_R->allowedxerror = event->error_code;
437 else 497 else
438 { 498 {
439 // GET_R is most likely not the terminal which caused the error, 499 // GET_R is most likely not the terminal which caused the error,
440 // so just output the error and continue 500 // so just output the error and continue
… …
446 } 506 }
447 507
448 return 0; 508 return 0;
449} 509}
450 510
451int 511int ecb_cold
452rxvt_xioerror_handler (Display *display) 512rxvt_xioerror_handler (Display *display)
453{ 513{
454 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 514 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
455 DisplayString (display)); 515 DisplayString (display));
456 rxvt_emergency_cleanup (); 516 rxvt_emergency_cleanup ();
… …
576 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
577 // TODO: handle this with exceptions and tolerate the memory loss 637 // TODO: handle this with exceptions and tolerate the memory loss
578 XSetIOErrorHandler (rxvt_xioerror_handler); 638 XSetIOErrorHandler (rxvt_xioerror_handler);
579 639
580 XrmInitialize (); 640 XrmInitialize ();
641
642#if HAVE_PIXBUF
643 g_type_init ();
644#endif
581} 645}
582 646
583/*----------------------------------------------------------------------*/ 647/*----------------------------------------------------------------------*/
584/* 648/*
585 * window size/position calculations for XSizeHint and other storage. 649 * window size/position calculations for XSizeHint and other storage.
… …
706 if (recalc_y) 770 if (recalc_y)
707 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 771 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
708 772
709 ncol = width / fwidth; 773 ncol = width / fwidth;
710 nrow = height / fheight; 774 nrow = height / fheight;
775
776 // When the size of the vt window is not a multiple of the cell
777 // size, i.e., when the wm does not honour our size hints, there are
778 // extra areas not covered by the terminal screen. Such gaps, when a
779 // bg pixmap is set, would have to be cleared manually to properly
780 // refresh the background. We take the simpler route and shrink the
781 // vt window so as to avoid creating gaps.
782 vt_width = ncol * fwidth;
783 vt_height = nrow * fheight;
711} 784}
712 785
713/*----------------------------------------------------------------------*/ 786/*----------------------------------------------------------------------*/
714/* 787/*
715 * Tell the teletype handler what size the window is. 788 * Tell the teletype handler what size the window is.
… …
723 796
724 struct winsize ws; 797 struct winsize ws;
725 798
726 ws.ws_col = ncol; 799 ws.ws_col = ncol;
727 ws.ws_row = nrow; 800 ws.ws_row = nrow;
728 ws.ws_xpixel = width; 801 ws.ws_xpixel = vt_width;
729 ws.ws_ypixel = height; 802 ws.ws_ypixel = vt_height;
730 ioctl (pty->pty, TIOCSWINSZ, &ws); 803 ioctl (pty->pty, TIOCSWINSZ, &ws);
731 804
732#if 0 805#if 0
733 // TIOCSWINSZ is supposed to do this automatically and correctly 806 // TIOCSWINSZ is supposed to do this automatically and correctly
734 if (cmd_pid) /* force through to the command */ 807 if (cmd_pid) /* force through to the command */
735 kill (-cmd_pid, SIGWINCH); 808 kill (-cmd_pid, SIGWINCH);
736#endif 809#endif
737} 810}
738 811
739/*----------------------------------------------------------------------*/ 812/*----------------------------------------------------------------------*/
740/* set_fonts () - load and set the various fonts 813/* load and set the various fonts */
741 *
742 * init = 1 - initialize
743 *
744 * fontname == FONT_UP - switch to bigger font
745 * fontname == FONT_DN - switch to smaller font
746 */
747bool 814bool
748rxvt_term::set_fonts () 815rxvt_term::set_fonts ()
749{ 816{
750 rxvt_fontset *fs = new rxvt_fontset (this); 817 rxvt_fontset *fs = new rxvt_fontset (this);
751 rxvt_fontprop prop; 818 rxvt_fontprop prop;
… …
766 833
767 delete fontset[0]; 834 delete fontset[0];
768 fontset[0] = fs; 835 fontset[0] = fs;
769 836
770 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 837 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
771 prop.height += lineSpace; 838 prop.width = max (prop.width + letterSpace, 1);
772 prop.width += letterSpace;
773 839
774 fs->set_prop (prop, false); 840 fs->set_prop (prop, false);
775 841
776 fwidth = prop.width; 842 fwidth = prop.width;
777 fheight = prop.height; 843 fheight = prop.height + lineSpace;
778 fbase = prop.ascent; 844 fbase = prop.ascent;
779 845
780 for (int style = 1; style < 4; style++) 846 for (int style = 1; style < 4; style++)
781 { 847 {
782#if ENABLE_STYLES 848#if ENABLE_STYLES
… …
877 943
878void 944void
879rxvt_term::set_window_color (int idx, const char *color) 945rxvt_term::set_window_color (int idx, const char *color)
880{ 946{
881#ifdef XTERM_COLOR_CHANGE 947#ifdef XTERM_COLOR_CHANGE
882 rxvt_color xcol;
883
884 if (color == NULL || *color == '\0') 948 if (color == NULL || *color == '\0')
885 return; 949 return;
886 950
887 color = strdup (color); 951 color = strdup (color);
888 allocated.push_back ((void *)color); 952 allocated.push_back ((void *)color);
… …
894 int i = atoi (color); 958 int i = atoi (color);
895 959
896 if (i >= 8 && i <= 15) 960 if (i >= 8 && i <= 15)
897 { 961 {
898 /* bright colors */ 962 /* bright colors */
899 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 963 alias_color (idx, minBrightCOLOR + i - 8);
900 goto done; 964 goto done;
901 } 965 }
902 966
903 if (i >= 0 && i <= 7) 967 if (i >= 0 && i <= 7)
904 { 968 {
905 /* normal colors */ 969 /* normal colors */
906 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 970 alias_color (idx, minCOLOR + i);
907 goto done; 971 goto done;
908 } 972 }
909 } 973 }
910 974
911 set_color (xcol, color); 975 pix_colors_focused[idx].free (this);
912 976 set_color (pix_colors_focused[idx], color);
913 /*
914 * FIXME: should free colors here, but no idea how to do it so instead,
915 * so just keep gobbling up the colormap
916 */
917
918 pix_colors_focused[idx] = xcol;
919 977
920done: 978done:
921 /*TODO: handle Color_BD, scrollbar background, etc. */ 979 /*TODO: handle Color_BD, scrollbar background, etc. */
922 980
923 update_fade_color (idx); 981 update_fade_color (idx);
924 recolour_cursor (); 982 recolor_cursor ();
925 scr_recolour (); 983 scr_recolor ();
926#endif /* XTERM_COLOR_CHANGE */ 984#endif /* XTERM_COLOR_CHANGE */
927} 985}
928 986
929void 987void
930rxvt_term::recolour_cursor () 988rxvt_term::recolor_cursor ()
931{ 989{
932 XColor fg, bg; 990 XColor fg, bg;
933 991
934 (ISSET_PIXCOLOR (Color_pointer_fg) 992 (ISSET_PIXCOLOR (Color_pointer_fg)
935 ? pix_colors_focused[Color_pointer_fg] 993 ? pix_colors_focused[Color_pointer_fg]
… …
944 1002
945/*----------------------------------------------------------------------*/ 1003/*----------------------------------------------------------------------*/
946/* 1004/*
947 * find if fg/bg matches any of the normal (low-intensity) colors 1005 * find if fg/bg matches any of the normal (low-intensity) colors
948 */ 1006 */
949void 1007char *
950rxvt_term::set_colorfgbg () 1008rxvt_term::get_colorfgbg ()
951{ 1009{
952 unsigned int i; 1010 unsigned int i;
953 const char *xpmb = ""; 1011 const char *xpmb = "";
954 char fstr[] = "default"; 1012 char fstr[] = "default";
955 char bstr[] = "default"; 1013 char bstr[] = "default";
1014 char *env_colorfgbg;
956 1015
957 for (i = Color_Black; i <= Color_White; i++) 1016 for (i = Color_Black; i <= Color_White; i++)
958 if (pix_colors[Color_fg] == pix_colors[i]) 1017 if (pix_colors[Color_fg] == pix_colors[i])
959 { 1018 {
960 sprintf (fstr, "%d", i - Color_Black); 1019 sprintf (fstr, "%d", i - Color_Black);
… …
963 1022
964 for (i = Color_Black; i <= Color_White; i++) 1023 for (i = Color_Black; i <= Color_White; i++)
965 if (pix_colors[Color_bg] == pix_colors[i]) 1024 if (pix_colors[Color_bg] == pix_colors[i])
966 { 1025 {
967 sprintf (bstr, "%d", i - Color_Black); 1026 sprintf (bstr, "%d", i - Color_Black);
968#ifdef BG_IMAGE_FROM_FILE 1027#if BG_IMAGE_FROM_FILE
969 xpmb = "default;"; 1028 xpmb = "default;";
970#endif 1029#endif
971 break; 1030 break;
972 } 1031 }
973 1032
1033 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
974 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1034 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1035 return env_colorfgbg;
975} 1036}
976 1037
977/*----------------------------------------------------------------------*/ 1038/*----------------------------------------------------------------------*/
978 1039
979bool 1040bool
… …
987} 1048}
988 1049
989void 1050void
990rxvt_term::alias_color (int dst, int src) 1051rxvt_term::alias_color (int dst, int src)
991{ 1052{
1053 pix_colors[dst].free (this);
992 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]); 1054 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
993} 1055}
994 1056
995/* -------------------------------------------------------------------- * 1057/* -------------------------------------------------------------------- *
996 * - WINDOW RESIZING - * 1058 * - WINDOW RESIZING - *
… …
1072 if (scrollBar.state) 1134 if (scrollBar.state)
1073 scrollBar.resize (); 1135 scrollBar.resize ();
1074 1136
1075 XMoveResizeWindow (dpy, vt, 1137 XMoveResizeWindow (dpy, vt,
1076 window_vt_x, window_vt_y, 1138 window_vt_x, window_vt_y,
1077 width, height); 1139 vt_width, vt_height);
1140
1141 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1078 1142
1079#ifdef HAVE_BG_PIXMAP 1143#ifdef HAVE_BG_PIXMAP
1080 if (bg_window_size_sensitive ()) 1144 if (bg_window_size_sensitive ())
1081 update_background (); 1145 update_background ();
1082#endif 1146#endif
1083 } 1147 }
1084 1148
1085 if (fix_screen || old_height == 0) 1149 if (fix_screen || old_height == 0)
1086 scr_reset (); 1150 scr_reset ();
1087 1151
1088#ifdef USE_XIM 1152#if USE_XIM
1089 IMSetPosition (); 1153 im_set_position ();
1090#endif 1154#endif
1091} 1155}
1092 1156
1093/* 1157/*
1094 * Set the width/height of the vt window in characters. Units are pixels. 1158 * Set the width/height of the vt window in characters. Units are pixels.
… …
1107 newwidth = wattr.width - szHint.base_width; 1171 newwidth = wattr.width - szHint.base_width;
1108 if (newheight == 0) 1172 if (newheight == 0)
1109 newheight = wattr.height - szHint.base_height; 1173 newheight = wattr.height - szHint.base_height;
1110 } 1174 }
1111 1175
1112 if (newwidth != width || newheight != height) 1176 if (newwidth != vt_width || newheight != vt_height)
1113 { 1177 {
1114 newwidth += szHint.base_width; 1178 newwidth += szHint.base_width;
1115 newheight += szHint.base_height; 1179 newheight += szHint.base_height;
1116 resize_all_windows (newwidth, newheight, 0); 1180 resize_all_windows (newwidth, newheight, 0);
1117 } 1181 }
1118} 1182}
1119 1183
1120/* -------------------------------------------------------------------- * 1184/* -------------------------------------------------------------------- *
1121 * - X INPUT METHOD ROUTINES - * 1185 * - X INPUT METHOD ROUTINES - *
1122 * -------------------------------------------------------------------- */ 1186 * -------------------------------------------------------------------- */
1123#ifdef USE_XIM 1187#if USE_XIM
1124 1188
1125void 1189void
1126rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1190rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1127{ 1191{
1128 fg = pix_colors [Color_fg]; 1192 fg = pix_colors [Color_fg];
… …
1155 status_rect.height = fheight; 1219 status_rect.height = fheight;
1156} 1220}
1157 1221
1158/* Checking whether input method is running. */ 1222/* Checking whether input method is running. */
1159bool 1223bool
1160rxvt_term::IMisRunning () 1224rxvt_term::im_is_running ()
1161{ 1225{
1162 Atom atom; 1226 Atom atom;
1163 Window win; 1227 Window win;
1164 char server[IMBUFSIZ]; 1228 char server[IMBUFSIZ];
1165 1229
… …
1181 1245
1182 return false; 1246 return false;
1183} 1247}
1184 1248
1185void 1249void
1186rxvt_term::IMSendSpot () 1250rxvt_term::im_send_spot ()
1187{ 1251{
1188 XPoint nspot; 1252 XPoint nspot;
1189 XVaNestedList preedit_attr; 1253 XVaNestedList preedit_attr;
1190 1254
1191 if (!Input_Context 1255 if (!Input_Context
… …
1297/* 1361/*
1298 * Try to open a XIM with the current modifiers, then see if we can 1362 * Try to open a XIM with the current modifiers, then see if we can
1299 * open a suitable preedit type 1363 * open a suitable preedit type
1300 */ 1364 */
1301bool 1365bool
1302rxvt_term::IM_get_IC (const char *modifiers) 1366rxvt_term::im_get_ic (const char *modifiers)
1303{ 1367{
1304 int i, j, found; 1368 int i, j, found;
1305 XIM xim; 1369 XIM xim;
1306 XPoint spot; 1370 XPoint spot;
1307 XRectangle rect, status_rect, needed_rect; 1371 XRectangle rect, status_rect, needed_rect;
1308 unsigned long fg, bg; 1372 unsigned long fg, bg;
1309 const char *p; 1373 const char *p;
1310 char **s; 1374 char **s;
1311 XIMStyles *xim_styles; 1375 XIMStyles *xim_styles;
1312#ifdef ENABLE_XIM_ONTHESPOT
1313 XIMCallback xcb[4];
1314#endif
1315 1376
1316 set_environ (envv); 1377 set_environ (env);
1317 1378
1318 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1379 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1319 return false; 1380 return false;
1320 1381
1321 input_method = display->get_xim (locale, modifiers); 1382 input_method = display->get_xim (locale, modifiers);
1322 if (input_method == NULL) 1383 if (input_method == NULL)
1323 return false; 1384 return false;
… …
1459 NULL); 1520 NULL);
1460 } 1521 }
1461#if ENABLE_XIM_ONTHESPOT 1522#if ENABLE_XIM_ONTHESPOT
1462 else if (input_style & XIMPreeditCallbacks) 1523 else if (input_style & XIMPreeditCallbacks)
1463 { 1524 {
1525 XIMCallback xcb[4];
1526
1464 im_set_position (spot); 1527 im_set_position (spot);
1465 1528
1466 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1529 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1467 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1530 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1468 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1531 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1506 // unfortunately, only the focus window is used by XIM, hard to fix 1569 // unfortunately, only the focus window is used by XIM, hard to fix
1507 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1570 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1508 vt_select_input (); 1571 vt_select_input ();
1509#endif 1572#endif
1510 1573
1511 IMSetPosition (); 1574 im_set_position ();
1512 1575
1513 return true; 1576 return true;
1514} 1577}
1515 1578
1516void 1579void
… …
1526 im_destroy (); 1589 im_destroy ();
1527 1590
1528 if (Input_Context) 1591 if (Input_Context)
1529 return; 1592 return;
1530 1593
1531#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1532 if (rs[Rs_imLocale]) 1594 if (rs[Rs_imLocale])
1533 SET_LOCALE (rs[Rs_imLocale]); 1595 SET_LOCALE (rs[Rs_imLocale]);
1534#endif
1535 1596
1536 p = rs[Rs_inputMethod]; 1597 p = rs[Rs_inputMethod];
1537 if (p && *p) 1598 if (p && *p)
1538 { 1599 {
1539 bool found = false; 1600 bool found = false;
… …
1544 { 1605 {
1545 if (*s[i]) 1606 if (*s[i])
1546 { 1607 {
1547 strcpy (buf, "@im="); 1608 strcpy (buf, "@im=");
1548 strncat (buf, s[i], IMBUFSIZ - 5); 1609 strncat (buf, s[i], IMBUFSIZ - 5);
1549 if (IM_get_IC (buf)) 1610 if (im_get_ic (buf))
1550 { 1611 {
1551 found = true; 1612 found = true;
1552 break; 1613 break;
1553 } 1614 }
1554 } 1615 }
… …
1559 if (found) 1620 if (found)
1560 goto done; 1621 goto done;
1561 } 1622 }
1562 1623
1563 /* try with XMODIFIERS env. var. */ 1624 /* try with XMODIFIERS env. var. */
1564 if (IM_get_IC ("")) 1625 if (im_get_ic (""))
1565 goto done; 1626 goto done;
1566 1627
1567 /* try with no modifiers base IF the user didn't specify an IM */ 1628 /* try with no modifiers base IF the user didn't specify an IM */
1568 if (IM_get_IC ("@im=none")) 1629 if (im_get_ic ("@im=none"))
1569 goto done; 1630 goto done;
1570 1631
1571done: 1632done:
1572#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1573 if (rs[Rs_imLocale]) 1633 if (rs[Rs_imLocale])
1574 SET_LOCALE (locale); 1634 SET_LOCALE (locale);
1575#endif
1576} 1635}
1577 1636
1578void 1637void
1579rxvt_term::IMSetPosition () 1638rxvt_term::im_set_position ()
1580{ 1639{
1581 XRectangle preedit_rect, status_rect, *needed_rect; 1640 XRectangle preedit_rect, status_rect, *needed_rect;
1582 XVaNestedList preedit_attr, status_attr; 1641 XVaNestedList preedit_attr, status_attr;
1583 1642
1584 if (!Input_Context 1643 if (!Input_Context
1585 || !focus 1644 || !focus
1586 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1645 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1587 || !IMisRunning ()) 1646 || !im_is_running ())
1588 return; 1647 return;
1589 1648
1590 if (input_style & XIMPreeditPosition) 1649 if (input_style & XIMPreeditPosition)
1591 { 1650 {
1592 im_set_size (preedit_rect); 1651 im_set_size (preedit_rect);
… …
1625{ 1684{
1626 Window cr; 1685 Window cr;
1627 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr); 1686 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1628} 1687}
1629 1688
1630Pixmap
1631rxvt_term::get_pixmap_property (Atom property)
1632{
1633 Pixmap pixmap = None;
1634
1635 int aformat;
1636 unsigned long nitems, bytes_after;
1637 Atom atype;
1638 unsigned char *prop;
1639 int result = XGetWindowProperty (dpy, display->root, property,
1640 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1641 &nitems, &bytes_after, &prop);
1642 if (result == Success)
1643 {
1644 if (atype == XA_PIXMAP)
1645 pixmap = *(Pixmap *)prop;
1646 XFree (prop);
1647 }
1648
1649 return pixmap;
1650}
1651
1652#ifdef HAVE_BG_PIXMAP 1689#ifdef HAVE_BG_PIXMAP
1653 1690
1654void 1691void
1655rxvt_term::update_background () 1692rxvt_term::update_background ()
1656{ 1693{
1657 if (update_background_ev.is_active ()) 1694 if (update_background_ev.is_active ())
1658 return; 1695 return;
1659
1660 bg_invalidate ();
1661 1696
1662 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1697 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1663 1698
1664 if (to_wait <= 0.) 1699 if (to_wait <= 0.)
1665 bg_render (); 1700 bg_render ();

Diff Legend

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