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.43 by pcg, Tue Feb 24 00:02:44 2004 UTC vs.
Revision 1.67 by pcg, Sun May 9 18:19:49 2004 UTC

1/*--------------------------------*-C-*---------------------------------*; 1/*--------------------------------*-C-*---------------------------------*
2 * File: main.c 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47#include <cstring> 47#include <cstring>
48 48
49vector<rxvt_term *> rxvt_term::termlist;
50
49static char curlocale[128]; 51static char curlocale[128];
50 52
51void 53bool
52rxvt_set_locale (const char *locale) 54rxvt_set_locale (const char *locale)
53{ 55{
54 if (locale && STRNCMP (locale, curlocale, 128)) 56 if (!locale || !STRNCMP (locale, curlocale, 128))
55 { 57 return false;
58
56 STRNCPY (curlocale, locale, 128); 59 STRNCPY (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale); 60 setlocale (LC_CTYPE, curlocale);
61 return true;
62}
63
64#if ENABLE_COMBINING
65class rxvt_composite_vec rxvt_composite;
66
67text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
68{
69 compose_char *cc;
70
71 // break compose chains, as stupid readline really likes to duplicate
72 // composing characters for some reason near the end of a line.
73 cc = (*this)[c1];
74 while (cc)
58 } 75 {
76 if (cc->c2 == c2) return c1;
77 cc = (*this)[cc->c1];
78 }
79
80 // check to see wether this combination already exists otherwise
81 for (cc = v.end (); cc-- > v.begin (); )
82 {
83 if (cc->c1 == c1 && cc->c2 == c2)
84 return COMPOSE_LO + (cc - v.begin ());
85 }
86
87 // allocate a new combination
88 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
89 {
90 static int seen;
91
92 if (!seen++)
93 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");
94
95 return REPLACEMENT_CHAR;
96 }
97
98 v.push_back (compose_char (c1, c2));
99
100 return v.size () - 1 + COMPOSE_LO;
59} 101}
102
103int rxvt_composite_vec::expand (unicode_t c, wchar_t *r)
104{
105 compose_char *cc = (*this)[c];
106
107 if (!cc)
108 {
109 if (r) *r = c;
110 return 1;
111 }
112
113 int len = expand (cc->c1, r);
114
115 if (r) r += len;
116
117 if (cc->c2 != NOCHAR)
118 {
119 len++;
120 if (r) *r++ = cc->c2;
121 }
122
123 return len;
124
125}
126#endif
60 127
61void * 128void *
62rxvt_term::operator new (size_t s) 129rxvt_term::operator new (size_t s)
63{ 130{
64 void *p = malloc (s); 131 void *p = malloc (s);
… …
100 destroy_ev (this, &rxvt_term::destroy_cb), 167 destroy_ev (this, &rxvt_term::destroy_cb),
101 pty_ev (this, &rxvt_term::pty_cb), 168 pty_ev (this, &rxvt_term::pty_cb),
102 incr_ev (this, &rxvt_term::incr_cb) 169 incr_ev (this, &rxvt_term::incr_cb)
103{ 170{
104 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 171 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
172
173 termlist.push_back (this);
105} 174}
106 175
107rxvt_term::~rxvt_term () 176rxvt_term::~rxvt_term ()
108{ 177{
178 termlist.erase (find (termlist.begin (), termlist.end(), this));
179
109 if (cmd_fd >= 0) 180 if (cmd_fd >= 0)
110 close (cmd_fd); 181 close (cmd_fd);
111 182
112#ifndef NO_SETOWNER_TTYDEV 183#ifndef NO_SETOWNER_TTYDEV
113 privileged_ttydev (RESTORE); 184 privileged_ttydev (RESTORE);
… …
117#endif 188#endif
118 189
119 delete TermWin.fontset; 190 delete TermWin.fontset;
120 191
121 if (display) 192 if (display)
193 {
194 selection_clear ();
195
196#ifdef MENUBAR
197 if (menubarGC) XFreeGC (display->display, menubarGC);
198#endif
199#ifdef XTERM_SCROLLBAR
200 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
201 if (ShadowGC) XFreeGC (display->display, ShadowGC);
202#endif
203#ifdef PLAIN_SCROLLBAR
204 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC);
205#endif
206#ifdef NEXT_SCROLLBAR
207 if (blackGC) XFreeGC (display->display, blackGC);
208 if (whiteGC) XFreeGC (display->display, whiteGC);
209 if (grayGC) XFreeGC (display->display, grayGC);
210 if (darkGC) XFreeGC (display->display, darkGC);
211 if (stippleGC) XFreeGC (display->display, stippleGC);
212 if (dimple) XFreePixmap (display->display, dimple);
213 if (upArrow) XFreePixmap (display->display, upArrow);
214 if (downArrow) XFreePixmap (display->display, downArrow);
215 if (upArrowHi) XFreePixmap (display->display, upArrowHi);
216 if (downArrowHi) XFreePixmap (display->display, downArrowHi);
217#endif
218#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
219 if (topShadowGC) XFreeGC (display->display, topShadowGC);
220 if (botShadowGC) XFreeGC (display->display, botShadowGC);
221 if (scrollbarGC) XFreeGC (display->display, scrollbarGC);
222#endif
223 if (TermWin.gc) XFreeGC (display->display, TermWin.gc);
224
225#if defined(MENUBAR) && (MENUBAR_MAX > 1)
226 delete menuBar.drawable;
227 //if (menuBar.win)
228 // XDestroyWindow (display->display, menuBar.win);
229#endif
230 delete TermWin.drawable;
231 // destroy all windows
122 if (TermWin.parent[0]) 232 if (TermWin.parent[0])
123 XDestroyWindow (display->display, TermWin.parent[0]); 233 XDestroyWindow (display->display, TermWin.parent[0]);
234 }
124 235
125 // TODO: free pixcolours, colours should become part of rxvt_display 236 // TODO: free pixcolours, colours should become part of rxvt_display
126 237
127 delete PixColors; 238 delete PixColors;
128 239
129 displays.put (display); 240 displays.put (display);
130 241
131 scr_release (); 242 scr_release ();
132 243
244 /* clear all resources */
245 for (int i = 0; i < allocated.size (); i++)
246 free (allocated[i]);
247
248 free (selection.text);
249 // TODO: manage env vars in child only(!)
133 free (env_windowid); 250 free (env_windowid);
134 free (env_display); 251 free (env_display);
135 free (env_term); 252 free (env_term);
136 free (env_colorfgbg); 253 free (env_colorfgbg);
137 free (locale); 254 free (locale);
255#if 0
138 free (codeset); 256 free (codeset);
257#endif
139 258
140 delete envv; 259 delete envv;
141 delete argv; 260 delete argv;
142} 261}
143 262
… …
184 delete this; 303 delete this;
185} 304}
186 305
187/*----------------------------------------------------------------------*/ 306/*----------------------------------------------------------------------*/
188/* rxvt_init () */ 307/* rxvt_init () */
189/* LIBPROTO */
190rxvt_t
191rxvt_init (int argc, const char *const *argv)
192{
193 SET_R (new rxvt_term);
194
195 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
196 {
197 delete GET_R;
198 SET_R (0);
199 }
200
201 return GET_R;
202}
203
204static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
205
206void
207rxvt_init_signals ()
208{
209 /* install exit handler for cleanup */
210#if 0
211#ifdef HAVE_ATEXIT
212 atexit (rxvt_clean_exit);
213#else
214#endif
215#endif
216
217 struct sigaction sa;
218
219 sigfillset (&sa.sa_mask);
220 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
221 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
222 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
223 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
224 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
225 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
226 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
227
228 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
229 /* signal (SIGURG, SIG_DFL); */
230
231 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
232 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
233}
234
235bool 308bool
236rxvt_term::init (int argc, const char *const *argv) 309rxvt_term::init (int argc, const char *const *argv)
237{ 310{
311 SET_R (this);
312
313 if (!init_vars ())
314 return false;
315
238 /* 316 /*
239 * Save and then give up any super-user privileges 317 * Save and then give up any super-user privileges
240 * If we need privileges in any area then we must specifically request it. 318 * If we need privileges in any area then we must specifically request it.
241 * We should only need to be root in these cases: 319 * We should only need to be root in these cases:
242 * 1. write utmp entries on some systems 320 * 1. write utmp entries on some systems
… …
249 327
250 const char **cmd_argv = init_resources (argc, argv); 328 const char **cmd_argv = init_resources (argc, argv);
251 329
252 set_locale (""); 330 set_locale ("");
253 331
254#if (MENUBAR_MAX) 332#if MENUBAR_MAX
255 menubar_read (rs[Rs_menu]); 333 menubar_read (rs[Rs_menu]);
256#endif 334#endif
257#ifdef HAVE_SCROLLBARS 335#ifdef HAVE_SCROLLBARS
258 if (Options & Opt_scrollBar) 336 if (Options & Opt_scrollBar)
259 scrollBar.setIdle (); /* set existence for size calculations */ 337 scrollBar.setIdle (); /* set existence for size calculations */
… …
295 pty_ev.start (cmd_fd, EVENT_READ); 373 pty_ev.start (cmd_fd, EVENT_READ);
296 374
297 check_ev.start (); 375 check_ev.start ();
298 376
299 return true; 377 return true;
378}
379
380static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
381
382void
383rxvt_init_signals ()
384{
385 /* install exit handler for cleanup */
386#if 0
387#ifdef HAVE_ATEXIT
388 atexit (rxvt_clean_exit);
389#else
390#endif
391#endif
392
393 struct sigaction sa;
394
395 sigfillset (&sa.sa_mask);
396 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
397 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
398 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
399 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
400 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
401 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
402 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
403
404 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
405 /* signal (SIGURG, SIG_DFL); */
406
407 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
408 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
300} 409}
301 410
302/* ------------------------------------------------------------------------- * 411/* ------------------------------------------------------------------------- *
303 * SIGNAL HANDLING & EXIT HANDLER * 412 * SIGNAL HANDLING & EXIT HANDLER *
304 * ------------------------------------------------------------------------- */ 413 * ------------------------------------------------------------------------- */
305/* 414/*
306 * Catch a SIGCHLD signal and exit if the direct child has died 415 * Catch a SIGCHLD signal and exit if the direct child has died
307 */ 416 */
417
418void rxvt_term::child_exited (int pid)
419{
420 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
421 if (pid == (*t)->cmd_pid)
422 {
423 (*t)->destroy ();
424 break;
425 }
426}
427
308/* ARGSUSED */ 428/* ARGSUSED */
309/* EXTPROTO */ 429/* EXTPROTO */
310RETSIGTYPE 430RETSIGTYPE
311rxvt_Child_signal (int sig __attribute__ ((unused))) 431rxvt_Child_signal (int sig __attribute__ ((unused)))
312{ 432{
313 int pid, save_errno = errno; 433 int pid, save_errno = errno;
434
314 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 435 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
315 ; 436 rxvt_term::child_exited (pid);
437
316 errno = save_errno; 438 errno = save_errno;
317
318#if 0
319 if (pid == cmd_pid)
320 exit (EXIT_SUCCESS);
321#endif
322} 439}
323 440
324/* 441/*
325 * Catch a fatal signal and tidy up before quitting 442 * Catch a fatal signal and tidy up before quitting
326 */ 443 */
… …
328RETSIGTYPE 445RETSIGTYPE
329rxvt_Exit_signal (int sig) 446rxvt_Exit_signal (int sig)
330{ 447{
331 signal (sig, SIG_DFL); 448 signal (sig, SIG_DFL);
332#ifdef DEBUG_CMD 449#ifdef DEBUG_CMD
333 rxvt_print_error ("signal %d", sig); 450 rxvt_warn ("caught signal %d, exiting.\n", sig);
334#endif 451#endif
335 rxvt_clean_exit (); 452 rxvt_clean_exit ();
336 kill (getpid (), sig); 453 kill (getpid (), sig);
337} 454}
338 455
… …
376 493
377 p = malloc (size); 494 p = malloc (size);
378 if (p) 495 if (p)
379 return p; 496 return p;
380 497
381 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 498 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
382 rxvt_clean_exit (); 499 rxvt_clean_exit ();
383 exit (EXIT_FAILURE); 500 exit (EXIT_FAILURE);
384 /* NOTREACHED */ 501 /* NOTREACHED */
385} 502}
386 503
… …
392 509
393 p = calloc (number, size); 510 p = calloc (number, size);
394 if (p) 511 if (p)
395 return p; 512 return p;
396 513
397 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 514 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
398 rxvt_clean_exit (); 515 rxvt_clean_exit ();
399 exit (EXIT_FAILURE); 516 exit (EXIT_FAILURE);
400 /* NOTREACHED */ 517 /* NOTREACHED */
401} 518}
402 519
… …
411 else 528 else
412 p = malloc (size); 529 p = malloc (size);
413 if (p) 530 if (p)
414 return p; 531 return p;
415 532
416 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 533 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
417 rxvt_clean_exit (); 534 rxvt_clean_exit ();
418 exit (EXIT_FAILURE); 535 exit (EXIT_FAILURE);
419 /* NOTREACHED */ 536 /* NOTREACHED */
420} 537}
421 538
… …
613 else 730 else
614 szHint.win_gravity = SouthWestGravity; 731 szHint.win_gravity = SouthWestGravity;
615 } 732 }
616 } 733 }
617 } 734 }
735
618 /* TODO: BOUNDS */ 736 /* TODO: BOUNDS */
619 TermWin.width = TermWin.ncol * TermWin.fwidth; 737 TermWin.width = TermWin.ncol * TermWin.fwidth;
620 TermWin.height = TermWin.nrow * TermWin.fheight; 738 TermWin.height = TermWin.nrow * TermWin.fheight;
621 max_width = MAX_COLS * TermWin.fwidth; 739 max_width = MAX_COLS * TermWin.fwidth;
622 max_height = MAX_ROWS * TermWin.fheight; 740 max_height = MAX_ROWS * TermWin.fheight;
623 741
624 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 742 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
625 743
626 sb_w = mb_h = 0; 744 sb_w = mb_h = 0;
627 window_vt_x = window_vt_y = 0; 745 window_vt_x = window_vt_y = 0;
746
628 if (scrollbar_visible ()) 747 if (scrollbar_visible ())
629 { 748 {
630 sb_w = scrollbar_TotalWidth (); 749 sb_w = scrollbar_TotalWidth ();
631 szHint.base_width += sb_w; 750 szHint.base_width += sb_w;
632 if (! (Options & Opt_scrollBar_right)) 751 if (! (Options & Opt_scrollBar_right))
633 window_vt_x = sb_w; 752 window_vt_x = sb_w;
634 } 753 }
754
635 if (menubar_visible ()) 755 if (menubar_visible ())
636 { 756 {
637 mb_h = menuBar_TotalHeight (); 757 mb_h = menuBar_TotalHeight ();
638 szHint.base_height += mb_h; 758 szHint.base_height += mb_h;
639 window_vt_y = mb_h; 759 window_vt_y = mb_h;
640 } 760 }
761
641 szHint.width_inc = TermWin.fwidth; 762 szHint.width_inc = TermWin.fwidth;
642 szHint.height_inc = TermWin.fheight; 763 szHint.height_inc = TermWin.fheight;
643 szHint.min_width = szHint.base_width + szHint.width_inc; 764 szHint.min_width = szHint.base_width + szHint.width_inc;
644 szHint.min_height = szHint.base_height + szHint.height_inc; 765 szHint.min_height = szHint.base_height + szHint.height_inc;
645 766
… …
651 else 772 else
652 { 773 {
653 MIN_IT (TermWin.width, max_width); 774 MIN_IT (TermWin.width, max_width);
654 szHint.width = szHint.base_width + TermWin.width; 775 szHint.width = szHint.base_width + TermWin.width;
655 } 776 }
777
656 if (height && height - szHint.base_height < max_height) 778 if (height && height - szHint.base_height < max_height)
657 { 779 {
658 szHint.height = height; 780 szHint.height = height;
659 TermWin.height = height - szHint.base_height; 781 TermWin.height = height - szHint.base_height;
660 } 782 }
661 else 783 else
662 { 784 {
663 MIN_IT (TermWin.height, max_height); 785 MIN_IT (TermWin.height, max_height);
664 szHint.height = szHint.base_height + TermWin.height; 786 szHint.height = szHint.base_height + TermWin.height;
665 } 787 }
788
666 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 789 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
667 window_sb_x = szHint.width - sb_w; 790 window_sb_x = szHint.width - sb_w;
668 791
669 if (recalc_x) 792 if (recalc_x)
670 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 793 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
… …
730 } 853 }
731 else 854 else
732 { 855 {
733 rxvt_fontset *fs = new rxvt_fontset (this); 856 rxvt_fontset *fs = new rxvt_fontset (this);
734 857
735 if (fs && fs->populate (fontname)) 858 if (fs && fs->populate (fontname ? fontname : "fixed"))
736 { 859 {
737 delete TermWin.fontset; 860 delete TermWin.fontset;
738 TermWin.fontset = fs; 861 TermWin.fontset = fs;
739 TermWin.fwidth = fs->base_font ()->width; 862 TermWin.fwidth = fs->base_font ()->width;
740 TermWin.fheight = fs->base_font ()->height; 863 TermWin.fheight = fs->base_font ()->height;
741 TermWin.fbase = fs->base_font ()->ascent; 864 TermWin.fbase = fs->base_font ()->ascent;
742 865
743 // TODO: screen needs to be told about new fonts
744
745 if (TermWin.parent[0]) 866 if (TermWin.parent[0])
746 { 867 {
747 resize_all_windows (0, 0, 0); 868 resize_all_windows (0, 0, 0);
748 scr_remap_chars (); 869 scr_remap_chars ();
749 scr_touch (true); 870 scr_touch (true);
… …
766/*----------------------------------------------------------------------*/ 887/*----------------------------------------------------------------------*/
767/* xterm sequences - title, iconName, color (exptl) */ 888/* xterm sequences - title, iconName, color (exptl) */
768void 889void
769rxvt_term::set_title (const char *str) 890rxvt_term::set_title (const char *str)
770{ 891{
771#ifndef SMART_WINDOW_TITLE 892#ifdef SMART_WINDOW_TITLE
772 XStoreName (display->display, TermWin.parent[0], str); 893 char *name;
773#else
774 char *name;
775 894
776 if (XFetchName (display->display, TermWin.parent[0], &name) == 0) 895 if (!XFetchName (display->display, TermWin.parent[0], &name))
777 name = NULL; 896 name = NULL;
897
778 if (name == NULL || STRCMP (name, str)) 898 if (name == NULL || STRCMP (name, str))
899#endif
779 XStoreName (display->display, TermWin.parent[0], str); 900 XStoreName (display->display, TermWin.parent[0], str);
901
902#ifdef SMART_WINDOW_TITLE
780 if (name) 903 if (name)
781 XFree (name); 904 XFree (name);
782#endif 905#endif
783} 906}
784 907
785void 908void
786rxvt_term::set_iconName (const char *str) 909rxvt_term::set_icon_name (const char *str)
787{ 910{
788#ifndef SMART_WINDOW_TITLE 911#ifdef SMART_WINDOW_TITLE
789 XSetIconName (display->display, TermWin.parent[0], str); 912 char *name;
790#else
791 char *name;
792 913
793 if (XGetIconName (display->display, TermWin.parent[0], &name)) 914 if (!XGetIconName (display->display, TermWin.parent[0], &name))
794 name = NULL; 915 name = NULL;
916
795 if (name == NULL || STRCMP (name, str)) 917 if (name == NULL || STRCMP (name, str))
918#endif
796 XSetIconName (display->display, TermWin.parent[0], str); 919 XSetIconName (display->display, TermWin.parent[0], str);
920
921#ifdef SMART_WINDOW_TITLE
797 if (name) 922 if (name)
798 XFree (name); 923 XFree (name);
799#endif 924#endif
800} 925}
801 926
802#ifdef XTERM_COLOR_CHANGE 927#ifdef XTERM_COLOR_CHANGE
803void 928void
804rxvt_term::set_window_color (int idx, const char *color) 929rxvt_term::set_window_color (int idx, const char *color)
805{ 930{
806 rxvt_color xcol; 931 rxvt_color xcol;
807 int i; 932 int i;
808 933
809 if (color == NULL || *color == '\0') 934 if (color == NULL || *color == '\0')
810 return; 935 return;
811 936
812 /* handle color aliases */ 937 /* handle color aliases */
… …
828 PixColors[idx] = PixColors[minCOLOR + i]; 953 PixColors[idx] = PixColors[minCOLOR + i];
829 SET_PIXCOLOR (idx); 954 SET_PIXCOLOR (idx);
830 goto Done; 955 goto Done;
831 } 956 }
832 } 957 }
958
833 if (!rXParseAllocColor (& xcol, color)) 959 if (!rXParseAllocColor (& xcol, color))
834 return; 960 return;
961
835 /* XStoreColor (display->display, XCMAP, XColor*); */ 962 /* XStoreColor (display->display, XCMAP, XColor*); */
836 963
837 /* 964 /*
838 * FIXME: should free colors here, but no idea how to do it so instead, 965 * FIXME: should free colors here, but no idea how to do it so instead,
839 * so just keep gobbling up the colormap 966 * so just keep gobbling up the colormap
… …
862 989
863 /* handle Color_BD, scrollbar background, etc. */ 990 /* handle Color_BD, scrollbar background, etc. */
864 991
865 set_colorfgbg (); 992 set_colorfgbg ();
866 recolour_cursor (); 993 recolour_cursor ();
867 /* the only reasonable way to enforce a clean update */ 994 scr_touch (true);
868 scr_poweron ();
869} 995}
870 996
871#else 997#else
872# define set_window_color (idx,color) ((void)0) 998# define set_window_color (idx,color) ((void)0)
873#endif /* XTERM_COLOR_CHANGE */ 999#endif /* XTERM_COLOR_CHANGE */
874 1000
875void 1001void
876rxvt_term::recolour_cursor () 1002rxvt_term::recolour_cursor ()
877{ 1003{
878#if TODO
879 rxvt_color xcol[2]; 1004 XColor xcol[2];
880 1005
881 xcol[0] = PixColors[Color_pointer]; 1006 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColors[Color_pointer_fg] : PixColors[Color_fg];
882 xcol[1] = PixColors[Color_bg]; 1007 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColors[Color_pointer_bg] : PixColors[Color_bg];
883 XQueryColors (display->display, XCMAP, xcol, 2); 1008 XQueryColors (display->display, XCMAP, xcol, 2);
884 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1])); 1009 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
885#endif
886} 1010}
887 1011
888/*----------------------------------------------------------------------*/ 1012/*----------------------------------------------------------------------*/
889/* 1013/*
890 * find if fg/bg matches any of the normal (low-intensity) colors 1014 * find if fg/bg matches any of the normal (low-intensity) colors
… …
939int 1063int
940rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1064rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
941{ 1065{
942 if (!screen_in_out->set (display, colour)) 1066 if (!screen_in_out->set (display, colour))
943 { 1067 {
944 rxvt_print_error ("can't allocate colour: %s", colour); 1068 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
945 return false; 1069 return false;
946 } 1070 }
947 1071
948 return true; 1072 return true;
949} 1073}
… …
960 int old_width = szHint.width, old_height = szHint.height; 1084 int old_width = szHint.width, old_height = szHint.height;
961#endif 1085#endif
962 1086
963 window_calc (width, height); 1087 window_calc (width, height);
964 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1088 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
1089
965 if (!ignoreparent) 1090 if (!ignoreparent)
966 { 1091 {
967#ifdef SMART_RESIZE 1092#ifdef SMART_RESIZE
968 /* 1093 /*
969 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 1094 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
… …
1004 dy /= 2; 1129 dy /= 2;
1005 1130
1006 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1131 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
1007 szHint.width, szHint.height); 1132 szHint.width, szHint.height);
1008#else 1133#else
1009 XResizeWindow (display->display, TermWin.parent[0], szHint.width, 1134 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height);
1010 szHint.height);
1011#endif 1135#endif
1012
1013 } 1136 }
1014 1137
1015 fix_screen = (TermWin.ncol != prev_ncol 1138 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
1016 || TermWin.nrow != prev_nrow);
1017 1139
1018 if (fix_screen || width != old_width || height != old_height) 1140 if (fix_screen || width != old_width || height != old_height)
1019 { 1141 {
1020 if (scrollbar_visible ()) 1142 if (scrollbar_visible ())
1021 { 1143 {
1022 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x, 1144 XMoveResizeWindow (display->display, scrollBar.win,
1145 window_sb_x, 0,
1023 0, scrollbar_TotalWidth (), szHint.height); 1146 scrollbar_TotalWidth (), szHint.height);
1024 resize_scrollbar (); 1147 resize_scrollbar ();
1025 } 1148 }
1026 1149
1027 if (menubar_visible ()) 1150 if (menubar_visible ())
1028 XMoveResizeWindow (display->display, menuBar.win, window_vt_x, 1151 XMoveResizeWindow (display->display, menuBar.win,
1152 window_vt_x, 0,
1029 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1153 TermWin_TotalWidth (), menuBar_TotalHeight ());
1030 1154
1031 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1155 XMoveResizeWindow (display->display, TermWin.vt,
1032 window_vt_y, TermWin_TotalWidth (), 1156 window_vt_x, window_vt_y,
1033 TermWin_TotalHeight ()); 1157 TermWin_TotalWidth (), TermWin_TotalHeight ());
1034 scr_clear (); 1158 scr_clear ();
1035#ifdef XPM_BACKGROUND 1159#ifdef XPM_BACKGROUND
1036 resize_pixmap (); 1160 resize_pixmap ();
1037#endif 1161#endif
1038
1039 } 1162 }
1040 1163
1041 if (fix_screen || old_height == 0) 1164 if (fix_screen || old_height == 0)
1042 { 1165 {
1043 int curr_screen = -1; 1166 int curr_screen = -1;
… …
1316 if (preedit_attr) XFree (preedit_attr); 1439 if (preedit_attr) XFree (preedit_attr);
1317 if (status_attr) XFree (status_attr); 1440 if (status_attr) XFree (status_attr);
1318 1441
1319 if (Input_Context == NULL) 1442 if (Input_Context == NULL)
1320 { 1443 {
1321 rxvt_print_error ("failed to create input context"); 1444 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1322 display->put_xim (input_method); 1445 display->put_xim (input_method);
1323 return false; 1446 return false;
1324 } 1447 }
1325 1448
1326 if (input_style & XIMPreeditArea) 1449 if (input_style & XIMPreeditArea)

Diff Legend

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