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.360 by sf-exg, Fri Aug 19 16:01:37 2011 UTC vs.
Revision 1.398 by sf-exg, Tue Sep 8 07:54:58 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 * 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 3 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
22 * 22 *
23 * This program is distributed in the hope that it will be useful, 23 * This program is distributed in the hope that it will be useful,
24 * but WITHOUT ANY WARRANTY; without even the implied warranty of 24 * but WITHOUT ANY WARRANTY; without even the implied warranty of
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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
170 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this); 168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
171#endif 169#endif
172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174#endif 172#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177#endif 175#endif
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#ifdef USE_XIM 177#if USE_XIM
180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
181#endif 179#endif
182#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif 182#endif
228 226
229#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
230 bg_destroy (); 228 bg_destroy ();
231#endif 229#endif
232 230
231#if HAVE_IMG
232 delete bg_img;
233#endif
234
233 if (display) 235 if (display)
234 { 236 {
235 selection_clear (); 237 selection_clear ();
236 selection_clear (true); 238 selection_clear (true);
237 239
238#ifdef USE_XIM 240#if USE_XIM
239 im_destroy (); 241 im_destroy ();
240#endif 242#endif
241 scrollBar.destroy (); 243 scrollBar.destroy ();
244
245 if (gc)
242 if (gc) XFreeGC (dpy, gc); 246 XFreeGC (dpy, gc);
243 247
244 delete drawable; 248 delete drawable;
249
245 // destroy all windows 250 // destroy all windows
246 if (parent) 251 if (parent)
247 XDestroyWindow (dpy, parent); 252 XDestroyWindow (dpy, parent);
248 253
249 for (int i = 0; i < TOTAL_COLORS; i++) 254 for (int i = 0; i < TOTAL_COLORS; i++)
250 if (ISSET_PIXCOLOR (i)) 255 if (ISSET_PIXCOLOR (i))
251 { 256 {
252 pix_colors_focused [i].free (this); 257 pix_colors_focused [i].free (this);
253#if OFF_FOCUS_FADING 258#if OFF_FOCUS_FADING
259 if (rs[Rs_fade])
254 pix_colors_unfocused [i].free (this); 260 pix_colors_unfocused [i].free (this);
255#endif 261#endif
256 } 262 }
257 263
258 clear (); 264 clear ();
259 265
267 for (int i = 0; i < allocated.size (); i++) 273 for (int i = 0; i < allocated.size (); i++)
268 free (allocated [i]); 274 free (allocated [i]);
269 275
270 free (selection.text); 276 free (selection.text);
271 free (selection.clip_text); 277 free (selection.clip_text);
272 // TODO: manage env vars in child only(!)
273 free (env_display);
274 free (env_term);
275 free (locale); 278 free (locale);
276 free (v_buffer); 279 free (v_buffer);
277 280
278 delete selection_req; 281 delete selection_req;
279 282
283 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
284 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
285
286 delete [] env;
287
280 delete envv; 288 delete envv;
281 delete argv; 289 delete argv;
282 290
283#ifdef KEYSYM_RESOURCE 291#ifdef KEYSYM_RESOURCE
284 delete keyboard; 292 delete keyboard;
285#endif 293#endif
286#ifndef NO_RESOURCES 294#ifndef NO_RESOURCES
287 XrmDestroyDatabase (option_db); 295 XrmDestroyDatabase (option_db);
288#endif 296#endif
297
298 SET_R ((rxvt_term *)0);
289} 299}
290 300
291// child has exited, usually destroys 301// child has exited, usually destroys
292void 302void
293rxvt_term::child_cb (ev::child &w, int status) 303rxvt_term::child_cb (ev::child &w, int status)
316 { 326 {
317#if USE_XIM 327#if USE_XIM
318 im_ev.stop (display); 328 im_ev.stop (display);
319#endif 329#endif
320 scrollbar_ev.stop (display); 330 scrollbar_ev.stop (display);
321#if ENABLE_TRANSPARENCY || ENABLE_PERL 331#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
322 rootwin_ev.stop (display); 332 rootwin_ev.stop (display);
323#endif 333#endif
324 termwin_ev.stop (display); 334 termwin_ev.stop (display);
325 vt_ev.stop (display); 335 vt_ev.stop (display);
326 } 336 }
353 363
354 delete this; 364 delete this;
355} 365}
356 366
357void 367void
358rxvt_term::set_option (uint8_t opt, bool set) 368rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
359{ 369{
360 if (!opt) 370 if (!opt)
361 return; 371 return;
362 372
363 uint8_t mask = 1 << (opt & 7); 373 uint8_t mask = 1 << (opt & 7);
367} 377}
368 378
369/*----------------------------------------------------------------------*/ 379/*----------------------------------------------------------------------*/
370/* 380/*
371 * Exit gracefully, clearing the utmp entry and restoring tty attributes 381 * 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 */ 382 */
374static XErrorHandler old_xerror_handler; 383static XErrorHandler old_xerror_handler;
375 384
376static void 385static void
377rxvt_emergency_cleanup () 386rxvt_emergency_cleanup ()
379 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 388 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
380 (*t)->emergency_cleanup (); 389 (*t)->emergency_cleanup ();
381} 390}
382 391
383#if !ENABLE_MINIMAL 392#if !ENABLE_MINIMAL
384static void 393static void ecb_cold
385print_x_error (Display *dpy, XErrorEvent *event) 394print_x_error (Display *dpy, XErrorEvent *event)
386{ 395{
387 char buffer[BUFSIZ]; 396 char buffer[BUFSIZ];
388 char mesg[BUFSIZ]; 397 char mesg[BUFSIZ];
389 char number[32]; 398 char number[32];
390 const char mtype[] = "XlibMessage"; 399
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"); 400 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
401
402 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
403 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
404
405 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
406 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
394 rxvt_warn ("%s: %s\n", mesg, buffer); 407 rxvt_warn ("+ %s: %s\n", mesg, buffer);
408
395 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 409 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 410 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
411
412 if (event->request_code >= 128)
413 {
414#if 0
415 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
416 int nexts;
417 char **exts = XListExtensions (dpy, &nexts);
418
419 while (nexts)
420 {
421 char *extname = exts [nexts - 1];
422 int major, first_event, first_error;
423
424 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
425 {
426 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
427 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
428
429 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
430 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
431 rxvt_warn ("+ (which is %s)\n", buffer);
432
433 break;
434 }
435
436 printf ("nextss %d %s\n", nexts, extname);//D
437 --nexts;
438 ++exts;
439 }
440#else
441 int nexts = 0;
442 char **exts = 0;
443#endif
444
445 if (!nexts)
446 {
447 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
448
449 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
450 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
451
452#if 0
453 sprintf (number, "RENDER.%d", event->minor_code);
454 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
455 rxvt_warn ("+ (which is %s)\n", buffer);
456#endif
457 }
458
459 XFreeExtensionList (exts);
460 }
461 else
462 {
397 sprintf(number, "%d", event->request_code); 463 sprintf (number, "%d", event->request_code);
398 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 464 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
399 rxvt_warn ("(which is %s)\n", buffer); 465 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 } 466 }
467
405 if ((event->error_code == BadWindow) || 468 if (event->error_code == BadWindow
406 (event->error_code == BadPixmap) || 469 || event->error_code == BadPixmap
407 (event->error_code == BadCursor) || 470 || event->error_code == BadCursor
408 (event->error_code == BadFont) || 471 || event->error_code == BadFont
409 (event->error_code == BadDrawable) || 472 || event->error_code == BadDrawable
410 (event->error_code == BadColor) || 473 || event->error_code == BadColor
411 (event->error_code == BadGC) || 474 || event->error_code == BadGC
412 (event->error_code == BadIDChoice) || 475 || event->error_code == BadIDChoice
413 (event->error_code == BadValue) || 476 || event->error_code == BadValue
414 (event->error_code == BadAtom)) { 477 || event->error_code == BadAtom)
478 {
415 if (event->error_code == BadValue) 479 if (event->error_code == BadValue)
416 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 480 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
417 mesg, BUFSIZ);
418 else if (event->error_code == BadAtom) 481 else if (event->error_code == BadAtom)
419 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 482 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
420 mesg, BUFSIZ);
421 else 483 else
422 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 484 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 485
432int 486 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
487 }
488}
489#endif
490
491int ecb_cold
433rxvt_xerror_handler (Display *display, XErrorEvent *event) 492rxvt_xerror_handler (Display *display, XErrorEvent *event)
434{ 493{
435 if (GET_R->allowedxerror == -1) 494 if (GET_R && GET_R->allowedxerror == -1)
436 GET_R->allowedxerror = event->error_code; 495 GET_R->allowedxerror = event->error_code;
437 else 496 else
438 { 497 {
439 // GET_R is most likely not the terminal which caused the error, 498 // GET_R is most likely not the terminal which caused the error,
440 // so just output the error and continue 499 // so just output the error and continue
446 } 505 }
447 506
448 return 0; 507 return 0;
449} 508}
450 509
451int 510int ecb_cold
452rxvt_xioerror_handler (Display *display) 511rxvt_xioerror_handler (Display *display)
453{ 512{
454 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 513 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
455 DisplayString (display)); 514 DisplayString (display));
456 rxvt_emergency_cleanup (); 515 rxvt_emergency_cleanup ();
576 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
577 // TODO: handle this with exceptions and tolerate the memory loss 636 // TODO: handle this with exceptions and tolerate the memory loss
578 XSetIOErrorHandler (rxvt_xioerror_handler); 637 XSetIOErrorHandler (rxvt_xioerror_handler);
579 638
580 XrmInitialize (); 639 XrmInitialize ();
640
641#if HAVE_PIXBUF
642 g_type_init ();
643#endif
581} 644}
582 645
583/*----------------------------------------------------------------------*/ 646/*----------------------------------------------------------------------*/
584/* 647/*
585 * window size/position calculations for XSizeHint and other storage. 648 * window size/position calculations for XSizeHint and other storage.
713 // size, i.e., when the wm does not honour our size hints, there are 776 // size, i.e., when the wm does not honour our size hints, there are
714 // extra areas not covered by the terminal screen. Such gaps, when a 777 // extra areas not covered by the terminal screen. Such gaps, when a
715 // bg pixmap is set, would have to be cleared manually to properly 778 // bg pixmap is set, would have to be cleared manually to properly
716 // refresh the background. We take the simpler route and shrink the 779 // refresh the background. We take the simpler route and shrink the
717 // vt window so as to avoid creating gaps. 780 // vt window so as to avoid creating gaps.
718 width = ncol * fwidth; 781 vt_width = ncol * fwidth;
719 height = nrow * fheight; 782 vt_height = nrow * fheight;
720} 783}
721 784
722/*----------------------------------------------------------------------*/ 785/*----------------------------------------------------------------------*/
723/* 786/*
724 * Tell the teletype handler what size the window is. 787 * Tell the teletype handler what size the window is.
732 795
733 struct winsize ws; 796 struct winsize ws;
734 797
735 ws.ws_col = ncol; 798 ws.ws_col = ncol;
736 ws.ws_row = nrow; 799 ws.ws_row = nrow;
737 ws.ws_xpixel = width; 800 ws.ws_xpixel = vt_width;
738 ws.ws_ypixel = height; 801 ws.ws_ypixel = vt_height;
739 ioctl (pty->pty, TIOCSWINSZ, &ws); 802 ioctl (pty->pty, TIOCSWINSZ, &ws);
740 803
741#if 0 804#if 0
742 // TIOCSWINSZ is supposed to do this automatically and correctly 805 // TIOCSWINSZ is supposed to do this automatically and correctly
743 if (cmd_pid) /* force through to the command */ 806 if (cmd_pid) /* force through to the command */
769 832
770 delete fontset[0]; 833 delete fontset[0];
771 fontset[0] = fs; 834 fontset[0] = fs;
772 835
773 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 836 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
774 prop.height += lineSpace; 837 prop.width = max (prop.width + letterSpace, 1);
775 prop.width += letterSpace;
776 838
777 fs->set_prop (prop, false); 839 fs->set_prop (prop, false);
778 840
779 fwidth = prop.width; 841 fwidth = prop.width;
780 fheight = prop.height; 842 fheight = prop.height + lineSpace;
781 fbase = prop.ascent; 843 fbase = prop.ascent;
782 844
783 for (int style = 1; style < 4; style++) 845 for (int style = 1; style < 4; style++)
784 { 846 {
785#if ENABLE_STYLES 847#if ENABLE_STYLES
880 942
881void 943void
882rxvt_term::set_window_color (int idx, const char *color) 944rxvt_term::set_window_color (int idx, const char *color)
883{ 945{
884#ifdef XTERM_COLOR_CHANGE 946#ifdef XTERM_COLOR_CHANGE
885 rxvt_color xcol;
886
887 if (color == NULL || *color == '\0') 947 if (color == NULL || *color == '\0')
888 return; 948 return;
889 949
890 color = strdup (color); 950 color = strdup (color);
891 allocated.push_back ((void *)color); 951 allocated.push_back ((void *)color);
897 int i = atoi (color); 957 int i = atoi (color);
898 958
899 if (i >= 8 && i <= 15) 959 if (i >= 8 && i <= 15)
900 { 960 {
901 /* bright colors */ 961 /* bright colors */
902 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 962 alias_color (idx, minBrightCOLOR + i - 8);
903 goto done; 963 goto done;
904 } 964 }
905 965
906 if (i >= 0 && i <= 7) 966 if (i >= 0 && i <= 7)
907 { 967 {
908 /* normal colors */ 968 /* normal colors */
909 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 969 alias_color (idx, minCOLOR + i);
910 goto done; 970 goto done;
911 } 971 }
912 } 972 }
913 973
914 set_color (xcol, color); 974 pix_colors_focused[idx].free (this);
915 975 set_color (pix_colors_focused[idx], color);
916 /*
917 * FIXME: should free colors here, but no idea how to do it so instead,
918 * so just keep gobbling up the colormap
919 */
920
921 pix_colors_focused[idx] = xcol;
922 976
923done: 977done:
924 /*TODO: handle Color_BD, scrollbar background, etc. */ 978 /*TODO: handle Color_BD, scrollbar background, etc. */
925 979
926 update_fade_color (idx); 980 update_fade_color (idx);
927 recolour_cursor (); 981 recolor_cursor ();
928 scr_recolour (); 982 scr_recolor ();
929#endif /* XTERM_COLOR_CHANGE */ 983#endif /* XTERM_COLOR_CHANGE */
930} 984}
931 985
932void 986void
933rxvt_term::recolour_cursor () 987rxvt_term::recolor_cursor ()
934{ 988{
935 XColor fg, bg; 989 XColor fg, bg;
936 990
937 (ISSET_PIXCOLOR (Color_pointer_fg) 991 (ISSET_PIXCOLOR (Color_pointer_fg)
938 ? pix_colors_focused[Color_pointer_fg] 992 ? pix_colors_focused[Color_pointer_fg]
947 1001
948/*----------------------------------------------------------------------*/ 1002/*----------------------------------------------------------------------*/
949/* 1003/*
950 * 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
951 */ 1005 */
952void 1006char *
953rxvt_term::set_colorfgbg () 1007rxvt_term::get_colorfgbg ()
954{ 1008{
955 unsigned int i; 1009 unsigned int i;
956 const char *xpmb = ""; 1010 const char *xpmb = "";
957 char fstr[] = "default"; 1011 char fstr[] = "default";
958 char bstr[] = "default"; 1012 char bstr[] = "default";
1013 char *env_colorfgbg;
959 1014
960 for (i = Color_Black; i <= Color_White; i++) 1015 for (i = Color_Black; i <= Color_White; i++)
961 if (pix_colors[Color_fg] == pix_colors[i]) 1016 if (pix_colors[Color_fg] == pix_colors[i])
962 { 1017 {
963 sprintf (fstr, "%d", i - Color_Black); 1018 sprintf (fstr, "%d", i - Color_Black);
966 1021
967 for (i = Color_Black; i <= Color_White; i++) 1022 for (i = Color_Black; i <= Color_White; i++)
968 if (pix_colors[Color_bg] == pix_colors[i]) 1023 if (pix_colors[Color_bg] == pix_colors[i])
969 { 1024 {
970 sprintf (bstr, "%d", i - Color_Black); 1025 sprintf (bstr, "%d", i - Color_Black);
971#ifdef BG_IMAGE_FROM_FILE 1026#if BG_IMAGE_FROM_FILE
972 xpmb = "default;"; 1027 xpmb = "default;";
973#endif 1028#endif
974 break; 1029 break;
975 } 1030 }
976 1031
1032 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
977 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;
978} 1035}
979 1036
980/*----------------------------------------------------------------------*/ 1037/*----------------------------------------------------------------------*/
981 1038
982bool 1039bool
990} 1047}
991 1048
992void 1049void
993rxvt_term::alias_color (int dst, int src) 1050rxvt_term::alias_color (int dst, int src)
994{ 1051{
1052 pix_colors[dst].free (this);
995 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]); 1053 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
996} 1054}
997 1055
998/* -------------------------------------------------------------------- * 1056/* -------------------------------------------------------------------- *
999 * - WINDOW RESIZING - * 1057 * - WINDOW RESIZING - *
1075 if (scrollBar.state) 1133 if (scrollBar.state)
1076 scrollBar.resize (); 1134 scrollBar.resize ();
1077 1135
1078 XMoveResizeWindow (dpy, vt, 1136 XMoveResizeWindow (dpy, vt,
1079 window_vt_x, window_vt_y, 1137 window_vt_x, window_vt_y,
1080 width, height); 1138 vt_width, vt_height);
1139
1140 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1081 1141
1082#ifdef HAVE_BG_PIXMAP 1142#ifdef HAVE_BG_PIXMAP
1083 if (bg_window_size_sensitive ()) 1143 if (bg_window_size_sensitive ())
1084 update_background (); 1144 update_background ();
1085#endif 1145#endif
1086 } 1146 }
1087 1147
1088 if (fix_screen || old_height == 0) 1148 if (fix_screen || old_height == 0)
1089 scr_reset (); 1149 scr_reset ();
1090 1150
1091#ifdef USE_XIM 1151#if USE_XIM
1092 im_set_position (); 1152 im_set_position ();
1093#endif 1153#endif
1094} 1154}
1095 1155
1096/* 1156/*
1110 newwidth = wattr.width - szHint.base_width; 1170 newwidth = wattr.width - szHint.base_width;
1111 if (newheight == 0) 1171 if (newheight == 0)
1112 newheight = wattr.height - szHint.base_height; 1172 newheight = wattr.height - szHint.base_height;
1113 } 1173 }
1114 1174
1115 if (newwidth != width || newheight != height) 1175 if (newwidth != vt_width || newheight != vt_height)
1116 { 1176 {
1117 newwidth += szHint.base_width; 1177 newwidth += szHint.base_width;
1118 newheight += szHint.base_height; 1178 newheight += szHint.base_height;
1119 resize_all_windows (newwidth, newheight, 0); 1179 resize_all_windows (newwidth, newheight, 0);
1120 } 1180 }
1121} 1181}
1122 1182
1123/* -------------------------------------------------------------------- * 1183/* -------------------------------------------------------------------- *
1124 * - X INPUT METHOD ROUTINES - * 1184 * - X INPUT METHOD ROUTINES - *
1125 * -------------------------------------------------------------------- */ 1185 * -------------------------------------------------------------------- */
1126#ifdef USE_XIM 1186#if USE_XIM
1127 1187
1128void 1188void
1129rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1189rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1130{ 1190{
1131 fg = pix_colors [Color_fg]; 1191 fg = pix_colors [Color_fg];
1311 unsigned long fg, bg; 1371 unsigned long fg, bg;
1312 const char *p; 1372 const char *p;
1313 char **s; 1373 char **s;
1314 XIMStyles *xim_styles; 1374 XIMStyles *xim_styles;
1315 1375
1316 set_environ (envv); 1376 set_environ (env);
1317 1377
1318 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1378 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1319 return false; 1379 return false;
1320 1380
1321 input_method = display->get_xim (locale, modifiers); 1381 input_method = display->get_xim (locale, modifiers);
1322 if (input_method == NULL) 1382 if (input_method == NULL)
1323 return false; 1383 return false;
1528 im_destroy (); 1588 im_destroy ();
1529 1589
1530 if (Input_Context) 1590 if (Input_Context)
1531 return; 1591 return;
1532 1592
1533#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1534 if (rs[Rs_imLocale]) 1593 if (rs[Rs_imLocale])
1535 SET_LOCALE (rs[Rs_imLocale]); 1594 SET_LOCALE (rs[Rs_imLocale]);
1536#endif
1537 1595
1538 p = rs[Rs_inputMethod]; 1596 p = rs[Rs_inputMethod];
1539 if (p && *p) 1597 if (p && *p)
1540 { 1598 {
1541 bool found = false; 1599 bool found = false;
1569 /* try with no modifiers base IF the user didn't specify an IM */ 1627 /* try with no modifiers base IF the user didn't specify an IM */
1570 if (im_get_ic ("@im=none")) 1628 if (im_get_ic ("@im=none"))
1571 goto done; 1629 goto done;
1572 1630
1573done: 1631done:
1574#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1575 if (rs[Rs_imLocale]) 1632 if (rs[Rs_imLocale])
1576 SET_LOCALE (locale); 1633 SET_LOCALE (locale);
1577#endif
1578} 1634}
1579 1635
1580void 1636void
1581rxvt_term::im_set_position () 1637rxvt_term::im_set_position ()
1582{ 1638{
1627{ 1683{
1628 Window cr; 1684 Window cr;
1629 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr); 1685 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1630} 1686}
1631 1687
1632Pixmap
1633rxvt_term::get_pixmap_property (Atom property)
1634{
1635 Pixmap pixmap = None;
1636
1637 int aformat;
1638 unsigned long nitems, bytes_after;
1639 Atom atype;
1640 unsigned char *prop;
1641 int result = XGetWindowProperty (dpy, display->root, property,
1642 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1643 &nitems, &bytes_after, &prop);
1644 if (result == Success)
1645 {
1646 if (atype == XA_PIXMAP)
1647 pixmap = *(Pixmap *)prop;
1648 XFree (prop);
1649 }
1650
1651 return pixmap;
1652}
1653
1654#ifdef HAVE_BG_PIXMAP 1688#ifdef HAVE_BG_PIXMAP
1655 1689
1656void 1690void
1657rxvt_term::update_background () 1691rxvt_term::update_background ()
1658{ 1692{
1659 if (update_background_ev.is_active ()) 1693 if (update_background_ev.is_active ())
1660 return; 1694 return;
1661
1662 bg_invalidate ();
1663 1695
1664 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1696 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1665 1697
1666 if (to_wait <= 0.) 1698 if (to_wait <= 0.)
1667 bg_render (); 1699 bg_render ();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines