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.46 by pcg, Tue Feb 24 22:28:42 2004 UTC vs.
Revision 1.76 by root, Wed Aug 4 03:29:28 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);
… …
88 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
89#endif 156#endif
90#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
91 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
92#endif 159#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162#endif
163#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168#endif
93#ifdef POINTER_BLANK 169#ifdef POINTER_BLANK
94 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
95#endif 171#endif
96#ifdef USE_XIM 172#ifdef USE_XIM
97 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
98#endif 174#endif
99 check_ev (this, &rxvt_term::check_cb), 175 check_ev (this, &rxvt_term::check_cb),
176 flush_ev (this, &rxvt_term::flush_cb),
100 destroy_ev (this, &rxvt_term::destroy_cb), 177 destroy_ev (this, &rxvt_term::destroy_cb),
101 pty_ev (this, &rxvt_term::pty_cb), 178 pty_ev (this, &rxvt_term::pty_cb),
102 incr_ev (this, &rxvt_term::incr_cb) 179 incr_ev (this, &rxvt_term::incr_cb)
103{ 180{
104 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 181 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
182
183 termlist.push_back (this);
105} 184}
106 185
107rxvt_term::~rxvt_term () 186rxvt_term::~rxvt_term ()
108{ 187{
188 termlist.erase (find (termlist.begin (), termlist.end(), this));
189
109 if (cmd_fd >= 0) 190 if (cmd_fd >= 0)
110 close (cmd_fd); 191 close (cmd_fd);
111 192
112#ifndef NO_SETOWNER_TTYDEV 193#ifndef NO_SETOWNER_TTYDEV
113 privileged_ttydev (RESTORE); 194 privileged_ttydev (RESTORE);
… …
118 199
119 delete TermWin.fontset; 200 delete TermWin.fontset;
120 201
121 if (display) 202 if (display)
122 { 203 {
204 selection_clear ();
205
206#ifdef MENUBAR
207 if (menubarGC) XFreeGC (display->display, menubarGC);
208#endif
209#ifdef XTERM_SCROLLBAR
210 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
211 if (ShadowGC) XFreeGC (display->display, ShadowGC);
212#endif
213#ifdef PLAIN_SCROLLBAR
214 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC);
215#endif
216#ifdef NEXT_SCROLLBAR
217 if (blackGC) XFreeGC (display->display, blackGC);
218 if (whiteGC) XFreeGC (display->display, whiteGC);
219 if (grayGC) XFreeGC (display->display, grayGC);
220 if (darkGC) XFreeGC (display->display, darkGC);
221 if (stippleGC) XFreeGC (display->display, stippleGC);
222 if (dimple) XFreePixmap (display->display, dimple);
223 if (upArrow) XFreePixmap (display->display, upArrow);
224 if (downArrow) XFreePixmap (display->display, downArrow);
225 if (upArrowHi) XFreePixmap (display->display, upArrowHi);
226 if (downArrowHi) XFreePixmap (display->display, downArrowHi);
227#endif
228#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
229 if (topShadowGC) XFreeGC (display->display, topShadowGC);
230 if (botShadowGC) XFreeGC (display->display, botShadowGC);
231 if (scrollbarGC) XFreeGC (display->display, scrollbarGC);
232#endif
233 if (TermWin.gc) XFreeGC (display->display, TermWin.gc);
234
123#if defined(MENUBAR) && (MENUBAR_MAX > 1) 235#if defined(MENUBAR) && (MENUBAR_MAX > 1)
124 delete menuBar.drawable; 236 delete menuBar.drawable;
125 //if (menuBar.win) 237 //if (menuBar.win)
126 // XDestroyWindow (display->display, menuBar.win); 238 // XDestroyWindow (display->display, menuBar.win);
127#endif 239#endif
… …
131 XDestroyWindow (display->display, TermWin.parent[0]); 243 XDestroyWindow (display->display, TermWin.parent[0]);
132 } 244 }
133 245
134 // TODO: free pixcolours, colours should become part of rxvt_display 246 // TODO: free pixcolours, colours should become part of rxvt_display
135 247
136 delete PixColors; 248 delete PixColorsFocused;
249#ifdef OFF_FOCUS_FADING
250 delete PixColorsUnFocused;
251#endif
137 252
138 displays.put (display); 253 displays.put (display);
139 254
140 scr_release (); 255 scr_release ();
141 256
257 /* clear all resources */
258 for (int i = 0; i < allocated.size (); i++)
259 free (allocated[i]);
260
261 free (selection.text);
262 // TODO: manage env vars in child only(!)
142 free (env_windowid); 263 free (env_windowid);
143 free (env_display); 264 free (env_display);
144 free (env_term); 265 free (env_term);
145 free (env_colorfgbg); 266 free (env_colorfgbg);
146 free (locale); 267 free (locale);
268#if 0
147 free (codeset); 269 free (codeset);
270#endif
148 271
149 delete envv; 272 delete envv;
150 delete argv; 273 delete argv;
151} 274}
152 275
… …
176 cursor_blink_ev.stop (); 299 cursor_blink_ev.stop ();
177#endif 300#endif
178#ifdef TEXT_BLINK 301#ifdef TEXT_BLINK
179 text_blink_ev.stop (); 302 text_blink_ev.stop ();
180#endif 303#endif
304#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
305 cont_scroll_ev.stop ();
306#endif
307#ifdef SELECTION_SCROLLING
308 sel_scroll_ev.stop ();
309#endif
181#ifdef POINTER_BLANK 310#ifdef POINTER_BLANK
182 pointer_ev.stop (); 311 pointer_ev.stop ();
183#endif 312#endif
184 313
185 destroy_ev.start (0); 314 destroy_ev.start (0);
… …
193 delete this; 322 delete this;
194} 323}
195 324
196/*----------------------------------------------------------------------*/ 325/*----------------------------------------------------------------------*/
197/* rxvt_init () */ 326/* rxvt_init () */
198/* LIBPROTO */
199rxvt_t
200rxvt_init (int argc, const char *const *argv)
201{
202 SET_R (new rxvt_term);
203
204 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
205 {
206 delete GET_R;
207 SET_R (0);
208 }
209
210 return GET_R;
211}
212
213static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
214
215void
216rxvt_init_signals ()
217{
218 /* install exit handler for cleanup */
219#if 0
220#ifdef HAVE_ATEXIT
221 atexit (rxvt_clean_exit);
222#else
223#endif
224#endif
225
226 struct sigaction sa;
227
228 sigfillset (&sa.sa_mask);
229 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
230 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
231 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
232 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
233 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
234 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
235 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
236
237 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
238 /* signal (SIGURG, SIG_DFL); */
239
240 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
241 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
242}
243
244bool 327bool
245rxvt_term::init (int argc, const char *const *argv) 328rxvt_term::init (int argc, const char *const *argv)
246{ 329{
330 SET_R (this);
331
332 if (!init_vars ())
333 return false;
334
247 /* 335 /*
248 * Save and then give up any super-user privileges 336 * Save and then give up any super-user privileges
249 * If we need privileges in any area then we must specifically request it. 337 * If we need privileges in any area then we must specifically request it.
250 * We should only need to be root in these cases: 338 * We should only need to be root in these cases:
251 * 1. write utmp entries on some systems 339 * 1. write utmp entries on some systems
… …
306 check_ev.start (); 394 check_ev.start ();
307 395
308 return true; 396 return true;
309} 397}
310 398
399static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
400
401void
402rxvt_init_signals ()
403{
404 /* install exit handler for cleanup */
405#if 0
406#ifdef HAVE_ATEXIT
407 atexit (rxvt_clean_exit);
408#else
409#endif
410#endif
411
412 struct sigaction sa;
413
414 sigfillset (&sa.sa_mask);
415 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
416 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
417 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
418 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
419 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
420 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
421 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
422
423 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
424 /* signal (SIGURG, SIG_DFL); */
425
426 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
427 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
428}
429
311/* ------------------------------------------------------------------------- * 430/* ------------------------------------------------------------------------- *
312 * SIGNAL HANDLING & EXIT HANDLER * 431 * SIGNAL HANDLING & EXIT HANDLER *
313 * ------------------------------------------------------------------------- */ 432 * ------------------------------------------------------------------------- */
314/* 433/*
315 * Catch a SIGCHLD signal and exit if the direct child has died 434 * Catch a SIGCHLD signal and exit if the direct child has died
316 */ 435 */
436
437void rxvt_term::child_exited (int pid)
438{
439 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
440 if (pid == (*t)->cmd_pid)
441 {
442 (*t)->destroy ();
443 break;
444 }
445}
446
317/* ARGSUSED */ 447/* ARGSUSED */
318/* EXTPROTO */ 448/* EXTPROTO */
319RETSIGTYPE 449RETSIGTYPE
320rxvt_Child_signal (int sig __attribute__ ((unused))) 450rxvt_Child_signal (int sig __attribute__ ((unused)))
321{ 451{
322 int pid, save_errno = errno; 452 int pid, save_errno = errno;
453
323 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 454 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
324 ; 455 rxvt_term::child_exited (pid);
456
325 errno = save_errno; 457 errno = save_errno;
326
327#if 0
328 if (pid == cmd_pid)
329 exit (EXIT_SUCCESS);
330#endif
331} 458}
332 459
333/* 460/*
334 * Catch a fatal signal and tidy up before quitting 461 * Catch a fatal signal and tidy up before quitting
335 */ 462 */
… …
337RETSIGTYPE 464RETSIGTYPE
338rxvt_Exit_signal (int sig) 465rxvt_Exit_signal (int sig)
339{ 466{
340 signal (sig, SIG_DFL); 467 signal (sig, SIG_DFL);
341#ifdef DEBUG_CMD 468#ifdef DEBUG_CMD
342 rxvt_print_error ("signal %d", sig); 469 rxvt_warn ("caught signal %d, exiting.\n", sig);
343#endif 470#endif
344 rxvt_clean_exit (); 471 rxvt_clean_exit ();
345 kill (getpid (), sig); 472 kill (getpid (), sig);
346} 473}
347 474
… …
385 512
386 p = malloc (size); 513 p = malloc (size);
387 if (p) 514 if (p)
388 return p; 515 return p;
389 516
390 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 517 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
391 rxvt_clean_exit (); 518 rxvt_clean_exit ();
392 exit (EXIT_FAILURE); 519 exit (EXIT_FAILURE);
393 /* NOTREACHED */ 520 /* NOTREACHED */
394} 521}
395 522
… …
401 528
402 p = calloc (number, size); 529 p = calloc (number, size);
403 if (p) 530 if (p)
404 return p; 531 return p;
405 532
406 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 533 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
407 rxvt_clean_exit (); 534 rxvt_clean_exit ();
408 exit (EXIT_FAILURE); 535 exit (EXIT_FAILURE);
409 /* NOTREACHED */ 536 /* NOTREACHED */
410} 537}
411 538
… …
420 else 547 else
421 p = malloc (size); 548 p = malloc (size);
422 if (p) 549 if (p)
423 return p; 550 return p;
424 551
425 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 552 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
426 rxvt_clean_exit (); 553 rxvt_clean_exit ();
427 exit (EXIT_FAILURE); 554 exit (EXIT_FAILURE);
428 /* NOTREACHED */ 555 /* NOTREACHED */
429} 556}
430 557
… …
622 else 749 else
623 szHint.win_gravity = SouthWestGravity; 750 szHint.win_gravity = SouthWestGravity;
624 } 751 }
625 } 752 }
626 } 753 }
754
627 /* TODO: BOUNDS */ 755 /* TODO: BOUNDS */
628 TermWin.width = TermWin.ncol * TermWin.fwidth; 756 TermWin.width = TermWin.ncol * TermWin.fwidth;
629 TermWin.height = TermWin.nrow * TermWin.fheight; 757 TermWin.height = TermWin.nrow * TermWin.fheight;
630 max_width = MAX_COLS * TermWin.fwidth; 758 max_width = MAX_COLS * TermWin.fwidth;
631 max_height = MAX_ROWS * TermWin.fheight; 759 max_height = MAX_ROWS * TermWin.fheight;
632 760
633 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 761 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
634 762
635 sb_w = mb_h = 0; 763 sb_w = mb_h = 0;
636 window_vt_x = window_vt_y = 0; 764 window_vt_x = window_vt_y = TermWin.int_bwidth;
765
637 if (scrollbar_visible ()) 766 if (scrollbar_visible ())
638 { 767 {
639 sb_w = scrollbar_TotalWidth (); 768 sb_w = scrollbar_TotalWidth ();
640 szHint.base_width += sb_w; 769 szHint.base_width += sb_w;
641 if (! (Options & Opt_scrollBar_right)) 770 if (!(Options & Opt_scrollBar_right))
642 window_vt_x = sb_w; 771 window_vt_x += sb_w;
643 } 772 }
773
644 if (menubar_visible ()) 774 if (menubar_visible ())
645 { 775 {
646 mb_h = menuBar_TotalHeight (); 776 mb_h = menuBar_TotalHeight ();
647 szHint.base_height += mb_h; 777 szHint.base_height += mb_h;
648 window_vt_y = mb_h; 778 window_vt_y += mb_h;
649 } 779 }
780
650 szHint.width_inc = TermWin.fwidth; 781 szHint.width_inc = TermWin.fwidth;
651 szHint.height_inc = TermWin.fheight; 782 szHint.height_inc = TermWin.fheight;
652 szHint.min_width = szHint.base_width + szHint.width_inc; 783 szHint.min_width = szHint.base_width + szHint.width_inc;
653 szHint.min_height = szHint.base_height + szHint.height_inc; 784 szHint.min_height = szHint.base_height + szHint.height_inc;
654 785
… …
660 else 791 else
661 { 792 {
662 MIN_IT (TermWin.width, max_width); 793 MIN_IT (TermWin.width, max_width);
663 szHint.width = szHint.base_width + TermWin.width; 794 szHint.width = szHint.base_width + TermWin.width;
664 } 795 }
796
665 if (height && height - szHint.base_height < max_height) 797 if (height && height - szHint.base_height < max_height)
666 { 798 {
667 szHint.height = height; 799 szHint.height = height;
668 TermWin.height = height - szHint.base_height; 800 TermWin.height = height - szHint.base_height;
669 } 801 }
670 else 802 else
671 { 803 {
672 MIN_IT (TermWin.height, max_height); 804 MIN_IT (TermWin.height, max_height);
673 szHint.height = szHint.base_height + TermWin.height; 805 szHint.height = szHint.base_height + TermWin.height;
674 } 806 }
807
675 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 808 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
676 window_sb_x = szHint.width - sb_w; 809 window_sb_x = szHint.width - sb_w;
677 810
678 if (recalc_x) 811 if (recalc_x)
679 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 812 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
… …
754 resize_all_windows (0, 0, 0); 887 resize_all_windows (0, 0, 0);
755 scr_remap_chars (); 888 scr_remap_chars ();
756 scr_touch (true); 889 scr_touch (true);
757 } 890 }
758 891
892 for (unicode_t ch = 0x20; ch <= 0x7f; ch++)
893 TermWin.ascii_map [ch - 0x20] = fs->find_font (ch);
894
759 return true; 895 return true;
760 } 896 }
761 } 897 }
762 898
763 return false; 899 return false;
… …
773/*----------------------------------------------------------------------*/ 909/*----------------------------------------------------------------------*/
774/* xterm sequences - title, iconName, color (exptl) */ 910/* xterm sequences - title, iconName, color (exptl) */
775void 911void
776rxvt_term::set_title (const char *str) 912rxvt_term::set_title (const char *str)
777{ 913{
778#ifndef SMART_WINDOW_TITLE 914#ifdef SMART_WINDOW_TITLE
779 XStoreName (display->display, TermWin.parent[0], str);
780#else
781 char *name; 915 char *name;
782 916
783 if (XFetchName (display->display, TermWin.parent[0], &name) == 0) 917 if (!XFetchName (display->display, TermWin.parent[0], &name))
784 name = NULL; 918 name = NULL;
919
785 if (name == NULL || STRCMP (name, str)) 920 if (name == NULL || STRCMP (name, str))
921#endif
786 XStoreName (display->display, TermWin.parent[0], str); 922 XStoreName (display->display, TermWin.parent[0], str);
923
924#ifdef SMART_WINDOW_TITLE
787 if (name) 925 if (name)
788 XFree (name); 926 XFree (name);
789#endif 927#endif
790} 928}
791 929
792void 930void
793rxvt_term::set_iconName (const char *str) 931rxvt_term::set_icon_name (const char *str)
794{ 932{
795#ifndef SMART_WINDOW_TITLE 933#ifdef SMART_WINDOW_TITLE
796 XSetIconName (display->display, TermWin.parent[0], str);
797#else
798 char *name; 934 char *name;
799 935
800 if (XGetIconName (display->display, TermWin.parent[0], &name)) 936 if (!XGetIconName (display->display, TermWin.parent[0], &name))
801 name = NULL; 937 name = NULL;
938
802 if (name == NULL || STRCMP (name, str)) 939 if (name == NULL || STRCMP (name, str))
940#endif
803 XSetIconName (display->display, TermWin.parent[0], str); 941 XSetIconName (display->display, TermWin.parent[0], str);
942
943#ifdef SMART_WINDOW_TITLE
804 if (name) 944 if (name)
805 XFree (name); 945 XFree (name);
806#endif 946#endif
807} 947}
808 948
… …
822 i = atoi (color); 962 i = atoi (color);
823 if (i >= 8 && i <= 15) 963 if (i >= 8 && i <= 15)
824 { /* bright colors */ 964 { /* bright colors */
825 i -= 8; 965 i -= 8;
826# ifndef NO_BRIGHTCOLOR 966# ifndef NO_BRIGHTCOLOR
827 PixColors[idx] = PixColors[minBrightCOLOR + i]; 967 PixColorsFocused[idx] = PixColorsFocused[minBrightCOLOR + i];
828 SET_PIXCOLOR (idx); 968 SET_PIXCOLOR (idx);
829 goto Done; 969 goto Done;
830# endif 970# endif
831 971
832 } 972 }
833 if (i >= 0 && i <= 7) 973 if (i >= 0 && i <= 7)
834 { /* normal colors */ 974 { /* normal colors */
835 PixColors[idx] = PixColors[minCOLOR + i]; 975 PixColorsFocused[idx] = PixColorsFocused[minCOLOR + i];
836 SET_PIXCOLOR (idx); 976 SET_PIXCOLOR (idx);
837 goto Done; 977 goto Done;
838 } 978 }
839 } 979 }
980
840 if (!rXParseAllocColor (& xcol, color)) 981 if (!rXParseAllocColor (& xcol, color))
841 return; 982 return;
983
842 /* XStoreColor (display->display, XCMAP, XColor*); */ 984 /* XStoreColor (display->display, display->cmap, XColor*); */
843 985
844 /* 986 /*
845 * FIXME: should free colors here, but no idea how to do it so instead, 987 * FIXME: should free colors here, but no idea how to do it so instead,
846 * so just keep gobbling up the colormap 988 * so just keep gobbling up the colormap
847 */ 989 */
… …
850 if (PixColors[idx] == PixColors[i]) 992 if (PixColors[idx] == PixColors[i])
851 break; 993 break;
852 if (i > Color_White) 994 if (i > Color_White)
853 { 995 {
854 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 996 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
855 XFreeColors (display->display, XCMAP, (PixColors + idx), 1, 997 XFreeColors (display->display, display->cmap, (PixColors + idx), 1,
856 DisplayPlanes (display->display, display->screen)); 998 DisplayPlanes (display->display, display->screen));
857 } 999 }
858# endif 1000# endif
859 1001
860 PixColors[idx] = xcol; 1002 PixColorsFocused[idx] = xcol;
861 SET_PIXCOLOR (idx); 1003 SET_PIXCOLOR (idx);
862 1004
863 /* XSetWindowAttributes attr; */ 1005 /* XSetWindowAttributes attr; */
864 /* Cursor cursor; */ 1006 /* Cursor cursor; */
865Done: 1007Done:
1008#ifdef OFF_FOCUS_FADING
1009 PixColorsUnFocused[idx] = PixColorsFocused[idx].fade (display, atoi (rs[Rs_fade]));
1010#endif
866 if (idx == Color_bg && ! (Options & Opt_transparent)) 1011 if (idx == Color_bg && ! (Options & Opt_transparent))
867 XSetWindowBackground (display->display, TermWin.vt, 1012 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
868 PixColors[Color_bg]);
869 1013
870 /* handle Color_BD, scrollbar background, etc. */ 1014 /* handle Color_BD, scrollbar background, etc. */
871 1015
872 set_colorfgbg (); 1016 set_colorfgbg ();
873 recolour_cursor (); 1017 recolour_cursor ();
874 /* the only reasonable way to enforce a clean update */ 1018 scr_touch (true);
875 scr_poweron ();
876} 1019}
877 1020
878#else 1021#else
879# define set_window_color (idx,color) ((void)0) 1022# define set_window_color (idx,color) ((void)0)
880#endif /* XTERM_COLOR_CHANGE */ 1023#endif /* XTERM_COLOR_CHANGE */
881 1024
882void 1025void
883rxvt_term::recolour_cursor () 1026rxvt_term::recolour_cursor ()
884{ 1027{
885#if TODO
886 rxvt_color xcol[2]; 1028 XColor xcol[2];
887 1029
888 xcol[0] = PixColors[Color_pointer]; 1030 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColorsFocused[Color_pointer_fg] : PixColorsFocused[Color_fg];
889 xcol[1] = PixColors[Color_bg]; 1031 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColorsFocused[Color_pointer_bg] : PixColorsFocused[Color_bg];
890 XQueryColors (display->display, XCMAP, xcol, 2); 1032 XQueryColors (display->display, display->cmap, xcol, 2);
891 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1])); 1033 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
892#endif
893} 1034}
894 1035
895/*----------------------------------------------------------------------*/ 1036/*----------------------------------------------------------------------*/
896/* 1037/*
897 * find if fg/bg matches any of the normal (low-intensity) colors 1038 * find if fg/bg matches any of the normal (low-intensity) colors
… …
946int 1087int
947rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1088rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
948{ 1089{
949 if (!screen_in_out->set (display, colour)) 1090 if (!screen_in_out->set (display, colour))
950 { 1091 {
951 rxvt_print_error ("can't allocate colour: %s", colour); 1092 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
952 return false; 1093 return false;
953 } 1094 }
954 1095
955 return true; 1096 return true;
956} 1097}
… …
967 int old_width = szHint.width, old_height = szHint.height; 1108 int old_width = szHint.width, old_height = szHint.height;
968#endif 1109#endif
969 1110
970 window_calc (width, height); 1111 window_calc (width, height);
971 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1112 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
1113
972 if (!ignoreparent) 1114 if (!ignoreparent)
973 { 1115 {
974#ifdef SMART_RESIZE 1116#ifdef SMART_RESIZE
975 /* 1117 /*
976 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 1118 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
… …
1011 dy /= 2; 1153 dy /= 2;
1012 1154
1013 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1155 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
1014 szHint.width, szHint.height); 1156 szHint.width, szHint.height);
1015#else 1157#else
1016 XResizeWindow (display->display, TermWin.parent[0], szHint.width, 1158 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height);
1017 szHint.height);
1018#endif 1159#endif
1019
1020 } 1160 }
1021 1161
1022 fix_screen = (TermWin.ncol != prev_ncol 1162 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
1023 || TermWin.nrow != prev_nrow);
1024 1163
1025 if (fix_screen || width != old_width || height != old_height) 1164 if (fix_screen || width != old_width || height != old_height)
1026 { 1165 {
1027 if (scrollbar_visible ()) 1166 if (scrollbar_visible ())
1028 { 1167 {
1029 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x, 1168 XMoveResizeWindow (display->display, scrollBar.win,
1169 window_sb_x, 0,
1030 0, scrollbar_TotalWidth (), szHint.height); 1170 scrollbar_TotalWidth (), szHint.height);
1031 resize_scrollbar (); 1171 resize_scrollbar ();
1032 } 1172 }
1033 1173
1034 if (menubar_visible ()) 1174 if (menubar_visible ())
1035 XMoveResizeWindow (display->display, menuBar.win, window_vt_x, 1175 XMoveResizeWindow (display->display, menuBar.win,
1176 window_vt_x, 0,
1036 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1177 TermWin_TotalWidth (), menuBar_TotalHeight ());
1037 1178
1038 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1179 XMoveResizeWindow (display->display, TermWin.vt,
1039 window_vt_y, TermWin_TotalWidth (), 1180 window_vt_x, window_vt_y,
1040 TermWin_TotalHeight ()); 1181 TermWin_TotalWidth (), TermWin_TotalHeight ());
1041 scr_clear (); 1182 scr_clear ();
1042#ifdef XPM_BACKGROUND 1183#ifdef XPM_BACKGROUND
1043 resize_pixmap (); 1184 resize_pixmap ();
1044#endif 1185#endif
1045
1046 } 1186 }
1047 1187
1048 if (fix_screen || old_height == 0) 1188 if (fix_screen || old_height == 0)
1049 { 1189 {
1050 int curr_screen = -1; 1190 int curr_screen = -1;
… …
1323 if (preedit_attr) XFree (preedit_attr); 1463 if (preedit_attr) XFree (preedit_attr);
1324 if (status_attr) XFree (status_attr); 1464 if (status_attr) XFree (status_attr);
1325 1465
1326 if (Input_Context == NULL) 1466 if (Input_Context == NULL)
1327 { 1467 {
1328 rxvt_print_error ("failed to create input context"); 1468 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1329 display->put_xim (input_method); 1469 display->put_xim (input_method);
1330 return false; 1470 return false;
1331 } 1471 }
1332 1472
1333 if (input_style & XIMPreeditArea) 1473 if (input_style & XIMPreeditArea)

Diff Legend

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