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.32 by pcg, Fri Feb 13 12:16:21 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
111 scr_release ();
112
113 free (locale);
114 free (codeset);
115
116#ifndef NO_SETOWNER_TTYDEV 176#ifndef NO_SETOWNER_TTYDEV
117 privileged_ttydev (RESTORE); 177 privileged_ttydev (RESTORE);
118#endif 178#endif
119#ifdef UTMP_SUPPORT 179#ifdef UTMP_SUPPORT
120 privileged_utmp (RESTORE); 180 privileged_utmp (RESTORE);
121#endif 181#endif
122 182
123 // TODO: free pixcolours, colours should become part of rxvt_display
124
125 delete PixColors;
126 delete TermWin.fontset; 183 delete TermWin.fontset;
127 184
128 displays.put (display);
129}
130
131void
132rxvt_term::destroy ()
133{
134 if (display) 185 if (display)
135 { 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
136 if (TermWin.parent[0]) 225 if (TermWin.parent[0])
137 XDestroyWindow (display->display, TermWin.parent[0]); 226 XDestroyWindow (display->display, TermWin.parent[0]);
227 }
138 228
229 // TODO: free pixcolours, colours should become part of rxvt_display
230
231 delete PixColors;
232
233 displays.put (display);
234
235 scr_release ();
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(!)
243 free (env_windowid);
244 free (env_display);
245 free (env_term);
246 free (env_colorfgbg);
247 free (locale);
248#if 0
249 free (codeset);
250#endif
251
252 delete envv;
253 delete argv;
254}
255
256void
257rxvt_term::destroy ()
258{
259 if (display)
260 {
139 rootwin_ev.stop (display); 261 rootwin_ev.stop (display);
140 termwin_ev.stop (display); 262 termwin_ev.stop (display);
141 vt_ev.stop (display); 263 vt_ev.stop (display);
142
143#ifdef USE_XIM 264#ifdef USE_XIM
144 im_destroy (); 265 im_destroy ();
145 im_ev.stop (display); 266 im_ev.stop (display);
146#endif 267#endif
147#ifdef HAVE_SCROLLBARS 268#ifdef HAVE_SCROLLBARS
… …
175 delete this; 296 delete this;
176} 297}
177 298
178/*----------------------------------------------------------------------*/ 299/*----------------------------------------------------------------------*/
179/* rxvt_init () */ 300/* rxvt_init () */
180/* LIBPROTO */
181rxvt_t
182rxvt_init (int argc, const char *const *argv)
183{
184 SET_R (new rxvt_term);
185
186 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
187 {
188 delete GET_R;
189 SET_R (0);
190 }
191
192 return GET_R;
193}
194
195static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
196
197void
198rxvt_init_signals ()
199{
200 /* install exit handler for cleanup */
201#if 0
202#ifdef HAVE_ATEXIT
203 atexit (rxvt_clean_exit);
204#else
205#endif
206#endif
207
208 struct sigaction sa;
209
210 sigfillset (&sa.sa_mask);
211 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
212 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
213 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
214 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
215 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
216 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
217 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
218
219 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
220 /* signal (SIGURG, SIG_DFL); */
221
222 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
223 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
224}
225
226bool 301bool
227rxvt_term::init (int argc, const char *const *argv) 302rxvt_term::init (int argc, const char *const *argv)
228{ 303{
304 SET_R (this);
305
306 if (!init_vars ())
307 return false;
308
229 /* 309 /*
230 * Save and then give up any super-user privileges 310 * Save and then give up any super-user privileges
231 * 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.
232 * We should only need to be root in these cases: 312 * We should only need to be root in these cases:
233 * 1. write utmp entries on some systems 313 * 1. write utmp entries on some systems
… …
240 320
241 const char **cmd_argv = init_resources (argc, argv); 321 const char **cmd_argv = init_resources (argc, argv);
242 322
243 set_locale (""); 323 set_locale ("");
244 324
245#if (MENUBAR_MAX) 325#if MENUBAR_MAX
246 menubar_read (rs[Rs_menu]); 326 menubar_read (rs[Rs_menu]);
247#endif 327#endif
248#ifdef HAVE_SCROLLBARS 328#ifdef HAVE_SCROLLBARS
249 if (Options & Opt_scrollBar) 329 if (Options & Opt_scrollBar)
250 scrollBar.setIdle (); /* set existence for size calculations */ 330 scrollBar.setIdle (); /* set existence for size calculations */
… …
253 create_windows (argc, argv); 333 create_windows (argc, argv);
254 334
255 init_xlocale (); 335 init_xlocale ();
256 336
257 scr_reset (); /* initialize screen */ 337 scr_reset (); /* initialize screen */
258#ifdef RXVT_GRAPHICS
259 Gr_reset (); /* reset graphics */
260#endif
261 338
262#if 0 339#if 0
263#ifdef DEBUG_X
264 XSynchronize (display->display, True); 340 XSynchronize (display->display, True);
265#endif
266#endif 341#endif
267 342
268#ifdef HAVE_SCROLLBARS 343#ifdef HAVE_SCROLLBARS
269 if (Options & Opt_scrollBar) 344 if (Options & Opt_scrollBar)
270 resize_scrollbar (); /* create and map scrollbar */ 345 resize_scrollbar (); /* create and map scrollbar */
271#endif 346#endif
272#if (MENUBAR_MAX) 347#if (MENUBAR_MAX)
273 if (menubar_visible (r)) 348 if (menubar_visible ())
274 XMapWindow (display->display, menuBar.win); 349 XMapWindow (display->display, menuBar.win);
275#endif 350#endif
276#ifdef TRANSPARENT 351#ifdef TRANSPARENT
277 if (Options & Opt_transparent) 352 if (Options & Opt_transparent)
278 { 353 {
… …
284 rootwin_ev.start (display, display->root); 359 rootwin_ev.start (display, display->root);
285 360
286 XMapWindow (display->display, TermWin.vt); 361 XMapWindow (display->display, TermWin.vt);
287 XMapWindow (display->display, TermWin.parent[0]); 362 XMapWindow (display->display, TermWin.parent[0]);
288 363
289 init_env ();
290 init_command (cmd_argv); 364 init_command (cmd_argv);
291 365
292 pty_ev.start (cmd_fd, EVENT_READ); 366 pty_ev.start (cmd_fd, EVENT_READ);
293 367
294 check_ev.start (); 368 check_ev.start ();
295 369
296 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);
297} 402}
298 403
299/* ------------------------------------------------------------------------- * 404/* ------------------------------------------------------------------------- *
300 * SIGNAL HANDLING & EXIT HANDLER * 405 * SIGNAL HANDLING & EXIT HANDLER *
301 * ------------------------------------------------------------------------- */ 406 * ------------------------------------------------------------------------- */
… …
325RETSIGTYPE 430RETSIGTYPE
326rxvt_Exit_signal (int sig) 431rxvt_Exit_signal (int sig)
327{ 432{
328 signal (sig, SIG_DFL); 433 signal (sig, SIG_DFL);
329#ifdef DEBUG_CMD 434#ifdef DEBUG_CMD
330 rxvt_print_error ("signal %d", sig); 435 rxvt_warn ("caught signal %d, exiting.\n", sig);
331#endif 436#endif
332 rxvt_clean_exit (); 437 rxvt_clean_exit ();
333 kill (getpid (), sig); 438 kill (getpid (), sig);
334} 439}
335 440
… …
373 478
374 p = malloc (size); 479 p = malloc (size);
375 if (p) 480 if (p)
376 return p; 481 return p;
377 482
378 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 483 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
379 rxvt_clean_exit (); 484 rxvt_clean_exit ();
380 exit (EXIT_FAILURE); 485 exit (EXIT_FAILURE);
381 /* NOTREACHED */ 486 /* NOTREACHED */
382} 487}
383 488
… …
389 494
390 p = calloc (number, size); 495 p = calloc (number, size);
391 if (p) 496 if (p)
392 return p; 497 return p;
393 498
394 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 499 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
395 rxvt_clean_exit (); 500 rxvt_clean_exit ();
396 exit (EXIT_FAILURE); 501 exit (EXIT_FAILURE);
397 /* NOTREACHED */ 502 /* NOTREACHED */
398} 503}
399 504
… …
408 else 513 else
409 p = malloc (size); 514 p = malloc (size);
410 if (p) 515 if (p)
411 return p; 516 return p;
412 517
413 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 518 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
414 rxvt_clean_exit (); 519 rxvt_clean_exit ();
415 exit (EXIT_FAILURE); 520 exit (EXIT_FAILURE);
416 /* NOTREACHED */ 521 /* NOTREACHED */
417} 522}
418 523
… …
610 else 715 else
611 szHint.win_gravity = SouthWestGravity; 716 szHint.win_gravity = SouthWestGravity;
612 } 717 }
613 } 718 }
614 } 719 }
720
615 /* TODO: BOUNDS */ 721 /* TODO: BOUNDS */
616 TermWin.width = TermWin.ncol * TermWin.fwidth; 722 TermWin.width = TermWin.ncol * TermWin.fwidth;
617 TermWin.height = TermWin.nrow * TermWin.fheight; 723 TermWin.height = TermWin.nrow * TermWin.fheight;
618 max_width = MAX_COLS * TermWin.fwidth; 724 max_width = MAX_COLS * TermWin.fwidth;
619 max_height = MAX_ROWS * TermWin.fheight; 725 max_height = MAX_ROWS * TermWin.fheight;
… …
712 * init = 1 - initialize 818 * init = 1 - initialize
713 * 819 *
714 * fontname == FONT_UP - switch to bigger font 820 * fontname == FONT_UP - switch to bigger font
715 * fontname == FONT_DN - switch to smaller font 821 * fontname == FONT_DN - switch to smaller font
716 */ 822 */
717void 823bool
718rxvt_term::change_font (int init, const char *fontname) 824rxvt_term::change_font (const char *fontname)
719{} 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);
720 837
721void 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
722rxvt_term::font_up_down (int n, int direction) 861rxvt_term::font_up_down (int n, int direction)
723{} 862{
863 return false;
864}
724 865
725/*----------------------------------------------------------------------*/ 866/*----------------------------------------------------------------------*/
726/*----------------------------------------------------------------------*/ 867/*----------------------------------------------------------------------*/
727/* xterm sequences - title, iconName, color (exptl) */ 868/* xterm sequences - title, iconName, color (exptl) */
728void 869void
729rxvt_term::set_title (const char *str) 870rxvt_term::set_title (const char *str)
730{ 871{
731#ifndef SMART_WINDOW_TITLE 872#ifndef SMART_WINDOW_TITLE
732 XStoreName (display->display, TermWin.parent[0], str); 873 XStoreName (display->display, TermWin.parent[0], str);
733#else 874#else
734 char *name; 875 char *name;
735 876
736 if (XFetchName (display->display, TermWin.parent[0], &name) == 0) 877 if (!XFetchName (display->display, TermWin.parent[0], &name))
737 name = NULL; 878 name = NULL;
879
738 if (name == NULL || STRCMP (name, str)) 880 if (name == NULL || STRCMP (name, str))
739 XStoreName (display->display, TermWin.parent[0], str); 881 XStoreName (display->display, TermWin.parent[0], str);
882
740 if (name) 883 if (name)
741 XFree (name); 884 XFree (name);
742#endif 885#endif
743} 886}
744 887
745void 888void
746rxvt_term::set_iconName (const char *str) 889rxvt_term::set_icon_name (const char *str)
747{ 890{
748#ifndef SMART_WINDOW_TITLE 891#ifndef SMART_WINDOW_TITLE
749 XSetIconName (display->display, TermWin.parent[0], str); 892 XSetIconName (display->display, TermWin.parent[0], str);
750#else 893#else
751 char *name; 894 char *name;
752 895
753 if (XGetIconName (display->display, TermWin.parent[0], &name)) 896 if (!XGetIconName (display->display, TermWin.parent[0], &name))
754 name = NULL; 897 name = NULL;
898
755 if (name == NULL || STRCMP (name, str)) 899 if (name == NULL || STRCMP (name, str))
756 XSetIconName (display->display, TermWin.parent[0], str); 900 XSetIconName (display->display, TermWin.parent[0], str);
901
757 if (name) 902 if (name)
758 XFree (name); 903 XFree (name);
759#endif 904#endif
760} 905}
761 906
762#ifdef XTERM_COLOR_CHANGE 907#ifdef XTERM_COLOR_CHANGE
763void 908void
764rxvt_term::set_window_color (int idx, const char *color) 909rxvt_term::set_window_color (int idx, const char *color)
765{ 910{
766 rxvt_color xcol; 911 rxvt_color xcol;
767 int i; 912 int i;
768 913
769 if (color == NULL || *color == '\0') 914 if (color == NULL || *color == '\0')
770 return; 915 return;
771 916
772 /* handle color aliases */ 917 /* handle color aliases */
… …
873#ifdef XPM_BACKGROUND 1018#ifdef XPM_BACKGROUND
874 xpmb = "default;"; 1019 xpmb = "default;";
875#endif 1020#endif
876 break; 1021 break;
877 } 1022 }
1023
878 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1024 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
879 putenv (env_colorfgbg);
880 1025
881#ifndef NO_BRIGHTCOLOR 1026#ifndef NO_BRIGHTCOLOR
882 colorfgbg = DEFAULT_RSTYLE; 1027 colorfgbg = DEFAULT_RSTYLE;
883 for (i = minCOLOR; i <= maxCOLOR; i++) 1028 for (i = minCOLOR; i <= maxCOLOR; i++)
884 { 1029 {
… …
899int 1044int
900rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1045rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
901{ 1046{
902 if (!screen_in_out->set (display, colour)) 1047 if (!screen_in_out->set (display, colour))
903 { 1048 {
904 rxvt_print_error ("can't allocate colour: %s", colour); 1049 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
905 return false; 1050 return false;
906 } 1051 }
907 1052
908 return true; 1053 return true;
909} 1054}
… …
989 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1134 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
990 1135
991 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1136 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
992 window_vt_y, TermWin_TotalWidth (), 1137 window_vt_y, TermWin_TotalWidth (),
993 TermWin_TotalHeight ()); 1138 TermWin_TotalHeight ());
994#ifdef RXVT_GRAPHICS 1139 scr_clear (height != old_height);
995 if (old_height)
996 Gr_Resize (old_width - szHint.base_width,
997 old_height - szHint.base_height);
998#endif
999 scr_clear ();
1000#ifdef XPM_BACKGROUND 1140#ifdef XPM_BACKGROUND
1001 resize_pixmap (); 1141 resize_pixmap ();
1002#endif 1142#endif
1003 1143
1004 } 1144 }
… …
1281 if (preedit_attr) XFree (preedit_attr); 1421 if (preedit_attr) XFree (preedit_attr);
1282 if (status_attr) XFree (status_attr); 1422 if (status_attr) XFree (status_attr);
1283 1423
1284 if (Input_Context == NULL) 1424 if (Input_Context == NULL)
1285 { 1425 {
1286 rxvt_print_error ("failed to create input context"); 1426 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1287 display->put_xim (input_method); 1427 display->put_xim (input_method);
1288 return false; 1428 return false;
1289 } 1429 }
1290 1430
1291 if (input_style & XIMPreeditArea) 1431 if (input_style & XIMPreeditArea)
… …
1309 if (Input_Context) 1449 if (Input_Context)
1310 return; 1450 return;
1311 1451
1312#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1452#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1313 if (rs[Rs_imLocale]) 1453 if (rs[Rs_imLocale])
1314 setlocale (LC_CTYPE, rs[Rs_imLocale]); 1454 SET_LOCALE (rs[Rs_imLocale]);
1315#endif 1455#endif
1316 1456
1317 p = rs[Rs_inputMethod]; 1457 p = rs[Rs_inputMethod];
1318 if (p && *p) 1458 if (p && *p)
1319 { 1459 {
… …
1350 goto done; 1490 goto done;
1351 1491
1352done: 1492done:
1353#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1493#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1354 if (rs[Rs_imLocale]) 1494 if (rs[Rs_imLocale])
1355 setlocale (LC_CTYPE, locale); 1495 SET_LOCALE (locale);
1356#endif 1496#endif
1357} 1497}
1358 1498
1359void 1499void
1360rxvt_term::IMSetStatusPosition () 1500rxvt_term::IMSetStatusPosition ()

Diff Legend

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