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.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
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
… …
136 free (p); 140 free (p);
137} 141}
138 142
139rxvt_term::rxvt_term () 143rxvt_term::rxvt_term ()
140 : 144 :
145#if TRANSPARENT
141 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
142 termwin_ev (this, &rxvt_term::x_cb), 175 termwin_ev (this, &rxvt_term::x_cb),
143 vt_ev (this, &rxvt_term::x_cb), 176 vt_ev (this, &rxvt_term::x_cb),
144#ifdef HAVE_SCROLLBARS
145 scrollbar_ev (this, &rxvt_term::x_cb),
146#endif
147#ifdef MENUBAR
148 menubar_ev (this, &rxvt_term::x_cb),
149#endif
150#ifdef CURSOR_BLINK
151 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
152#endif
153#ifdef TEXT_BLINK
154 text_blink_ev (this, &rxvt_term::text_blink_cb),
155#endif
156#ifdef POINTER_BLANK
157 pointer_ev (this, &rxvt_term::pointer_cb),
158#endif
159#ifdef USE_XIM
160 im_ev (this, &rxvt_term::im_cb),
161#endif
162 check_ev (this, &rxvt_term::check_cb), 177 check_ev (this, &rxvt_term::check_cb),
178 flush_ev (this, &rxvt_term::flush_cb),
163 destroy_ev (this, &rxvt_term::destroy_cb), 179 destroy_ev (this, &rxvt_term::destroy_cb),
164 pty_ev (this, &rxvt_term::pty_cb), 180 pty_ev (this, &rxvt_term::pty_cb),
165 incr_ev (this, &rxvt_term::incr_cb) 181 incr_ev (this, &rxvt_term::incr_cb)
166{ 182{
167 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 183 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
184
185 termlist.push_back (this);
168} 186}
169 187
170rxvt_term::~rxvt_term () 188rxvt_term::~rxvt_term ()
171{ 189{
190 termlist.erase (find (termlist.begin (), termlist.end(), this));
191
172 if (cmd_fd >= 0) 192 if (cmd_fd >= 0)
173 close (cmd_fd); 193 close (cmd_fd);
174 194
175#ifndef NO_SETOWNER_TTYDEV 195#ifndef NO_SETOWNER_TTYDEV
176 privileged_ttydev (RESTORE); 196 privileged_ttydev (RESTORE);
… …
181 201
182 delete TermWin.fontset; 202 delete TermWin.fontset;
183 203
184 if (display) 204 if (display)
185 { 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
186#if defined(MENUBAR) && (MENUBAR_MAX > 1) 240#if defined(MENUBAR) && (MENUBAR_MAX > 1)
187 delete menuBar.drawable; 241 delete menuBar.drawable;
188 //if (menuBar.win) 242 //if (menuBar.win)
189 // XDestroyWindow (display->display, menuBar.win); 243 // XDestroyWindow (display->display, menuBar.win);
190#endif 244#endif
… …
194 XDestroyWindow (display->display, TermWin.parent[0]); 248 XDestroyWindow (display->display, TermWin.parent[0]);
195 } 249 }
196 250
197 // TODO: free pixcolours, colours should become part of rxvt_display 251 // TODO: free pixcolours, colours should become part of rxvt_display
198 252
199 delete PixColors; 253 delete PixColorsFocused;
254#ifdef OFF_FOCUS_FADING
255 delete PixColorsUnFocused;
256#endif
200 257
201 displays.put (display); 258 displays.put (display);
202 259
203 scr_release (); 260 scr_release ();
204 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(!)
205 free (env_windowid); 268 free (env_windowid);
206 free (env_display); 269 free (env_display);
207 free (env_term); 270 free (env_term);
208 free (env_colorfgbg); 271 free (env_colorfgbg);
209 free (locale); 272 free (locale);
273#if 0
210 free (codeset); 274 free (codeset);
275#endif
211 276
212 delete envv; 277 delete envv;
213 delete argv; 278 delete argv;
214} 279}
215 280
216void 281void
217rxvt_term::destroy () 282rxvt_term::destroy ()
218{ 283{
284 if (destroy_ev.active)
285 return;
286
219 if (display) 287 if (display)
220 { 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
221 rootwin_ev.stop (display); 299 rootwin_ev.stop (display);
300#endif
301 incr_ev.stop ();
222 termwin_ev.stop (display); 302 termwin_ev.stop (display);
223 vt_ev.stop (display); 303 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 } 304 }
235 305
236 check_ev.stop (); 306 check_ev.stop ();
237 pty_ev.stop (); 307 pty_ev.stop ();
238#ifdef CURSOR_BLINK 308#ifdef CURSOR_BLINK
239 cursor_blink_ev.stop (); 309 cursor_blink_ev.stop ();
240#endif 310#endif
241#ifdef TEXT_BLINK 311#ifdef TEXT_BLINK
242 text_blink_ev.stop (); 312 text_blink_ev.stop ();
243#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
244#ifdef POINTER_BLANK 320#ifdef POINTER_BLANK
245 pointer_ev.stop (); 321 pointer_ev.stop ();
246#endif 322#endif
247 323
248 destroy_ev.start (0); 324 destroy_ev.start (0);
… …
256 delete this; 332 delete this;
257} 333}
258 334
259/*----------------------------------------------------------------------*/ 335/*----------------------------------------------------------------------*/
260/* rxvt_init () */ 336/* 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 337bool
308rxvt_term::init (int argc, const char *const *argv) 338rxvt_term::init (int argc, const char *const *argv)
309{ 339{
340 SET_R (this);
341
342 if (!init_vars ())
343 return false;
344
310 /* 345 /*
311 * Save and then give up any super-user privileges 346 * Save and then give up any super-user privileges
312 * 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.
313 * We should only need to be root in these cases: 348 * We should only need to be root in these cases:
314 * 1. write utmp entries on some systems 349 * 1. write utmp entries on some systems
… …
352#ifdef TRANSPARENT 387#ifdef TRANSPARENT
353 if (Options & Opt_transparent) 388 if (Options & Opt_transparent)
354 { 389 {
355 XSelectInput (display->display, display->root, PropertyChangeMask); 390 XSelectInput (display->display, display->root, PropertyChangeMask);
356 check_our_parents (); 391 check_our_parents ();
357 }
358#endif
359
360 rootwin_ev.start (display, display->root); 392 rootwin_ev.start (display, display->root);
393 }
394#endif
361 395
362 XMapWindow (display->display, TermWin.vt); 396 XMapWindow (display->display, TermWin.vt);
363 XMapWindow (display->display, TermWin.parent[0]); 397 XMapWindow (display->display, TermWin.parent[0]);
364 398
365 init_command (cmd_argv); 399 init_command (cmd_argv);
… …
367 pty_ev.start (cmd_fd, EVENT_READ); 401 pty_ev.start (cmd_fd, EVENT_READ);
368 402
369 check_ev.start (); 403 check_ev.start ();
370 404
371 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);
372} 437}
373 438
374/* ------------------------------------------------------------------------- * 439/* ------------------------------------------------------------------------- *
375 * SIGNAL HANDLING & EXIT HANDLER * 440 * SIGNAL HANDLING & EXIT HANDLER *
376 * ------------------------------------------------------------------------- */ 441 * ------------------------------------------------------------------------- */
377/* 442/*
378 * 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
379 */ 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
380/* ARGSUSED */ 456/* ARGSUSED */
381/* EXTPROTO */ 457/* EXTPROTO */
382RETSIGTYPE 458RETSIGTYPE
383rxvt_Child_signal (int sig __attribute__ ((unused))) 459rxvt_Child_signal (int sig __attribute__ ((unused)))
384{ 460{
385 int pid, save_errno = errno; 461 int pid, save_errno = errno;
462
386 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 463 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
387 ; 464 rxvt_term::child_exited (pid);
465
388 errno = save_errno; 466 errno = save_errno;
389
390#if 0
391 if (pid == cmd_pid)
392 exit (EXIT_SUCCESS);
393#endif
394} 467}
395 468
396/* 469/*
397 * Catch a fatal signal and tidy up before quitting 470 * Catch a fatal signal and tidy up before quitting
398 */ 471 */
… …
400RETSIGTYPE 473RETSIGTYPE
401rxvt_Exit_signal (int sig) 474rxvt_Exit_signal (int sig)
402{ 475{
403 signal (sig, SIG_DFL); 476 signal (sig, SIG_DFL);
404#ifdef DEBUG_CMD 477#ifdef DEBUG_CMD
405 rxvt_print_error ("signal %d", sig); 478 rxvt_warn ("caught signal %d, exiting.\n", sig);
406#endif 479#endif
407 rxvt_clean_exit (); 480 rxvt_clean_exit ();
408 kill (getpid (), sig); 481 kill (getpid (), sig);
409} 482}
410 483
… …
685 else 758 else
686 szHint.win_gravity = SouthWestGravity; 759 szHint.win_gravity = SouthWestGravity;
687 } 760 }
688 } 761 }
689 } 762 }
763
690 /* TODO: BOUNDS */ 764 /* TODO: BOUNDS */
691 TermWin.width = TermWin.ncol * TermWin.fwidth; 765 TermWin.width = TermWin.ncol * TermWin.fwidth;
692 TermWin.height = TermWin.nrow * TermWin.fheight; 766 TermWin.height = TermWin.nrow * TermWin.fheight;
693 max_width = MAX_COLS * TermWin.fwidth; 767 max_width = MAX_COLS * TermWin.fwidth;
694 max_height = MAX_ROWS * TermWin.fheight; 768 max_height = MAX_ROWS * TermWin.fheight;
695 769
696 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 770 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
697 771
698 sb_w = mb_h = 0; 772 sb_w = mb_h = 0;
699 window_vt_x = window_vt_y = 0; 773 window_vt_x = window_vt_y = TermWin.int_bwidth;
774
700 if (scrollbar_visible ()) 775 if (scrollbar_visible ())
701 { 776 {
702 sb_w = scrollbar_TotalWidth (); 777 sb_w = scrollbar_TotalWidth ();
703 szHint.base_width += sb_w; 778 szHint.base_width += sb_w;
704 if (! (Options & Opt_scrollBar_right)) 779 if (!(Options & Opt_scrollBar_right))
705 window_vt_x = sb_w; 780 window_vt_x += sb_w;
706 } 781 }
782
707 if (menubar_visible ()) 783 if (menubar_visible ())
708 { 784 {
709 mb_h = menuBar_TotalHeight (); 785 mb_h = menuBar_TotalHeight ();
710 szHint.base_height += mb_h; 786 szHint.base_height += mb_h;
711 window_vt_y = mb_h; 787 window_vt_y += mb_h;
712 } 788 }
789
713 szHint.width_inc = TermWin.fwidth; 790 szHint.width_inc = TermWin.fwidth;
714 szHint.height_inc = TermWin.fheight; 791 szHint.height_inc = TermWin.fheight;
715 szHint.min_width = szHint.base_width + szHint.width_inc; 792 szHint.min_width = szHint.base_width + szHint.width_inc;
716 szHint.min_height = szHint.base_height + szHint.height_inc; 793 szHint.min_height = szHint.base_height + szHint.height_inc;
717 794
… …
723 else 800 else
724 { 801 {
725 MIN_IT (TermWin.width, max_width); 802 MIN_IT (TermWin.width, max_width);
726 szHint.width = szHint.base_width + TermWin.width; 803 szHint.width = szHint.base_width + TermWin.width;
727 } 804 }
805
728 if (height && height - szHint.base_height < max_height) 806 if (height && height - szHint.base_height < max_height)
729 { 807 {
730 szHint.height = height; 808 szHint.height = height;
731 TermWin.height = height - szHint.base_height; 809 TermWin.height = height - szHint.base_height;
732 } 810 }
733 else 811 else
734 { 812 {
735 MIN_IT (TermWin.height, max_height); 813 MIN_IT (TermWin.height, max_height);
736 szHint.height = szHint.base_height + TermWin.height; 814 szHint.height = szHint.base_height + TermWin.height;
737 } 815 }
816
738 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 817 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
739 window_sb_x = szHint.width - sb_w; 818 window_sb_x = szHint.width - sb_w;
740 819
741 if (recalc_x) 820 if (recalc_x)
742 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 821 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
… …
817 resize_all_windows (0, 0, 0); 896 resize_all_windows (0, 0, 0);
818 scr_remap_chars (); 897 scr_remap_chars ();
819 scr_touch (true); 898 scr_touch (true);
820 } 899 }
821 900
901 for (unicode_t ch = 0x20; ch <= 0x7f; ch++)
902 TermWin.ascii_map [ch - 0x20] = fs->find_font (ch);
903
822 return true; 904 return true;
823 } 905 }
824 } 906 }
825 907
826 return false; 908 return false;
… …
836/*----------------------------------------------------------------------*/ 918/*----------------------------------------------------------------------*/
837/* xterm sequences - title, iconName, color (exptl) */ 919/* xterm sequences - title, iconName, color (exptl) */
838void 920void
839rxvt_term::set_title (const char *str) 921rxvt_term::set_title (const char *str)
840{ 922{
841#ifndef SMART_WINDOW_TITLE 923#ifdef SMART_WINDOW_TITLE
842 XStoreName (display->display, TermWin.parent[0], str);
843#else
844 char *name; 924 char *name;
845 925
846 if (XFetchName (display->display, TermWin.parent[0], &name) == 0) 926 if (!XFetchName (display->display, TermWin.parent[0], &name))
847 name = NULL; 927 name = NULL;
928
848 if (name == NULL || STRCMP (name, str)) 929 if (name == NULL || STRCMP (name, str))
930#endif
849 XStoreName (display->display, TermWin.parent[0], str); 931 XStoreName (display->display, TermWin.parent[0], str);
932
933#ifdef SMART_WINDOW_TITLE
850 if (name) 934 if (name)
851 XFree (name); 935 XFree (name);
852#endif 936#endif
853} 937}
854 938
855void 939void
856rxvt_term::set_iconName (const char *str) 940rxvt_term::set_icon_name (const char *str)
857{ 941{
858#ifndef SMART_WINDOW_TITLE 942#ifdef SMART_WINDOW_TITLE
859 XSetIconName (display->display, TermWin.parent[0], str);
860#else
861 char *name; 943 char *name;
862 944
863 if (XGetIconName (display->display, TermWin.parent[0], &name)) 945 if (!XGetIconName (display->display, TermWin.parent[0], &name))
864 name = NULL; 946 name = NULL;
947
865 if (name == NULL || STRCMP (name, str)) 948 if (name == NULL || STRCMP (name, str))
949#endif
866 XSetIconName (display->display, TermWin.parent[0], str); 950 XSetIconName (display->display, TermWin.parent[0], str);
951
952#ifdef SMART_WINDOW_TITLE
867 if (name) 953 if (name)
868 XFree (name); 954 XFree (name);
869#endif 955#endif
870} 956}
871 957
… …
885 i = atoi (color); 971 i = atoi (color);
886 if (i >= 8 && i <= 15) 972 if (i >= 8 && i <= 15)
887 { /* bright colors */ 973 { /* bright colors */
888 i -= 8; 974 i -= 8;
889# ifndef NO_BRIGHTCOLOR 975# ifndef NO_BRIGHTCOLOR
890 PixColors[idx] = PixColors[minBrightCOLOR + i]; 976 PixColorsFocused[idx] = PixColorsFocused[minBrightCOLOR + i];
891 SET_PIXCOLOR (idx); 977 SET_PIXCOLOR (idx);
892 goto Done; 978 goto Done;
893# endif 979# endif
894 980
895 } 981 }
896 if (i >= 0 && i <= 7) 982 if (i >= 0 && i <= 7)
897 { /* normal colors */ 983 { /* normal colors */
898 PixColors[idx] = PixColors[minCOLOR + i]; 984 PixColorsFocused[idx] = PixColorsFocused[minCOLOR + i];
899 SET_PIXCOLOR (idx); 985 SET_PIXCOLOR (idx);
900 goto Done; 986 goto Done;
901 } 987 }
902 } 988 }
989
903 if (!rXParseAllocColor (& xcol, color)) 990 if (!rXParseAllocColor (& xcol, color))
904 return; 991 return;
992
905 /* XStoreColor (display->display, XCMAP, XColor*); */ 993 /* XStoreColor (display->display, display->cmap, XColor*); */
906 994
907 /* 995 /*
908 * 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,
909 * so just keep gobbling up the colormap 997 * so just keep gobbling up the colormap
910 */ 998 */
… …
913 if (PixColors[idx] == PixColors[i]) 1001 if (PixColors[idx] == PixColors[i])
914 break; 1002 break;
915 if (i > Color_White) 1003 if (i > Color_White)
916 { 1004 {
917 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 1005 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
918 XFreeColors (display->display, XCMAP, (PixColors + idx), 1, 1006 XFreeColors (display->display, display->cmap, (PixColors + idx), 1,
919 DisplayPlanes (display->display, display->screen)); 1007 DisplayPlanes (display->display, display->screen));
920 } 1008 }
921# endif 1009# endif
922 1010
923 PixColors[idx] = xcol; 1011 PixColorsFocused[idx] = xcol;
924 SET_PIXCOLOR (idx); 1012 SET_PIXCOLOR (idx);
925 1013
926 /* XSetWindowAttributes attr; */ 1014 /* XSetWindowAttributes attr; */
927 /* Cursor cursor; */ 1015 /* Cursor cursor; */
928Done: 1016Done:
1017#ifdef OFF_FOCUS_FADING
1018 PixColorsUnFocused[idx] = PixColorsFocused[idx].fade (display, atoi (rs[Rs_fade]));
1019#endif
929 if (idx == Color_bg && ! (Options & Opt_transparent)) 1020 if (idx == Color_bg && ! (Options & Opt_transparent))
930 XSetWindowBackground (display->display, TermWin.vt, 1021 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
931 PixColors[Color_bg]);
932 1022
933 /* handle Color_BD, scrollbar background, etc. */ 1023 /* handle Color_BD, scrollbar background, etc. */
934 1024
935 set_colorfgbg (); 1025 set_colorfgbg ();
936 recolour_cursor (); 1026 recolour_cursor ();
937 /* the only reasonable way to enforce a clean update */ 1027 scr_touch (true);
938 scr_poweron ();
939} 1028}
940 1029
941#else 1030#else
942# define set_window_color (idx,color) ((void)0) 1031# define set_window_color (idx,color) ((void)0)
943#endif /* XTERM_COLOR_CHANGE */ 1032#endif /* XTERM_COLOR_CHANGE */
944 1033
945void 1034void
946rxvt_term::recolour_cursor () 1035rxvt_term::recolour_cursor ()
947{ 1036{
948#if TODO
949 rxvt_color xcol[2]; 1037 XColor xcol[2];
950 1038
951 xcol[0] = PixColors[Color_pointer]; 1039 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColorsFocused[Color_pointer_fg] : PixColorsFocused[Color_fg];
952 xcol[1] = PixColors[Color_bg]; 1040 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColorsFocused[Color_pointer_bg] : PixColorsFocused[Color_bg];
953 XQueryColors (display->display, XCMAP, xcol, 2); 1041 XQueryColors (display->display, display->cmap, xcol, 2);
954 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1])); 1042 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
955#endif
956} 1043}
957 1044
958/*----------------------------------------------------------------------*/ 1045/*----------------------------------------------------------------------*/
959/* 1046/*
960 * 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
… …
1009int 1096int
1010rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1097rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1011{ 1098{
1012 if (!screen_in_out->set (display, colour)) 1099 if (!screen_in_out->set (display, colour))
1013 { 1100 {
1014 rxvt_print_error ("can't allocate colour: %s", colour); 1101 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1015 return false; 1102 return false;
1016 } 1103 }
1017 1104
1018 return true; 1105 return true;
1019} 1106}
… …
1030 int old_width = szHint.width, old_height = szHint.height; 1117 int old_width = szHint.width, old_height = szHint.height;
1031#endif 1118#endif
1032 1119
1033 window_calc (width, height); 1120 window_calc (width, height);
1034 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1121 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
1122
1035 if (!ignoreparent) 1123 if (!ignoreparent)
1036 { 1124 {
1037#ifdef SMART_RESIZE 1125#ifdef SMART_RESIZE
1038 /* 1126 /*
1039 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 1127 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
… …
1074 dy /= 2; 1162 dy /= 2;
1075 1163
1076 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1164 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
1077 szHint.width, szHint.height); 1165 szHint.width, szHint.height);
1078#else 1166#else
1079 XResizeWindow (display->display, TermWin.parent[0], szHint.width, 1167 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height);
1080 szHint.height);
1081#endif 1168#endif
1082
1083 } 1169 }
1084 1170
1085 fix_screen = (TermWin.ncol != prev_ncol 1171 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
1086 || TermWin.nrow != prev_nrow);
1087 1172
1088 if (fix_screen || width != old_width || height != old_height) 1173 if (fix_screen || width != old_width || height != old_height)
1089 { 1174 {
1090 if (scrollbar_visible ()) 1175 if (scrollbar_visible ())
1091 { 1176 {
1092 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x, 1177 XMoveResizeWindow (display->display, scrollBar.win,
1178 window_sb_x, 0,
1093 0, scrollbar_TotalWidth (), szHint.height); 1179 scrollbar_TotalWidth (), szHint.height);
1094 resize_scrollbar (); 1180 resize_scrollbar ();
1095 } 1181 }
1096 1182
1097 if (menubar_visible ()) 1183 if (menubar_visible ())
1098 XMoveResizeWindow (display->display, menuBar.win, window_vt_x, 1184 XMoveResizeWindow (display->display, menuBar.win,
1185 window_vt_x, 0,
1099 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1186 TermWin_TotalWidth (), menuBar_TotalHeight ());
1100 1187
1101 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1188 XMoveResizeWindow (display->display, TermWin.vt,
1102 window_vt_y, TermWin_TotalWidth (), 1189 window_vt_x, window_vt_y,
1103 TermWin_TotalHeight ()); 1190 TermWin_TotalWidth (), TermWin_TotalHeight ());
1104 scr_clear (height != old_height); 1191 scr_clear ();
1105#ifdef XPM_BACKGROUND 1192#ifdef XPM_BACKGROUND
1106 resize_pixmap (); 1193 resize_pixmap ();
1107#endif 1194#endif
1108
1109 } 1195 }
1110 1196
1111 if (fix_screen || old_height == 0) 1197 if (fix_screen || old_height == 0)
1112 { 1198 {
1113 int curr_screen = -1; 1199 int curr_screen = -1;
… …
1154 if (width == 0) 1240 if (width == 0)
1155 width = wattr.width - szHint.base_width; 1241 width = wattr.width - szHint.base_width;
1156 if (height == 0) 1242 if (height == 0)
1157 height = wattr.height - szHint.base_height; 1243 height = wattr.height - szHint.base_height;
1158 } 1244 }
1245
1159 if (width != TermWin.width || height != TermWin.height) 1246 if (width != TermWin.width || height != TermWin.height)
1160 { 1247 {
1161 width += szHint.base_width; 1248 width += szHint.base_width;
1162 height += szHint.base_height; 1249 height += szHint.base_height;
1163 resize_all_windows (width, height, 0); 1250 resize_all_windows (width, height, 0);
… …
1386 if (preedit_attr) XFree (preedit_attr); 1473 if (preedit_attr) XFree (preedit_attr);
1387 if (status_attr) XFree (status_attr); 1474 if (status_attr) XFree (status_attr);
1388 1475
1389 if (Input_Context == NULL) 1476 if (Input_Context == NULL)
1390 { 1477 {
1391 rxvt_print_error ("failed to create input context"); 1478 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1392 display->put_xim (input_method); 1479 display->put_xim (input_method);
1393 return false; 1480 return false;
1394 } 1481 }
1395 1482
1396 if (input_style & XIMPreeditArea) 1483 if (input_style & XIMPreeditArea)

Diff Legend

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