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.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);
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 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
186#if defined(MENUBAR) && (MENUBAR_MAX > 1) 235#if defined(MENUBAR) && (MENUBAR_MAX > 1)
187 delete menuBar.drawable; 236 delete menuBar.drawable;
188 //if (menuBar.win) 237 //if (menuBar.win)
189 // XDestroyWindow (display->display, menuBar.win); 238 // XDestroyWindow (display->display, menuBar.win);
190#endif 239#endif
… …
194 XDestroyWindow (display->display, TermWin.parent[0]); 243 XDestroyWindow (display->display, TermWin.parent[0]);
195 } 244 }
196 245
197 // TODO: free pixcolours, colours should become part of rxvt_display 246 // TODO: free pixcolours, colours should become part of rxvt_display
198 247
199 delete PixColors; 248 delete PixColorsFocused;
249#ifdef OFF_FOCUS_FADING
250 delete PixColorsUnFocused;
251#endif
200 252
201 displays.put (display); 253 displays.put (display);
202 254
203 scr_release (); 255 scr_release ();
204 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(!)
205 free (env_windowid); 263 free (env_windowid);
206 free (env_display); 264 free (env_display);
207 free (env_term); 265 free (env_term);
208 free (env_colorfgbg); 266 free (env_colorfgbg);
209 free (locale); 267 free (locale);
268#if 0
210 free (codeset); 269 free (codeset);
270#endif
211 271
212 delete envv; 272 delete envv;
213 delete argv; 273 delete argv;
214} 274}
215 275
… …
239 cursor_blink_ev.stop (); 299 cursor_blink_ev.stop ();
240#endif 300#endif
241#ifdef TEXT_BLINK 301#ifdef TEXT_BLINK
242 text_blink_ev.stop (); 302 text_blink_ev.stop ();
243#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
244#ifdef POINTER_BLANK 310#ifdef POINTER_BLANK
245 pointer_ev.stop (); 311 pointer_ev.stop ();
246#endif 312#endif
247 313
248 destroy_ev.start (0); 314 destroy_ev.start (0);
… …
256 delete this; 322 delete this;
257} 323}
258 324
259/*----------------------------------------------------------------------*/ 325/*----------------------------------------------------------------------*/
260/* rxvt_init () */ 326/* 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 327bool
308rxvt_term::init (int argc, const char *const *argv) 328rxvt_term::init (int argc, const char *const *argv)
309{ 329{
330 SET_R (this);
331
332 if (!init_vars ())
333 return false;
334
310 /* 335 /*
311 * Save and then give up any super-user privileges 336 * Save and then give up any super-user privileges
312 * 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.
313 * We should only need to be root in these cases: 338 * We should only need to be root in these cases:
314 * 1. write utmp entries on some systems 339 * 1. write utmp entries on some systems
… …
369 check_ev.start (); 394 check_ev.start ();
370 395
371 return true; 396 return true;
372} 397}
373 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
374/* ------------------------------------------------------------------------- * 430/* ------------------------------------------------------------------------- *
375 * SIGNAL HANDLING & EXIT HANDLER * 431 * SIGNAL HANDLING & EXIT HANDLER *
376 * ------------------------------------------------------------------------- */ 432 * ------------------------------------------------------------------------- */
377/* 433/*
378 * 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
379 */ 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
380/* ARGSUSED */ 447/* ARGSUSED */
381/* EXTPROTO */ 448/* EXTPROTO */
382RETSIGTYPE 449RETSIGTYPE
383rxvt_Child_signal (int sig __attribute__ ((unused))) 450rxvt_Child_signal (int sig __attribute__ ((unused)))
384{ 451{
385 int pid, save_errno = errno; 452 int pid, save_errno = errno;
453
386 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 454 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
387 ; 455 rxvt_term::child_exited (pid);
456
388 errno = save_errno; 457 errno = save_errno;
389
390#if 0
391 if (pid == cmd_pid)
392 exit (EXIT_SUCCESS);
393#endif
394} 458}
395 459
396/* 460/*
397 * Catch a fatal signal and tidy up before quitting 461 * Catch a fatal signal and tidy up before quitting
398 */ 462 */
… …
400RETSIGTYPE 464RETSIGTYPE
401rxvt_Exit_signal (int sig) 465rxvt_Exit_signal (int sig)
402{ 466{
403 signal (sig, SIG_DFL); 467 signal (sig, SIG_DFL);
404#ifdef DEBUG_CMD 468#ifdef DEBUG_CMD
405 rxvt_print_error ("signal %d", sig); 469 rxvt_warn ("caught signal %d, exiting.\n", sig);
406#endif 470#endif
407 rxvt_clean_exit (); 471 rxvt_clean_exit ();
408 kill (getpid (), sig); 472 kill (getpid (), sig);
409} 473}
410 474
… …
685 else 749 else
686 szHint.win_gravity = SouthWestGravity; 750 szHint.win_gravity = SouthWestGravity;
687 } 751 }
688 } 752 }
689 } 753 }
754
690 /* TODO: BOUNDS */ 755 /* TODO: BOUNDS */
691 TermWin.width = TermWin.ncol * TermWin.fwidth; 756 TermWin.width = TermWin.ncol * TermWin.fwidth;
692 TermWin.height = TermWin.nrow * TermWin.fheight; 757 TermWin.height = TermWin.nrow * TermWin.fheight;
693 max_width = MAX_COLS * TermWin.fwidth; 758 max_width = MAX_COLS * TermWin.fwidth;
694 max_height = MAX_ROWS * TermWin.fheight; 759 max_height = MAX_ROWS * TermWin.fheight;
695 760
696 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 761 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
697 762
698 sb_w = mb_h = 0; 763 sb_w = mb_h = 0;
699 window_vt_x = window_vt_y = 0; 764 window_vt_x = window_vt_y = TermWin.int_bwidth;
765
700 if (scrollbar_visible ()) 766 if (scrollbar_visible ())
701 { 767 {
702 sb_w = scrollbar_TotalWidth (); 768 sb_w = scrollbar_TotalWidth ();
703 szHint.base_width += sb_w; 769 szHint.base_width += sb_w;
704 if (! (Options & Opt_scrollBar_right)) 770 if (!(Options & Opt_scrollBar_right))
705 window_vt_x = sb_w; 771 window_vt_x += sb_w;
706 } 772 }
773
707 if (menubar_visible ()) 774 if (menubar_visible ())
708 { 775 {
709 mb_h = menuBar_TotalHeight (); 776 mb_h = menuBar_TotalHeight ();
710 szHint.base_height += mb_h; 777 szHint.base_height += mb_h;
711 window_vt_y = mb_h; 778 window_vt_y += mb_h;
712 } 779 }
780
713 szHint.width_inc = TermWin.fwidth; 781 szHint.width_inc = TermWin.fwidth;
714 szHint.height_inc = TermWin.fheight; 782 szHint.height_inc = TermWin.fheight;
715 szHint.min_width = szHint.base_width + szHint.width_inc; 783 szHint.min_width = szHint.base_width + szHint.width_inc;
716 szHint.min_height = szHint.base_height + szHint.height_inc; 784 szHint.min_height = szHint.base_height + szHint.height_inc;
717 785
… …
723 else 791 else
724 { 792 {
725 MIN_IT (TermWin.width, max_width); 793 MIN_IT (TermWin.width, max_width);
726 szHint.width = szHint.base_width + TermWin.width; 794 szHint.width = szHint.base_width + TermWin.width;
727 } 795 }
796
728 if (height && height - szHint.base_height < max_height) 797 if (height && height - szHint.base_height < max_height)
729 { 798 {
730 szHint.height = height; 799 szHint.height = height;
731 TermWin.height = height - szHint.base_height; 800 TermWin.height = height - szHint.base_height;
732 } 801 }
733 else 802 else
734 { 803 {
735 MIN_IT (TermWin.height, max_height); 804 MIN_IT (TermWin.height, max_height);
736 szHint.height = szHint.base_height + TermWin.height; 805 szHint.height = szHint.base_height + TermWin.height;
737 } 806 }
807
738 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 808 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
739 window_sb_x = szHint.width - sb_w; 809 window_sb_x = szHint.width - sb_w;
740 810
741 if (recalc_x) 811 if (recalc_x)
742 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 812 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
… …
817 resize_all_windows (0, 0, 0); 887 resize_all_windows (0, 0, 0);
818 scr_remap_chars (); 888 scr_remap_chars ();
819 scr_touch (true); 889 scr_touch (true);
820 } 890 }
821 891
892 for (unicode_t ch = 0x20; ch <= 0x7f; ch++)
893 TermWin.ascii_map [ch - 0x20] = fs->find_font (ch);
894
822 return true; 895 return true;
823 } 896 }
824 } 897 }
825 898
826 return false; 899 return false;
… …
836/*----------------------------------------------------------------------*/ 909/*----------------------------------------------------------------------*/
837/* xterm sequences - title, iconName, color (exptl) */ 910/* xterm sequences - title, iconName, color (exptl) */
838void 911void
839rxvt_term::set_title (const char *str) 912rxvt_term::set_title (const char *str)
840{ 913{
841#ifndef SMART_WINDOW_TITLE 914#ifdef SMART_WINDOW_TITLE
842 XStoreName (display->display, TermWin.parent[0], str);
843#else
844 char *name; 915 char *name;
845 916
846 if (XFetchName (display->display, TermWin.parent[0], &name) == 0) 917 if (!XFetchName (display->display, TermWin.parent[0], &name))
847 name = NULL; 918 name = NULL;
919
848 if (name == NULL || STRCMP (name, str)) 920 if (name == NULL || STRCMP (name, str))
921#endif
849 XStoreName (display->display, TermWin.parent[0], str); 922 XStoreName (display->display, TermWin.parent[0], str);
923
924#ifdef SMART_WINDOW_TITLE
850 if (name) 925 if (name)
851 XFree (name); 926 XFree (name);
852#endif 927#endif
853} 928}
854 929
855void 930void
856rxvt_term::set_iconName (const char *str) 931rxvt_term::set_icon_name (const char *str)
857{ 932{
858#ifndef SMART_WINDOW_TITLE 933#ifdef SMART_WINDOW_TITLE
859 XSetIconName (display->display, TermWin.parent[0], str);
860#else
861 char *name; 934 char *name;
862 935
863 if (XGetIconName (display->display, TermWin.parent[0], &name)) 936 if (!XGetIconName (display->display, TermWin.parent[0], &name))
864 name = NULL; 937 name = NULL;
938
865 if (name == NULL || STRCMP (name, str)) 939 if (name == NULL || STRCMP (name, str))
940#endif
866 XSetIconName (display->display, TermWin.parent[0], str); 941 XSetIconName (display->display, TermWin.parent[0], str);
942
943#ifdef SMART_WINDOW_TITLE
867 if (name) 944 if (name)
868 XFree (name); 945 XFree (name);
869#endif 946#endif
870} 947}
871 948
… …
885 i = atoi (color); 962 i = atoi (color);
886 if (i >= 8 && i <= 15) 963 if (i >= 8 && i <= 15)
887 { /* bright colors */ 964 { /* bright colors */
888 i -= 8; 965 i -= 8;
889# ifndef NO_BRIGHTCOLOR 966# ifndef NO_BRIGHTCOLOR
890 PixColors[idx] = PixColors[minBrightCOLOR + i]; 967 PixColorsFocused[idx] = PixColorsFocused[minBrightCOLOR + i];
891 SET_PIXCOLOR (idx); 968 SET_PIXCOLOR (idx);
892 goto Done; 969 goto Done;
893# endif 970# endif
894 971
895 } 972 }
896 if (i >= 0 && i <= 7) 973 if (i >= 0 && i <= 7)
897 { /* normal colors */ 974 { /* normal colors */
898 PixColors[idx] = PixColors[minCOLOR + i]; 975 PixColorsFocused[idx] = PixColorsFocused[minCOLOR + i];
899 SET_PIXCOLOR (idx); 976 SET_PIXCOLOR (idx);
900 goto Done; 977 goto Done;
901 } 978 }
902 } 979 }
980
903 if (!rXParseAllocColor (& xcol, color)) 981 if (!rXParseAllocColor (& xcol, color))
904 return; 982 return;
983
905 /* XStoreColor (display->display, XCMAP, XColor*); */ 984 /* XStoreColor (display->display, display->cmap, XColor*); */
906 985
907 /* 986 /*
908 * 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,
909 * so just keep gobbling up the colormap 988 * so just keep gobbling up the colormap
910 */ 989 */
… …
913 if (PixColors[idx] == PixColors[i]) 992 if (PixColors[idx] == PixColors[i])
914 break; 993 break;
915 if (i > Color_White) 994 if (i > Color_White)
916 { 995 {
917 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 996 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
918 XFreeColors (display->display, XCMAP, (PixColors + idx), 1, 997 XFreeColors (display->display, display->cmap, (PixColors + idx), 1,
919 DisplayPlanes (display->display, display->screen)); 998 DisplayPlanes (display->display, display->screen));
920 } 999 }
921# endif 1000# endif
922 1001
923 PixColors[idx] = xcol; 1002 PixColorsFocused[idx] = xcol;
924 SET_PIXCOLOR (idx); 1003 SET_PIXCOLOR (idx);
925 1004
926 /* XSetWindowAttributes attr; */ 1005 /* XSetWindowAttributes attr; */
927 /* Cursor cursor; */ 1006 /* Cursor cursor; */
928Done: 1007Done:
1008#ifdef OFF_FOCUS_FADING
1009 PixColorsUnFocused[idx] = PixColorsFocused[idx].fade (display, atoi (rs[Rs_fade]));
1010#endif
929 if (idx == Color_bg && ! (Options & Opt_transparent)) 1011 if (idx == Color_bg && ! (Options & Opt_transparent))
930 XSetWindowBackground (display->display, TermWin.vt, 1012 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
931 PixColors[Color_bg]);
932 1013
933 /* handle Color_BD, scrollbar background, etc. */ 1014 /* handle Color_BD, scrollbar background, etc. */
934 1015
935 set_colorfgbg (); 1016 set_colorfgbg ();
936 recolour_cursor (); 1017 recolour_cursor ();
937 /* the only reasonable way to enforce a clean update */ 1018 scr_touch (true);
938 scr_poweron ();
939} 1019}
940 1020
941#else 1021#else
942# define set_window_color (idx,color) ((void)0) 1022# define set_window_color (idx,color) ((void)0)
943#endif /* XTERM_COLOR_CHANGE */ 1023#endif /* XTERM_COLOR_CHANGE */
944 1024
945void 1025void
946rxvt_term::recolour_cursor () 1026rxvt_term::recolour_cursor ()
947{ 1027{
948#if TODO
949 rxvt_color xcol[2]; 1028 XColor xcol[2];
950 1029
951 xcol[0] = PixColors[Color_pointer]; 1030 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColorsFocused[Color_pointer_fg] : PixColorsFocused[Color_fg];
952 xcol[1] = PixColors[Color_bg]; 1031 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColorsFocused[Color_pointer_bg] : PixColorsFocused[Color_bg];
953 XQueryColors (display->display, XCMAP, xcol, 2); 1032 XQueryColors (display->display, display->cmap, xcol, 2);
954 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1])); 1033 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
955#endif
956} 1034}
957 1035
958/*----------------------------------------------------------------------*/ 1036/*----------------------------------------------------------------------*/
959/* 1037/*
960 * 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
… …
1009int 1087int
1010rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1088rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1011{ 1089{
1012 if (!screen_in_out->set (display, colour)) 1090 if (!screen_in_out->set (display, colour))
1013 { 1091 {
1014 rxvt_print_error ("can't allocate colour: %s", colour); 1092 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1015 return false; 1093 return false;
1016 } 1094 }
1017 1095
1018 return true; 1096 return true;
1019} 1097}
… …
1030 int old_width = szHint.width, old_height = szHint.height; 1108 int old_width = szHint.width, old_height = szHint.height;
1031#endif 1109#endif
1032 1110
1033 window_calc (width, height); 1111 window_calc (width, height);
1034 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1112 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
1113
1035 if (!ignoreparent) 1114 if (!ignoreparent)
1036 { 1115 {
1037#ifdef SMART_RESIZE 1116#ifdef SMART_RESIZE
1038 /* 1117 /*
1039 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 1118 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
… …
1074 dy /= 2; 1153 dy /= 2;
1075 1154
1076 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1155 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
1077 szHint.width, szHint.height); 1156 szHint.width, szHint.height);
1078#else 1157#else
1079 XResizeWindow (display->display, TermWin.parent[0], szHint.width, 1158 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height);
1080 szHint.height);
1081#endif 1159#endif
1082
1083 } 1160 }
1084 1161
1085 fix_screen = (TermWin.ncol != prev_ncol 1162 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
1086 || TermWin.nrow != prev_nrow);
1087 1163
1088 if (fix_screen || width != old_width || height != old_height) 1164 if (fix_screen || width != old_width || height != old_height)
1089 { 1165 {
1090 if (scrollbar_visible ()) 1166 if (scrollbar_visible ())
1091 { 1167 {
1092 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x, 1168 XMoveResizeWindow (display->display, scrollBar.win,
1169 window_sb_x, 0,
1093 0, scrollbar_TotalWidth (), szHint.height); 1170 scrollbar_TotalWidth (), szHint.height);
1094 resize_scrollbar (); 1171 resize_scrollbar ();
1095 } 1172 }
1096 1173
1097 if (menubar_visible ()) 1174 if (menubar_visible ())
1098 XMoveResizeWindow (display->display, menuBar.win, window_vt_x, 1175 XMoveResizeWindow (display->display, menuBar.win,
1176 window_vt_x, 0,
1099 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1177 TermWin_TotalWidth (), menuBar_TotalHeight ());
1100 1178
1101 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1179 XMoveResizeWindow (display->display, TermWin.vt,
1102 window_vt_y, TermWin_TotalWidth (), 1180 window_vt_x, window_vt_y,
1103 TermWin_TotalHeight ()); 1181 TermWin_TotalWidth (), TermWin_TotalHeight ());
1104 scr_clear (height != old_height); 1182 scr_clear ();
1105#ifdef XPM_BACKGROUND 1183#ifdef XPM_BACKGROUND
1106 resize_pixmap (); 1184 resize_pixmap ();
1107#endif 1185#endif
1108
1109 } 1186 }
1110 1187
1111 if (fix_screen || old_height == 0) 1188 if (fix_screen || old_height == 0)
1112 { 1189 {
1113 int curr_screen = -1; 1190 int curr_screen = -1;
… …
1386 if (preedit_attr) XFree (preedit_attr); 1463 if (preedit_attr) XFree (preedit_attr);
1387 if (status_attr) XFree (status_attr); 1464 if (status_attr) XFree (status_attr);
1388 1465
1389 if (Input_Context == NULL) 1466 if (Input_Context == NULL)
1390 { 1467 {
1391 rxvt_print_error ("failed to create input context"); 1468 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1392 display->put_xim (input_method); 1469 display->put_xim (input_method);
1393 return false; 1470 return false;
1394 } 1471 }
1395 1472
1396 if (input_style & XIMPreeditArea) 1473 if (input_style & XIMPreeditArea)

Diff Legend

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