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

Diff Legend

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