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.33 by pcg, Fri Feb 13 13:28:17 2004 UTC vs.
Revision 1.60 by pcg, Sun Mar 28 02:07:08 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>
… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
16 * 17 *
17 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
20 * (at your option) any later version. 21 * (at your option) any later version.
… …
55 STRNCPY (curlocale, locale, 128); 56 STRNCPY (curlocale, locale, 128);
56 setlocale (LC_CTYPE, curlocale); 57 setlocale (LC_CTYPE, curlocale);
57 } 58 }
58} 59}
59 60
61#if ENABLE_COMBINING
62class rxvt_composite_vec rxvt_composite;
63
64text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
65{
66 compose_char *cc;
67
68 // break compose chains, as stupid readline really likes to duplicate
69 // composing characters for some reason near the end of a line.
70 cc = (*this)[c1];
71 while (cc)
72 {
73 if (cc->c2 == c2) return c1;
74 cc = (*this)[cc->c1];
75 }
76
77 // check to see wether this combination already exists otherwise
78 for (cc = v.end (); cc-- > v.begin (); )
79 {
80 if (cc->c1 == c1 && cc->c2 == c2)
81 return COMPOSE_LO + (cc - v.begin ());
82 }
83
84 // allocate a new combination
85 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
86 {
87 static int seen;
88
89 if (!seen++)
90 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");
91
92 return REPLACEMENT_CHAR;
93 }
94
95 v.push_back (compose_char (c1, c2));
96
97 return v.size () - 1 + COMPOSE_LO;
98}
99
100int rxvt_composite_vec::expand (unicode_t c, wchar_t *r)
101{
102 compose_char *cc = (*this)[c];
103
104 if (!cc)
105 {
106 if (r) *r = c;
107 return 1;
108 }
109
110 int len = expand (cc->c1, r);
111
112 if (r) r += len;
113
114 if (cc->c2 != NOCHAR)
115 {
116 len++;
117 if (r) *r++ = cc->c2;
118 }
119
120 return len;
121
122}
123#endif
124
60void * 125void *
61rxvt_term::operator new (size_t s) 126rxvt_term::operator new (size_t s)
62{ 127{
63 void *p = malloc (s); 128 void *p = malloc (s);
64 129
… …
79 vt_ev (this, &rxvt_term::x_cb), 144 vt_ev (this, &rxvt_term::x_cb),
80#ifdef HAVE_SCROLLBARS 145#ifdef HAVE_SCROLLBARS
81 scrollbar_ev (this, &rxvt_term::x_cb), 146 scrollbar_ev (this, &rxvt_term::x_cb),
82#endif 147#endif
83#ifdef MENUBAR 148#ifdef MENUBAR
84 menubar_ev (this, &rxvt_term::x_cb), fixme 149 menubar_ev (this, &rxvt_term::x_cb),
85#endif 150#endif
86#ifdef CURSOR_BLINK 151#ifdef CURSOR_BLINK
87 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 152 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
88#endif 153#endif
89#ifdef TEXT_BLINK 154#ifdef TEXT_BLINK
90 text_blink_ev (this, &rxvt_term::text_blink_cb), 155 text_blink_ev (this, &rxvt_term::text_blink_cb),
91#endif 156#endif
92#ifdef POINTER_BLANK 157#ifdef POINTER_BLANK
93 pointer_ev (this, &rxvt_term::pointer_cb), 158 pointer_ev (this, &rxvt_term::pointer_cb),
159#endif
160#ifdef USE_XIM
161 im_ev (this, &rxvt_term::im_cb),
94#endif 162#endif
95 check_ev (this, &rxvt_term::check_cb), 163 check_ev (this, &rxvt_term::check_cb),
96 destroy_ev (this, &rxvt_term::destroy_cb), 164 destroy_ev (this, &rxvt_term::destroy_cb),
97 pty_ev (this, &rxvt_term::pty_cb), 165 pty_ev (this, &rxvt_term::pty_cb),
98 incr_ev (this, &rxvt_term::incr_cb), 166 incr_ev (this, &rxvt_term::incr_cb)
99#ifdef USE_XIM
100 im_ev (this, &rxvt_term::im_cb)
101#endif
102{ 167{
103 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 168 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
104} 169}
105 170
106rxvt_term::~rxvt_term () 171rxvt_term::~rxvt_term ()
107{ 172{
108 if (cmd_fd >= 0) 173 if (cmd_fd >= 0)
109 close (cmd_fd); 174 close (cmd_fd);
110 175
176#ifndef NO_SETOWNER_TTYDEV
177 privileged_ttydev (RESTORE);
178#endif
179#ifdef UTMP_SUPPORT
180 privileged_utmp (RESTORE);
181#endif
182
183 delete TermWin.fontset;
184
185 if (display)
186 {
187 selection_clear ();
188
189#ifdef MENUBAR
190 if (menubarGC) XFreeGC (display->display, menubarGC);
191#endif
192#ifdef XTERM_SCROLLBAR
193 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
194 if (ShadowGC) XFreeGC (display->display, ShadowGC);
195#endif
196#ifdef PLAIN_SCROLLBAR
197 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC);
198#endif
199#ifdef NEXT_SCROLLBAR
200 if (blackGC) XFreeGC (display->display, blackGC);
201 if (whiteGC) XFreeGC (display->display, whiteGC);
202 if (grayGC) XFreeGC (display->display, grayGC);
203 if (darkGC) XFreeGC (display->display, darkGC);
204 if (stippleGC) XFreeGC (display->display, stippleGC);
205 if (dimple) XFreePixmap (display->display, dimple);
206 if (upArrow) XFreePixmap (display->display, upArrow);
207 if (downArrow) XFreePixmap (display->display, downArrow);
208 if (upArrowHi) XFreePixmap (display->display, upArrowHi);
209 if (downArrowHi) XFreePixmap (display->display, downArrowHi);
210#endif
211#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
212 if (topShadowGC) XFreeGC (display->display, topShadowGC);
213 if (botShadowGC) XFreeGC (display->display, botShadowGC);
214 if (scrollbarGC) XFreeGC (display->display, scrollbarGC);
215#endif
216 if (TermWin.gc) XFreeGC (display->display, TermWin.gc);
217
218#if defined(MENUBAR) && (MENUBAR_MAX > 1)
219 delete menuBar.drawable;
220 //if (menuBar.win)
221 // XDestroyWindow (display->display, menuBar.win);
222#endif
223 delete TermWin.drawable;
224 // destroy all windows
225 if (TermWin.parent[0])
226 XDestroyWindow (display->display, TermWin.parent[0]);
227 }
228
229 // TODO: free pixcolours, colours should become part of rxvt_display
230
231 delete PixColors;
232
233 displays.put (display);
234
111 scr_release (); 235 scr_release ();
112 236
237 /* clear all resources */
238 for (int i = 0; i < allocated.size (); i++)
239 free (allocated[i]);
240
241 free (selection.text);
242 // TODO: manage env vars in child only(!)
113 free (env_windowid); 243 free (env_windowid);
114 free (env_display); 244 free (env_display);
115 free (env_term); 245 free (env_term);
116 free (env_colorfgbg); 246 free (env_colorfgbg);
117 free (locale); 247 free (locale);
248#if 0
118 free (codeset); 249 free (codeset);
119
120#ifndef NO_SETOWNER_TTYDEV
121 privileged_ttydev (RESTORE);
122#endif 250#endif
123#ifdef UTMP_SUPPORT
124 privileged_utmp (RESTORE);
125#endif
126
127 // TODO: free pixcolours, colours should become part of rxvt_display
128
129 delete PixColors;
130 delete TermWin.fontset;
131
132 displays.put (display);
133 251
134 delete envv; 252 delete envv;
135 delete argv; 253 delete argv;
136} 254}
137 255
138void 256void
139rxvt_term::destroy () 257rxvt_term::destroy ()
140{ 258{
141 if (display) 259 if (display)
142 { 260 {
143 if (TermWin.parent[0])
144 XDestroyWindow (display->display, TermWin.parent[0]);
145
146 rootwin_ev.stop (display); 261 rootwin_ev.stop (display);
147 termwin_ev.stop (display); 262 termwin_ev.stop (display);
148 vt_ev.stop (display); 263 vt_ev.stop (display);
149
150#ifdef USE_XIM 264#ifdef USE_XIM
151 im_destroy (); 265 im_destroy ();
152 im_ev.stop (display); 266 im_ev.stop (display);
153#endif 267#endif
154#ifdef HAVE_SCROLLBARS 268#ifdef HAVE_SCROLLBARS
… …
182 delete this; 296 delete this;
183} 297}
184 298
185/*----------------------------------------------------------------------*/ 299/*----------------------------------------------------------------------*/
186/* rxvt_init () */ 300/* rxvt_init () */
187/* LIBPROTO */
188rxvt_t
189rxvt_init (int argc, const char *const *argv)
190{
191 SET_R (new rxvt_term);
192
193 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
194 {
195 delete GET_R;
196 SET_R (0);
197 }
198
199 return GET_R;
200}
201
202static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
203
204void
205rxvt_init_signals ()
206{
207 /* install exit handler for cleanup */
208#if 0
209#ifdef HAVE_ATEXIT
210 atexit (rxvt_clean_exit);
211#else
212#endif
213#endif
214
215 struct sigaction sa;
216
217 sigfillset (&sa.sa_mask);
218 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
219 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
220 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
221 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
222 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
223 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
224 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
225
226 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
227 /* signal (SIGURG, SIG_DFL); */
228
229 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
230 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
231}
232
233bool 301bool
234rxvt_term::init (int argc, const char *const *argv) 302rxvt_term::init (int argc, const char *const *argv)
235{ 303{
304 SET_R (this);
305
306 if (!init_vars ())
307 return false;
308
236 /* 309 /*
237 * Save and then give up any super-user privileges 310 * Save and then give up any super-user privileges
238 * If we need privileges in any area then we must specifically request it. 311 * If we need privileges in any area then we must specifically request it.
239 * We should only need to be root in these cases: 312 * We should only need to be root in these cases:
240 * 1. write utmp entries on some systems 313 * 1. write utmp entries on some systems
… …
247 320
248 const char **cmd_argv = init_resources (argc, argv); 321 const char **cmd_argv = init_resources (argc, argv);
249 322
250 set_locale (""); 323 set_locale ("");
251 324
252#if (MENUBAR_MAX) 325#if MENUBAR_MAX
253 menubar_read (rs[Rs_menu]); 326 menubar_read (rs[Rs_menu]);
254#endif 327#endif
255#ifdef HAVE_SCROLLBARS 328#ifdef HAVE_SCROLLBARS
256 if (Options & Opt_scrollBar) 329 if (Options & Opt_scrollBar)
257 scrollBar.setIdle (); /* set existence for size calculations */ 330 scrollBar.setIdle (); /* set existence for size calculations */
… …
260 create_windows (argc, argv); 333 create_windows (argc, argv);
261 334
262 init_xlocale (); 335 init_xlocale ();
263 336
264 scr_reset (); /* initialize screen */ 337 scr_reset (); /* initialize screen */
265#ifdef RXVT_GRAPHICS
266 Gr_reset (); /* reset graphics */
267#endif
268 338
269#if 0 339#if 0
270#ifdef DEBUG_X
271 XSynchronize (display->display, True); 340 XSynchronize (display->display, True);
272#endif
273#endif 341#endif
274 342
275#ifdef HAVE_SCROLLBARS 343#ifdef HAVE_SCROLLBARS
276 if (Options & Opt_scrollBar) 344 if (Options & Opt_scrollBar)
277 resize_scrollbar (); /* create and map scrollbar */ 345 resize_scrollbar (); /* create and map scrollbar */
278#endif 346#endif
279#if (MENUBAR_MAX) 347#if (MENUBAR_MAX)
280 if (menubar_visible (r)) 348 if (menubar_visible ())
281 XMapWindow (display->display, menuBar.win); 349 XMapWindow (display->display, menuBar.win);
282#endif 350#endif
283#ifdef TRANSPARENT 351#ifdef TRANSPARENT
284 if (Options & Opt_transparent) 352 if (Options & Opt_transparent)
285 { 353 {
… …
298 pty_ev.start (cmd_fd, EVENT_READ); 366 pty_ev.start (cmd_fd, EVENT_READ);
299 367
300 check_ev.start (); 368 check_ev.start ();
301 369
302 return true; 370 return true;
371}
372
373static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
374
375void
376rxvt_init_signals ()
377{
378 /* install exit handler for cleanup */
379#if 0
380#ifdef HAVE_ATEXIT
381 atexit (rxvt_clean_exit);
382#else
383#endif
384#endif
385
386 struct sigaction sa;
387
388 sigfillset (&sa.sa_mask);
389 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
390 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
391 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
392 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
393 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
394 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
395 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
396
397 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
398 /* signal (SIGURG, SIG_DFL); */
399
400 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
401 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
303} 402}
304 403
305/* ------------------------------------------------------------------------- * 404/* ------------------------------------------------------------------------- *
306 * SIGNAL HANDLING & EXIT HANDLER * 405 * SIGNAL HANDLING & EXIT HANDLER *
307 * ------------------------------------------------------------------------- */ 406 * ------------------------------------------------------------------------- */
… …
331RETSIGTYPE 430RETSIGTYPE
332rxvt_Exit_signal (int sig) 431rxvt_Exit_signal (int sig)
333{ 432{
334 signal (sig, SIG_DFL); 433 signal (sig, SIG_DFL);
335#ifdef DEBUG_CMD 434#ifdef DEBUG_CMD
336 rxvt_print_error ("signal %d", sig); 435 rxvt_warn ("caught signal %d, exiting.\n", sig);
337#endif 436#endif
338 rxvt_clean_exit (); 437 rxvt_clean_exit ();
339 kill (getpid (), sig); 438 kill (getpid (), sig);
340} 439}
341 440
… …
379 478
380 p = malloc (size); 479 p = malloc (size);
381 if (p) 480 if (p)
382 return p; 481 return p;
383 482
384 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 483 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
385 rxvt_clean_exit (); 484 rxvt_clean_exit ();
386 exit (EXIT_FAILURE); 485 exit (EXIT_FAILURE);
387 /* NOTREACHED */ 486 /* NOTREACHED */
388} 487}
389 488
… …
395 494
396 p = calloc (number, size); 495 p = calloc (number, size);
397 if (p) 496 if (p)
398 return p; 497 return p;
399 498
400 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 499 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
401 rxvt_clean_exit (); 500 rxvt_clean_exit ();
402 exit (EXIT_FAILURE); 501 exit (EXIT_FAILURE);
403 /* NOTREACHED */ 502 /* NOTREACHED */
404} 503}
405 504
… …
414 else 513 else
415 p = malloc (size); 514 p = malloc (size);
416 if (p) 515 if (p)
417 return p; 516 return p;
418 517
419 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 518 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
420 rxvt_clean_exit (); 519 rxvt_clean_exit ();
421 exit (EXIT_FAILURE); 520 exit (EXIT_FAILURE);
422 /* NOTREACHED */ 521 /* NOTREACHED */
423} 522}
424 523
… …
616 else 715 else
617 szHint.win_gravity = SouthWestGravity; 716 szHint.win_gravity = SouthWestGravity;
618 } 717 }
619 } 718 }
620 } 719 }
720
621 /* TODO: BOUNDS */ 721 /* TODO: BOUNDS */
622 TermWin.width = TermWin.ncol * TermWin.fwidth; 722 TermWin.width = TermWin.ncol * TermWin.fwidth;
623 TermWin.height = TermWin.nrow * TermWin.fheight; 723 TermWin.height = TermWin.nrow * TermWin.fheight;
624 max_width = MAX_COLS * TermWin.fwidth; 724 max_width = MAX_COLS * TermWin.fwidth;
625 max_height = MAX_ROWS * TermWin.fheight; 725 max_height = MAX_ROWS * TermWin.fheight;
… …
718 * init = 1 - initialize 818 * init = 1 - initialize
719 * 819 *
720 * fontname == FONT_UP - switch to bigger font 820 * fontname == FONT_UP - switch to bigger font
721 * fontname == FONT_DN - switch to smaller font 821 * fontname == FONT_DN - switch to smaller font
722 */ 822 */
723void 823bool
724rxvt_term::change_font (int init, const char *fontname) 824rxvt_term::change_font (const char *fontname)
725{} 825{
826 if (fontname == FONT_UP)
827 {
828 // TODO
829 }
830 else if (fontname == FONT_DN)
831 {
832 // TODO
833 }
834 else
835 {
836 rxvt_fontset *fs = new rxvt_fontset (this);
726 837
727void 838 if (fs && fs->populate (fontname ? fontname : "fixed"))
839 {
840 delete TermWin.fontset;
841 TermWin.fontset = fs;
842 TermWin.fwidth = fs->base_font ()->width;
843 TermWin.fheight = fs->base_font ()->height;
844 TermWin.fbase = fs->base_font ()->ascent;
845
846 if (TermWin.parent[0])
847 {
848 resize_all_windows (0, 0, 0);
849 scr_remap_chars ();
850 scr_touch (true);
851 }
852
853 return true;
854 }
855 }
856
857 return false;
858}
859
860bool
728rxvt_term::font_up_down (int n, int direction) 861rxvt_term::font_up_down (int n, int direction)
729{} 862{
863 return false;
864}
730 865
731/*----------------------------------------------------------------------*/ 866/*----------------------------------------------------------------------*/
732/*----------------------------------------------------------------------*/ 867/*----------------------------------------------------------------------*/
733/* xterm sequences - title, iconName, color (exptl) */ 868/* xterm sequences - title, iconName, color (exptl) */
734void 869void
735rxvt_term::set_title (const char *str) 870rxvt_term::set_title (const char *str)
736{ 871{
737#ifndef SMART_WINDOW_TITLE 872#ifndef SMART_WINDOW_TITLE
738 XStoreName (display->display, TermWin.parent[0], str); 873 XStoreName (display->display, TermWin.parent[0], str);
739#else 874#else
740 char *name; 875 char *name;
741 876
742 if (XFetchName (display->display, TermWin.parent[0], &name) == 0) 877 if (!XFetchName (display->display, TermWin.parent[0], &name))
743 name = NULL; 878 name = NULL;
879
744 if (name == NULL || STRCMP (name, str)) 880 if (name == NULL || STRCMP (name, str))
745 XStoreName (display->display, TermWin.parent[0], str); 881 XStoreName (display->display, TermWin.parent[0], str);
882
746 if (name) 883 if (name)
747 XFree (name); 884 XFree (name);
748#endif 885#endif
749} 886}
750 887
751void 888void
752rxvt_term::set_iconName (const char *str) 889rxvt_term::set_icon_name (const char *str)
753{ 890{
754#ifndef SMART_WINDOW_TITLE 891#ifndef SMART_WINDOW_TITLE
755 XSetIconName (display->display, TermWin.parent[0], str); 892 XSetIconName (display->display, TermWin.parent[0], str);
756#else 893#else
757 char *name; 894 char *name;
758 895
759 if (XGetIconName (display->display, TermWin.parent[0], &name)) 896 if (!XGetIconName (display->display, TermWin.parent[0], &name))
760 name = NULL; 897 name = NULL;
898
761 if (name == NULL || STRCMP (name, str)) 899 if (name == NULL || STRCMP (name, str))
762 XSetIconName (display->display, TermWin.parent[0], str); 900 XSetIconName (display->display, TermWin.parent[0], str);
901
763 if (name) 902 if (name)
764 XFree (name); 903 XFree (name);
765#endif 904#endif
766} 905}
767 906
768#ifdef XTERM_COLOR_CHANGE 907#ifdef XTERM_COLOR_CHANGE
769void 908void
770rxvt_term::set_window_color (int idx, const char *color) 909rxvt_term::set_window_color (int idx, const char *color)
771{ 910{
772 rxvt_color xcol; 911 rxvt_color xcol;
773 int i; 912 int i;
774 913
775 if (color == NULL || *color == '\0') 914 if (color == NULL || *color == '\0')
776 return; 915 return;
777 916
778 /* handle color aliases */ 917 /* handle color aliases */
… …
905int 1044int
906rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1045rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
907{ 1046{
908 if (!screen_in_out->set (display, colour)) 1047 if (!screen_in_out->set (display, colour))
909 { 1048 {
910 rxvt_print_error ("can't allocate colour: %s", colour); 1049 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
911 return false; 1050 return false;
912 } 1051 }
913 1052
914 return true; 1053 return true;
915} 1054}
… …
995 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1134 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
996 1135
997 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1136 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
998 window_vt_y, TermWin_TotalWidth (), 1137 window_vt_y, TermWin_TotalWidth (),
999 TermWin_TotalHeight ()); 1138 TermWin_TotalHeight ());
1000#ifdef RXVT_GRAPHICS 1139 scr_clear (height != old_height);
1001 if (old_height)
1002 Gr_Resize (old_width - szHint.base_width,
1003 old_height - szHint.base_height);
1004#endif
1005 scr_clear ();
1006#ifdef XPM_BACKGROUND 1140#ifdef XPM_BACKGROUND
1007 resize_pixmap (); 1141 resize_pixmap ();
1008#endif 1142#endif
1009 1143
1010 } 1144 }
… …
1287 if (preedit_attr) XFree (preedit_attr); 1421 if (preedit_attr) XFree (preedit_attr);
1288 if (status_attr) XFree (status_attr); 1422 if (status_attr) XFree (status_attr);
1289 1423
1290 if (Input_Context == NULL) 1424 if (Input_Context == NULL)
1291 { 1425 {
1292 rxvt_print_error ("failed to create input context"); 1426 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1293 display->put_xim (input_method); 1427 display->put_xim (input_method);
1294 return false; 1428 return false;
1295 } 1429 }
1296 1430
1297 if (input_style & XIMPreeditArea) 1431 if (input_style & XIMPreeditArea)
… …
1315 if (Input_Context) 1449 if (Input_Context)
1316 return; 1450 return;
1317 1451
1318#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1452#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1319 if (rs[Rs_imLocale]) 1453 if (rs[Rs_imLocale])
1320 setlocale (LC_CTYPE, rs[Rs_imLocale]); 1454 SET_LOCALE (rs[Rs_imLocale]);
1321#endif 1455#endif
1322 1456
1323 p = rs[Rs_inputMethod]; 1457 p = rs[Rs_inputMethod];
1324 if (p && *p) 1458 if (p && *p)
1325 { 1459 {
… …
1356 goto done; 1490 goto done;
1357 1491
1358done: 1492done:
1359#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1493#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1360 if (rs[Rs_imLocale]) 1494 if (rs[Rs_imLocale])
1361 setlocale (LC_CTYPE, locale); 1495 SET_LOCALE (locale);
1362#endif 1496#endif
1363} 1497}
1364 1498
1365void 1499void
1366rxvt_term::IMSetStatusPosition () 1500rxvt_term::IMSetStatusPosition ()

Diff Legend

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