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

Diff Legend

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