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.54 by pcg, Mon Mar 15 00:08:11 2004 UTC vs.
Revision 1.80 by root, Fri Aug 13 19:31:23 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);
58 } 61 return true;
59} 62}
60 63
61#if ENABLE_COMBINING 64#if ENABLE_COMBINING
62class rxvt_composite_vec rxvt_composite; 65class rxvt_composite_vec rxvt_composite;
63 66
… …
137 free (p); 140 free (p);
138} 141}
139 142
140rxvt_term::rxvt_term () 143rxvt_term::rxvt_term ()
141 : 144 :
145#if TRANSPARENT
142 rootwin_ev (this, &rxvt_term::rootwin_cb), 146 rootwin_ev (this, &rxvt_term::rootwin_cb),
147#endif
148#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif
154#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif
157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb),
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
169#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
143 termwin_ev (this, &rxvt_term::x_cb), 175 termwin_ev (this, &rxvt_term::x_cb),
144 vt_ev (this, &rxvt_term::x_cb), 176 vt_ev (this, &rxvt_term::x_cb),
145#ifdef HAVE_SCROLLBARS
146 scrollbar_ev (this, &rxvt_term::x_cb),
147#endif
148#ifdef MENUBAR
149 menubar_ev (this, &rxvt_term::x_cb),
150#endif
151#ifdef CURSOR_BLINK
152 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
153#endif
154#ifdef TEXT_BLINK
155 text_blink_ev (this, &rxvt_term::text_blink_cb),
156#endif
157#ifdef POINTER_BLANK
158 pointer_ev (this, &rxvt_term::pointer_cb),
159#endif
160#ifdef USE_XIM
161 im_ev (this, &rxvt_term::im_cb),
162#endif
163 check_ev (this, &rxvt_term::check_cb), 177 check_ev (this, &rxvt_term::check_cb),
178 flush_ev (this, &rxvt_term::flush_cb),
164 destroy_ev (this, &rxvt_term::destroy_cb), 179 destroy_ev (this, &rxvt_term::destroy_cb),
165 pty_ev (this, &rxvt_term::pty_cb), 180 pty_ev (this, &rxvt_term::pty_cb),
166 incr_ev (this, &rxvt_term::incr_cb) 181 incr_ev (this, &rxvt_term::incr_cb)
167{ 182{
168 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 183 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
184
185 termlist.push_back (this);
169} 186}
170 187
171rxvt_term::~rxvt_term () 188rxvt_term::~rxvt_term ()
172{ 189{
190 termlist.erase (find (termlist.begin (), termlist.end(), this));
191
173 if (cmd_fd >= 0) 192 if (cmd_fd >= 0)
174 close (cmd_fd); 193 close (cmd_fd);
175 194
176#ifndef NO_SETOWNER_TTYDEV 195#ifndef NO_SETOWNER_TTYDEV
177 privileged_ttydev (RESTORE); 196 privileged_ttydev (RESTORE);
… …
182 201
183 delete TermWin.fontset; 202 delete TermWin.fontset;
184 203
185 if (display) 204 if (display)
186 { 205 {
206 selection_clear ();
207
208#ifdef USE_XIM
209 im_destroy ();
210#endif
211#ifdef MENUBAR
212 if (menubarGC) XFreeGC (display->display, menubarGC);
213#endif
214#ifdef XTERM_SCROLLBAR
215 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
216 if (ShadowGC) XFreeGC (display->display, ShadowGC);
217#endif
218#ifdef PLAIN_SCROLLBAR
219 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC);
220#endif
221#ifdef NEXT_SCROLLBAR
222 if (blackGC) XFreeGC (display->display, blackGC);
223 if (whiteGC) XFreeGC (display->display, whiteGC);
224 if (grayGC) XFreeGC (display->display, grayGC);
225 if (darkGC) XFreeGC (display->display, darkGC);
226 if (stippleGC) XFreeGC (display->display, stippleGC);
227 if (dimple) XFreePixmap (display->display, dimple);
228 if (upArrow) XFreePixmap (display->display, upArrow);
229 if (downArrow) XFreePixmap (display->display, downArrow);
230 if (upArrowHi) XFreePixmap (display->display, upArrowHi);
231 if (downArrowHi) XFreePixmap (display->display, downArrowHi);
232#endif
233#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
234 if (topShadowGC) XFreeGC (display->display, topShadowGC);
235 if (botShadowGC) XFreeGC (display->display, botShadowGC);
236 if (scrollbarGC) XFreeGC (display->display, scrollbarGC);
237#endif
238 if (TermWin.gc) XFreeGC (display->display, TermWin.gc);
239
187#if defined(MENUBAR) && (MENUBAR_MAX > 1) 240#if defined(MENUBAR) && (MENUBAR_MAX > 1)
188 delete menuBar.drawable; 241 delete menuBar.drawable;
189 //if (menuBar.win) 242 //if (menuBar.win)
190 // XDestroyWindow (display->display, menuBar.win); 243 // XDestroyWindow (display->display, menuBar.win);
191#endif 244#endif
… …
195 XDestroyWindow (display->display, TermWin.parent[0]); 248 XDestroyWindow (display->display, TermWin.parent[0]);
196 } 249 }
197 250
198 // TODO: free pixcolours, colours should become part of rxvt_display 251 // TODO: free pixcolours, colours should become part of rxvt_display
199 252
200 delete PixColors; 253 delete PixColorsFocused;
254#ifdef OFF_FOCUS_FADING
255 delete PixColorsUnFocused;
256#endif
201 257
202 displays.put (display); 258 displays.put (display);
203 259
204 scr_release (); 260 scr_release ();
205 261
262 /* clear all resources */
263 for (int i = 0; i < allocated.size (); i++)
264 free (allocated[i]);
265
266 free (selection.text);
267 // TODO: manage env vars in child only(!)
206 free (env_windowid); 268 free (env_windowid);
207 free (env_display); 269 free (env_display);
208 free (env_term); 270 free (env_term);
209 free (env_colorfgbg); 271 free (env_colorfgbg);
210 free (locale); 272 free (locale);
273#if 0
211 free (codeset); 274 free (codeset);
275#endif
212 276
213 delete envv; 277 delete envv;
214 delete argv; 278 delete argv;
215} 279}
216 280
217void 281void
218rxvt_term::destroy () 282rxvt_term::destroy ()
219{ 283{
284 if (destroy_ev.active)
285 return;
286
220 if (display) 287 if (display)
221 { 288 {
289#if USE_XIM
290 im_ev.stop (display);
291#endif
292#if HAVE_SCROLLBARS
293 scrollbar_ev.stop (display);
294#endif
295#if MENUBAR
296 menubar_ev.stop (display);
297#endif
298#if TRANSPARENT
222 rootwin_ev.stop (display); 299 rootwin_ev.stop (display);
300#endif
301 incr_ev.stop ();
223 termwin_ev.stop (display); 302 termwin_ev.stop (display);
224 vt_ev.stop (display); 303 vt_ev.stop (display);
225#ifdef USE_XIM
226 im_destroy ();
227 im_ev.stop (display);
228#endif
229#ifdef HAVE_SCROLLBARS
230 scrollbar_ev.stop (display);
231#endif
232#ifdef MENUBAR
233 menubar_ev.stop (display);
234#endif
235 } 304 }
236 305
237 check_ev.stop (); 306 check_ev.stop ();
238 pty_ev.stop (); 307 pty_ev.stop ();
239#ifdef CURSOR_BLINK 308#ifdef CURSOR_BLINK
240 cursor_blink_ev.stop (); 309 cursor_blink_ev.stop ();
241#endif 310#endif
242#ifdef TEXT_BLINK 311#ifdef TEXT_BLINK
243 text_blink_ev.stop (); 312 text_blink_ev.stop ();
244#endif 313#endif
314#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
315 cont_scroll_ev.stop ();
316#endif
317#ifdef SELECTION_SCROLLING
318 sel_scroll_ev.stop ();
319#endif
245#ifdef POINTER_BLANK 320#ifdef POINTER_BLANK
246 pointer_ev.stop (); 321 pointer_ev.stop ();
247#endif 322#endif
248 323
249 destroy_ev.start (0); 324 destroy_ev.start (0);
… …
257 delete this; 332 delete this;
258} 333}
259 334
260/*----------------------------------------------------------------------*/ 335/*----------------------------------------------------------------------*/
261/* rxvt_init () */ 336/* rxvt_init () */
262/* LIBPROTO */
263rxvt_t
264rxvt_init (int argc, const char *const *argv)
265{
266 SET_R (new rxvt_term);
267
268 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
269 {
270 delete GET_R;
271 SET_R (0);
272 }
273
274 return GET_R;
275}
276
277static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
278
279void
280rxvt_init_signals ()
281{
282 /* install exit handler for cleanup */
283#if 0
284#ifdef HAVE_ATEXIT
285 atexit (rxvt_clean_exit);
286#else
287#endif
288#endif
289
290 struct sigaction sa;
291
292 sigfillset (&sa.sa_mask);
293 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
294 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
295 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
296 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
297 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
298 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
299 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
300
301 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
302 /* signal (SIGURG, SIG_DFL); */
303
304 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
305 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
306}
307
308bool 337bool
309rxvt_term::init (int argc, const char *const *argv) 338rxvt_term::init (int argc, const char *const *argv)
310{ 339{
340 SET_R (this);
341
342 if (!init_vars ())
343 return false;
344
311 /* 345 /*
312 * Save and then give up any super-user privileges 346 * Save and then give up any super-user privileges
313 * If we need privileges in any area then we must specifically request it. 347 * If we need privileges in any area then we must specifically request it.
314 * We should only need to be root in these cases: 348 * We should only need to be root in these cases:
315 * 1. write utmp entries on some systems 349 * 1. write utmp entries on some systems
… …
353#ifdef TRANSPARENT 387#ifdef TRANSPARENT
354 if (Options & Opt_transparent) 388 if (Options & Opt_transparent)
355 { 389 {
356 XSelectInput (display->display, display->root, PropertyChangeMask); 390 XSelectInput (display->display, display->root, PropertyChangeMask);
357 check_our_parents (); 391 check_our_parents ();
358 }
359#endif
360
361 rootwin_ev.start (display, display->root); 392 rootwin_ev.start (display, display->root);
393 }
394#endif
362 395
363 XMapWindow (display->display, TermWin.vt); 396 XMapWindow (display->display, TermWin.vt);
364 XMapWindow (display->display, TermWin.parent[0]); 397 XMapWindow (display->display, TermWin.parent[0]);
365 398
366 init_command (cmd_argv); 399 init_command (cmd_argv);
… …
368 pty_ev.start (cmd_fd, EVENT_READ); 401 pty_ev.start (cmd_fd, EVENT_READ);
369 402
370 check_ev.start (); 403 check_ev.start ();
371 404
372 return true; 405 return true;
406}
407
408static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
409
410void
411rxvt_init_signals ()
412{
413 /* install exit handler for cleanup */
414#if 0
415#ifdef HAVE_ATEXIT
416 atexit (rxvt_clean_exit);
417#else
418#endif
419#endif
420
421 struct sigaction sa;
422
423 sigfillset (&sa.sa_mask);
424 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
425 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
426 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
427 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
428 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
429 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
430 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
431
432 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
433 /* signal (SIGURG, SIG_DFL); */
434
435 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
436 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
373} 437}
374 438
375/* ------------------------------------------------------------------------- * 439/* ------------------------------------------------------------------------- *
376 * SIGNAL HANDLING & EXIT HANDLER * 440 * SIGNAL HANDLING & EXIT HANDLER *
377 * ------------------------------------------------------------------------- */ 441 * ------------------------------------------------------------------------- */
378/* 442/*
379 * Catch a SIGCHLD signal and exit if the direct child has died 443 * Catch a SIGCHLD signal and exit if the direct child has died
380 */ 444 */
445
446void rxvt_term::child_exited (int pid)
447{
448 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
449 if (pid == (*t)->cmd_pid)
450 {
451 (*t)->destroy ();
452 break;
453 }
454}
455
381/* ARGSUSED */ 456/* ARGSUSED */
382/* EXTPROTO */ 457/* EXTPROTO */
383RETSIGTYPE 458RETSIGTYPE
384rxvt_Child_signal (int sig __attribute__ ((unused))) 459rxvt_Child_signal (int sig __attribute__ ((unused)))
385{ 460{
386 int pid, save_errno = errno; 461 int pid, save_errno = errno;
462
387 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 463 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
388 ; 464 rxvt_term::child_exited (pid);
465
389 errno = save_errno; 466 errno = save_errno;
390
391#if 0
392 if (pid == cmd_pid)
393 exit (EXIT_SUCCESS);
394#endif
395} 467}
396 468
397/* 469/*
398 * Catch a fatal signal and tidy up before quitting 470 * Catch a fatal signal and tidy up before quitting
399 */ 471 */
… …
401RETSIGTYPE 473RETSIGTYPE
402rxvt_Exit_signal (int sig) 474rxvt_Exit_signal (int sig)
403{ 475{
404 signal (sig, SIG_DFL); 476 signal (sig, SIG_DFL);
405#ifdef DEBUG_CMD 477#ifdef DEBUG_CMD
406 rxvt_print_error ("signal %d", sig); 478 rxvt_warn ("caught signal %d, exiting.\n", sig);
407#endif 479#endif
408 rxvt_clean_exit (); 480 rxvt_clean_exit ();
409 kill (getpid (), sig); 481 kill (getpid (), sig);
410} 482}
411 483
… …
696 max_height = MAX_ROWS * TermWin.fheight; 768 max_height = MAX_ROWS * TermWin.fheight;
697 769
698 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 770 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
699 771
700 sb_w = mb_h = 0; 772 sb_w = mb_h = 0;
701 window_vt_x = window_vt_y = 0; 773 window_vt_x = window_vt_y = TermWin.int_bwidth;
774
702 if (scrollbar_visible ()) 775 if (scrollbar_visible ())
703 { 776 {
704 sb_w = scrollbar_TotalWidth (); 777 sb_w = scrollbar_TotalWidth ();
705 szHint.base_width += sb_w; 778 szHint.base_width += sb_w;
706 if (! (Options & Opt_scrollBar_right)) 779 if (!(Options & Opt_scrollBar_right))
707 window_vt_x = sb_w; 780 window_vt_x += sb_w;
708 } 781 }
782
709 if (menubar_visible ()) 783 if (menubar_visible ())
710 { 784 {
711 mb_h = menuBar_TotalHeight (); 785 mb_h = menuBar_TotalHeight ();
712 szHint.base_height += mb_h; 786 szHint.base_height += mb_h;
713 window_vt_y = mb_h; 787 window_vt_y += mb_h;
714 } 788 }
789
715 szHint.width_inc = TermWin.fwidth; 790 szHint.width_inc = TermWin.fwidth;
716 szHint.height_inc = TermWin.fheight; 791 szHint.height_inc = TermWin.fheight;
717 szHint.min_width = szHint.base_width + szHint.width_inc; 792 szHint.min_width = szHint.base_width + szHint.width_inc;
718 szHint.min_height = szHint.base_height + szHint.height_inc; 793 szHint.min_height = szHint.base_height + szHint.height_inc;
719 794
… …
725 else 800 else
726 { 801 {
727 MIN_IT (TermWin.width, max_width); 802 MIN_IT (TermWin.width, max_width);
728 szHint.width = szHint.base_width + TermWin.width; 803 szHint.width = szHint.base_width + TermWin.width;
729 } 804 }
805
730 if (height && height - szHint.base_height < max_height) 806 if (height && height - szHint.base_height < max_height)
731 { 807 {
732 szHint.height = height; 808 szHint.height = height;
733 TermWin.height = height - szHint.base_height; 809 TermWin.height = height - szHint.base_height;
734 } 810 }
735 else 811 else
736 { 812 {
737 MIN_IT (TermWin.height, max_height); 813 MIN_IT (TermWin.height, max_height);
738 szHint.height = szHint.base_height + TermWin.height; 814 szHint.height = szHint.base_height + TermWin.height;
739 } 815 }
816
740 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 817 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
741 window_sb_x = szHint.width - sb_w; 818 window_sb_x = szHint.width - sb_w;
742 819
743 if (recalc_x) 820 if (recalc_x)
744 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 821 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
… …
819 resize_all_windows (0, 0, 0); 896 resize_all_windows (0, 0, 0);
820 scr_remap_chars (); 897 scr_remap_chars ();
821 scr_touch (true); 898 scr_touch (true);
822 } 899 }
823 900
901 for (unicode_t ch = 0x20; ch <= 0x7f; ch++)
902 TermWin.ascii_map [ch - 0x20] = fs->find_font (ch);
903
824 return true; 904 return true;
825 } 905 }
826 } 906 }
827 907
828 return false; 908 return false;
… …
838/*----------------------------------------------------------------------*/ 918/*----------------------------------------------------------------------*/
839/* xterm sequences - title, iconName, color (exptl) */ 919/* xterm sequences - title, iconName, color (exptl) */
840void 920void
841rxvt_term::set_title (const char *str) 921rxvt_term::set_title (const char *str)
842{ 922{
843#ifndef SMART_WINDOW_TITLE 923#ifdef SMART_WINDOW_TITLE
844 XStoreName (display->display, TermWin.parent[0], str);
845#else
846 char *name; 924 char *name;
847 925
848 if (XFetchName (display->display, TermWin.parent[0], &name) == 0) 926 if (!XFetchName (display->display, TermWin.parent[0], &name))
849 name = NULL; 927 name = NULL;
928
850 if (name == NULL || STRCMP (name, str)) 929 if (name == NULL || STRCMP (name, str))
930#endif
851 XStoreName (display->display, TermWin.parent[0], str); 931 XStoreName (display->display, TermWin.parent[0], str);
932
933#ifdef SMART_WINDOW_TITLE
852 if (name) 934 if (name)
853 XFree (name); 935 XFree (name);
854#endif 936#endif
855} 937}
856 938
857void 939void
858rxvt_term::set_iconName (const char *str) 940rxvt_term::set_icon_name (const char *str)
859{ 941{
860#ifndef SMART_WINDOW_TITLE 942#ifdef SMART_WINDOW_TITLE
861 XSetIconName (display->display, TermWin.parent[0], str);
862#else
863 char *name; 943 char *name;
864 944
865 if (XGetIconName (display->display, TermWin.parent[0], &name)) 945 if (!XGetIconName (display->display, TermWin.parent[0], &name))
866 name = NULL; 946 name = NULL;
947
867 if (name == NULL || STRCMP (name, str)) 948 if (name == NULL || STRCMP (name, str))
949#endif
868 XSetIconName (display->display, TermWin.parent[0], str); 950 XSetIconName (display->display, TermWin.parent[0], str);
951
952#ifdef SMART_WINDOW_TITLE
869 if (name) 953 if (name)
870 XFree (name); 954 XFree (name);
871#endif 955#endif
872} 956}
873 957
… …
887 i = atoi (color); 971 i = atoi (color);
888 if (i >= 8 && i <= 15) 972 if (i >= 8 && i <= 15)
889 { /* bright colors */ 973 { /* bright colors */
890 i -= 8; 974 i -= 8;
891# ifndef NO_BRIGHTCOLOR 975# ifndef NO_BRIGHTCOLOR
892 PixColors[idx] = PixColors[minBrightCOLOR + i]; 976 PixColorsFocused[idx] = PixColorsFocused[minBrightCOLOR + i];
893 SET_PIXCOLOR (idx); 977 SET_PIXCOLOR (idx);
894 goto Done; 978 goto Done;
895# endif 979# endif
896 980
897 } 981 }
898 if (i >= 0 && i <= 7) 982 if (i >= 0 && i <= 7)
899 { /* normal colors */ 983 { /* normal colors */
900 PixColors[idx] = PixColors[minCOLOR + i]; 984 PixColorsFocused[idx] = PixColorsFocused[minCOLOR + i];
901 SET_PIXCOLOR (idx); 985 SET_PIXCOLOR (idx);
902 goto Done; 986 goto Done;
903 } 987 }
904 } 988 }
989
905 if (!rXParseAllocColor (& xcol, color)) 990 if (!rXParseAllocColor (& xcol, color))
906 return; 991 return;
992
907 /* XStoreColor (display->display, XCMAP, XColor*); */ 993 /* XStoreColor (display->display, display->cmap, XColor*); */
908 994
909 /* 995 /*
910 * FIXME: should free colors here, but no idea how to do it so instead, 996 * FIXME: should free colors here, but no idea how to do it so instead,
911 * so just keep gobbling up the colormap 997 * so just keep gobbling up the colormap
912 */ 998 */
… …
915 if (PixColors[idx] == PixColors[i]) 1001 if (PixColors[idx] == PixColors[i])
916 break; 1002 break;
917 if (i > Color_White) 1003 if (i > Color_White)
918 { 1004 {
919 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 1005 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
920 XFreeColors (display->display, XCMAP, (PixColors + idx), 1, 1006 XFreeColors (display->display, display->cmap, (PixColors + idx), 1,
921 DisplayPlanes (display->display, display->screen)); 1007 DisplayPlanes (display->display, display->screen));
922 } 1008 }
923# endif 1009# endif
924 1010
925 PixColors[idx] = xcol; 1011 PixColorsFocused[idx] = xcol;
926 SET_PIXCOLOR (idx); 1012 SET_PIXCOLOR (idx);
927 1013
928 /* XSetWindowAttributes attr; */ 1014 /* XSetWindowAttributes attr; */
929 /* Cursor cursor; */ 1015 /* Cursor cursor; */
930Done: 1016Done:
1017#ifdef OFF_FOCUS_FADING
1018 PixColorsUnFocused[idx] = PixColorsFocused[idx].fade (display, atoi (rs[Rs_fade]));
1019#endif
931 if (idx == Color_bg && ! (Options & Opt_transparent)) 1020 if (idx == Color_bg && ! (Options & Opt_transparent))
932 XSetWindowBackground (display->display, TermWin.vt, 1021 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
933 PixColors[Color_bg]);
934 1022
935 /* handle Color_BD, scrollbar background, etc. */ 1023 /* handle Color_BD, scrollbar background, etc. */
936 1024
937 set_colorfgbg (); 1025 set_colorfgbg ();
938 recolour_cursor (); 1026 recolour_cursor ();
939 /* the only reasonable way to enforce a clean update */ 1027 scr_touch (true);
940 scr_poweron ();
941} 1028}
942 1029
943#else 1030#else
944# define set_window_color (idx,color) ((void)0) 1031# define set_window_color (idx,color) ((void)0)
945#endif /* XTERM_COLOR_CHANGE */ 1032#endif /* XTERM_COLOR_CHANGE */
946 1033
947void 1034void
948rxvt_term::recolour_cursor () 1035rxvt_term::recolour_cursor ()
949{ 1036{
950#if TODO
951 rxvt_color xcol[2]; 1037 XColor xcol[2];
952 1038
953 xcol[0] = PixColors[Color_pointer]; 1039 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColorsFocused[Color_pointer_fg] : PixColorsFocused[Color_fg];
954 xcol[1] = PixColors[Color_bg]; 1040 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColorsFocused[Color_pointer_bg] : PixColorsFocused[Color_bg];
955 XQueryColors (display->display, XCMAP, xcol, 2); 1041 XQueryColors (display->display, display->cmap, xcol, 2);
956 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1])); 1042 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
957#endif
958} 1043}
959 1044
960/*----------------------------------------------------------------------*/ 1045/*----------------------------------------------------------------------*/
961/* 1046/*
962 * find if fg/bg matches any of the normal (low-intensity) colors 1047 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1011int 1096int
1012rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1097rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1013{ 1098{
1014 if (!screen_in_out->set (display, colour)) 1099 if (!screen_in_out->set (display, colour))
1015 { 1100 {
1016 rxvt_print_error ("can't allocate colour: %s", colour); 1101 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1017 return false; 1102 return false;
1018 } 1103 }
1019 1104
1020 return true; 1105 return true;
1021} 1106}
… …
1032 int old_width = szHint.width, old_height = szHint.height; 1117 int old_width = szHint.width, old_height = szHint.height;
1033#endif 1118#endif
1034 1119
1035 window_calc (width, height); 1120 window_calc (width, height);
1036 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1121 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
1122
1037 if (!ignoreparent) 1123 if (!ignoreparent)
1038 { 1124 {
1039#ifdef SMART_RESIZE 1125#ifdef SMART_RESIZE
1040 /* 1126 /*
1041 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 1127 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
… …
1076 dy /= 2; 1162 dy /= 2;
1077 1163
1078 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1164 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
1079 szHint.width, szHint.height); 1165 szHint.width, szHint.height);
1080#else 1166#else
1081 XResizeWindow (display->display, TermWin.parent[0], szHint.width, 1167 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height);
1082 szHint.height);
1083#endif 1168#endif
1084
1085 } 1169 }
1086 1170
1087 fix_screen = (TermWin.ncol != prev_ncol 1171 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
1088 || TermWin.nrow != prev_nrow);
1089 1172
1090 if (fix_screen || width != old_width || height != old_height) 1173 if (fix_screen || width != old_width || height != old_height)
1091 { 1174 {
1092 if (scrollbar_visible ()) 1175 if (scrollbar_visible ())
1093 { 1176 {
1094 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x, 1177 XMoveResizeWindow (display->display, scrollBar.win,
1178 window_sb_x, 0,
1095 0, scrollbar_TotalWidth (), szHint.height); 1179 scrollbar_TotalWidth (), szHint.height);
1096 resize_scrollbar (); 1180 resize_scrollbar ();
1097 } 1181 }
1098 1182
1099 if (menubar_visible ()) 1183 if (menubar_visible ())
1100 XMoveResizeWindow (display->display, menuBar.win, window_vt_x, 1184 XMoveResizeWindow (display->display, menuBar.win,
1185 window_vt_x, 0,
1101 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1186 TermWin_TotalWidth (), menuBar_TotalHeight ());
1102 1187
1103 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1188 XMoveResizeWindow (display->display, TermWin.vt,
1104 window_vt_y, TermWin_TotalWidth (), 1189 window_vt_x, window_vt_y,
1105 TermWin_TotalHeight ()); 1190 TermWin_TotalWidth (), TermWin_TotalHeight ());
1106 scr_clear (height != old_height); 1191 scr_clear ();
1107#ifdef XPM_BACKGROUND 1192#ifdef XPM_BACKGROUND
1108 resize_pixmap (); 1193 resize_pixmap ();
1109#endif 1194#endif
1110
1111 } 1195 }
1112 1196
1113 if (fix_screen || old_height == 0) 1197 if (fix_screen || old_height == 0)
1114 { 1198 {
1115 int curr_screen = -1; 1199 int curr_screen = -1;
… …
1156 if (width == 0) 1240 if (width == 0)
1157 width = wattr.width - szHint.base_width; 1241 width = wattr.width - szHint.base_width;
1158 if (height == 0) 1242 if (height == 0)
1159 height = wattr.height - szHint.base_height; 1243 height = wattr.height - szHint.base_height;
1160 } 1244 }
1245
1161 if (width != TermWin.width || height != TermWin.height) 1246 if (width != TermWin.width || height != TermWin.height)
1162 { 1247 {
1163 width += szHint.base_width; 1248 width += szHint.base_width;
1164 height += szHint.base_height; 1249 height += szHint.base_height;
1165 resize_all_windows (width, height, 0); 1250 resize_all_windows (width, height, 0);
… …
1388 if (preedit_attr) XFree (preedit_attr); 1473 if (preedit_attr) XFree (preedit_attr);
1389 if (status_attr) XFree (status_attr); 1474 if (status_attr) XFree (status_attr);
1390 1475
1391 if (Input_Context == NULL) 1476 if (Input_Context == NULL)
1392 { 1477 {
1393 rxvt_print_error ("failed to create input context"); 1478 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1394 display->put_xim (input_method); 1479 display->put_xim (input_method);
1395 return false; 1480 return false;
1396 } 1481 }
1397 1482
1398 if (input_style & XIMPreeditArea) 1483 if (input_style & XIMPreeditArea)

Diff Legend

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