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.35 by pcg, Fri Feb 20 23:01:45 2004 UTC vs.
Revision 1.66 by pcg, Thu Apr 8 20:31:45 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
… …
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.
… …
43# include <termios.h> 44# include <termios.h>
44#endif 45#endif
45 46
46#include <cstring> 47#include <cstring>
47 48
49vector<rxvt_term *> rxvt_term::termlist;
50
48static char curlocale[128]; 51static char curlocale[128];
49 52
50void 53bool
51rxvt_set_locale (const char *locale) 54rxvt_set_locale (const char *locale)
52{ 55{
53 if (locale && STRNCMP (locale, curlocale, 128)) 56 if (!locale || !STRNCMP (locale, curlocale, 128))
54 { 57 return false;
58
55 STRNCPY (curlocale, locale, 128); 59 STRNCPY (curlocale, locale, 128);
56 setlocale (LC_CTYPE, curlocale); 60 setlocale (LC_CTYPE, curlocale);
61 return true;
62}
63
64#if ENABLE_COMBINING
65class rxvt_composite_vec rxvt_composite;
66
67text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
68{
69 compose_char *cc;
70
71 // break compose chains, as stupid readline really likes to duplicate
72 // composing characters for some reason near the end of a line.
73 cc = (*this)[c1];
74 while (cc)
57 } 75 {
76 if (cc->c2 == c2) return c1;
77 cc = (*this)[cc->c1];
78 }
79
80 // check to see wether this combination already exists otherwise
81 for (cc = v.end (); cc-- > v.begin (); )
82 {
83 if (cc->c1 == c1 && cc->c2 == c2)
84 return COMPOSE_LO + (cc - v.begin ());
85 }
86
87 // allocate a new combination
88 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
89 {
90 static int seen;
91
92 if (!seen++)
93 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");
94
95 return REPLACEMENT_CHAR;
96 }
97
98 v.push_back (compose_char (c1, c2));
99
100 return v.size () - 1 + COMPOSE_LO;
58} 101}
102
103int rxvt_composite_vec::expand (unicode_t c, wchar_t *r)
104{
105 compose_char *cc = (*this)[c];
106
107 if (!cc)
108 {
109 if (r) *r = c;
110 return 1;
111 }
112
113 int len = expand (cc->c1, r);
114
115 if (r) r += len;
116
117 if (cc->c2 != NOCHAR)
118 {
119 len++;
120 if (r) *r++ = cc->c2;
121 }
122
123 return len;
124
125}
126#endif
59 127
60void * 128void *
61rxvt_term::operator new (size_t s) 129rxvt_term::operator new (size_t s)
62{ 130{
63 void *p = malloc (s); 131 void *p = malloc (s);
… …
79 vt_ev (this, &rxvt_term::x_cb), 147 vt_ev (this, &rxvt_term::x_cb),
80#ifdef HAVE_SCROLLBARS 148#ifdef HAVE_SCROLLBARS
81 scrollbar_ev (this, &rxvt_term::x_cb), 149 scrollbar_ev (this, &rxvt_term::x_cb),
82#endif 150#endif
83#ifdef MENUBAR 151#ifdef MENUBAR
84 menubar_ev (this, &rxvt_term::x_cb), fixme 152 menubar_ev (this, &rxvt_term::x_cb),
85#endif 153#endif
86#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
87 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
88#endif 156#endif
89#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
… …
99 destroy_ev (this, &rxvt_term::destroy_cb), 167 destroy_ev (this, &rxvt_term::destroy_cb),
100 pty_ev (this, &rxvt_term::pty_cb), 168 pty_ev (this, &rxvt_term::pty_cb),
101 incr_ev (this, &rxvt_term::incr_cb) 169 incr_ev (this, &rxvt_term::incr_cb)
102{ 170{
103 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 171 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
172
173 termlist.push_back (this);
104} 174}
105 175
106rxvt_term::~rxvt_term () 176rxvt_term::~rxvt_term ()
107{ 177{
178 termlist.erase (find (termlist.begin (), termlist.end(), this));
179
108 if (cmd_fd >= 0) 180 if (cmd_fd >= 0)
109 close (cmd_fd); 181 close (cmd_fd);
110 182
111#ifndef NO_SETOWNER_TTYDEV 183#ifndef NO_SETOWNER_TTYDEV
112 privileged_ttydev (RESTORE); 184 privileged_ttydev (RESTORE);
… …
116#endif 188#endif
117 189
118 delete TermWin.fontset; 190 delete TermWin.fontset;
119 191
120 if (display) 192 if (display)
193 {
194 selection_clear ();
195
196#ifdef MENUBAR
197 if (menubarGC) XFreeGC (display->display, menubarGC);
198#endif
199#ifdef XTERM_SCROLLBAR
200 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
201 if (ShadowGC) XFreeGC (display->display, ShadowGC);
202#endif
203#ifdef PLAIN_SCROLLBAR
204 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC);
205#endif
206#ifdef NEXT_SCROLLBAR
207 if (blackGC) XFreeGC (display->display, blackGC);
208 if (whiteGC) XFreeGC (display->display, whiteGC);
209 if (grayGC) XFreeGC (display->display, grayGC);
210 if (darkGC) XFreeGC (display->display, darkGC);
211 if (stippleGC) XFreeGC (display->display, stippleGC);
212 if (dimple) XFreePixmap (display->display, dimple);
213 if (upArrow) XFreePixmap (display->display, upArrow);
214 if (downArrow) XFreePixmap (display->display, downArrow);
215 if (upArrowHi) XFreePixmap (display->display, upArrowHi);
216 if (downArrowHi) XFreePixmap (display->display, downArrowHi);
217#endif
218#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
219 if (topShadowGC) XFreeGC (display->display, topShadowGC);
220 if (botShadowGC) XFreeGC (display->display, botShadowGC);
221 if (scrollbarGC) XFreeGC (display->display, scrollbarGC);
222#endif
223 if (TermWin.gc) XFreeGC (display->display, TermWin.gc);
224
225#if defined(MENUBAR) && (MENUBAR_MAX > 1)
226 delete menuBar.drawable;
227 //if (menuBar.win)
228 // XDestroyWindow (display->display, menuBar.win);
229#endif
230 delete TermWin.drawable;
231 // destroy all windows
121 if (TermWin.parent[0]) 232 if (TermWin.parent[0])
122 XDestroyWindow (display->display, TermWin.parent[0]); 233 XDestroyWindow (display->display, TermWin.parent[0]);
234 }
123 235
124 // TODO: free pixcolours, colours should become part of rxvt_display 236 // TODO: free pixcolours, colours should become part of rxvt_display
125 237
126 delete PixColors; 238 delete PixColors;
127 239
128 displays.put (display); 240 displays.put (display);
129 241
130 scr_release (); 242 scr_release ();
131 243
244 /* clear all resources */
245 for (int i = 0; i < allocated.size (); i++)
246 free (allocated[i]);
247
248 free (selection.text);
249 // TODO: manage env vars in child only(!)
132 free (env_windowid); 250 free (env_windowid);
133 free (env_display); 251 free (env_display);
134 free (env_term); 252 free (env_term);
135 free (env_colorfgbg); 253 free (env_colorfgbg);
136 free (locale); 254 free (locale);
255#if 0
137 free (codeset); 256 free (codeset);
257#endif
138 258
139 delete envv; 259 delete envv;
140 delete argv; 260 delete argv;
141} 261}
142 262
… …
183 delete this; 303 delete this;
184} 304}
185 305
186/*----------------------------------------------------------------------*/ 306/*----------------------------------------------------------------------*/
187/* rxvt_init () */ 307/* rxvt_init () */
188/* LIBPROTO */
189rxvt_t
190rxvt_init (int argc, const char *const *argv)
191{
192 SET_R (new rxvt_term);
193
194 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
195 {
196 delete GET_R;
197 SET_R (0);
198 }
199
200 return GET_R;
201}
202
203static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
204
205void
206rxvt_init_signals ()
207{
208 /* install exit handler for cleanup */
209#if 0
210#ifdef HAVE_ATEXIT
211 atexit (rxvt_clean_exit);
212#else
213#endif
214#endif
215
216 struct sigaction sa;
217
218 sigfillset (&sa.sa_mask);
219 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
220 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
221 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
222 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
223 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
224 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
225 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
226
227 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
228 /* signal (SIGURG, SIG_DFL); */
229
230 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
231 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
232}
233
234bool 308bool
235rxvt_term::init (int argc, const char *const *argv) 309rxvt_term::init (int argc, const char *const *argv)
236{ 310{
311 SET_R (this);
312
313 if (!init_vars ())
314 return false;
315
237 /* 316 /*
238 * Save and then give up any super-user privileges 317 * Save and then give up any super-user privileges
239 * If we need privileges in any area then we must specifically request it. 318 * If we need privileges in any area then we must specifically request it.
240 * We should only need to be root in these cases: 319 * We should only need to be root in these cases:
241 * 1. write utmp entries on some systems 320 * 1. write utmp entries on some systems
… …
248 327
249 const char **cmd_argv = init_resources (argc, argv); 328 const char **cmd_argv = init_resources (argc, argv);
250 329
251 set_locale (""); 330 set_locale ("");
252 331
253#if (MENUBAR_MAX) 332#if MENUBAR_MAX
254 menubar_read (rs[Rs_menu]); 333 menubar_read (rs[Rs_menu]);
255#endif 334#endif
256#ifdef HAVE_SCROLLBARS 335#ifdef HAVE_SCROLLBARS
257 if (Options & Opt_scrollBar) 336 if (Options & Opt_scrollBar)
258 scrollBar.setIdle (); /* set existence for size calculations */ 337 scrollBar.setIdle (); /* set existence for size calculations */
… …
261 create_windows (argc, argv); 340 create_windows (argc, argv);
262 341
263 init_xlocale (); 342 init_xlocale ();
264 343
265 scr_reset (); /* initialize screen */ 344 scr_reset (); /* initialize screen */
266#ifdef RXVT_GRAPHICS
267 Gr_reset (); /* reset graphics */
268#endif
269 345
270#if 1 346#if 0
271 XSynchronize (display->display, True); 347 XSynchronize (display->display, True);
272#endif 348#endif
273 349
274#ifdef HAVE_SCROLLBARS 350#ifdef HAVE_SCROLLBARS
275 if (Options & Opt_scrollBar) 351 if (Options & Opt_scrollBar)
276 resize_scrollbar (); /* create and map scrollbar */ 352 resize_scrollbar (); /* create and map scrollbar */
277#endif 353#endif
278#if (MENUBAR_MAX) 354#if (MENUBAR_MAX)
279 if (menubar_visible (r)) 355 if (menubar_visible ())
280 XMapWindow (display->display, menuBar.win); 356 XMapWindow (display->display, menuBar.win);
281#endif 357#endif
282#ifdef TRANSPARENT 358#ifdef TRANSPARENT
283 if (Options & Opt_transparent) 359 if (Options & Opt_transparent)
284 { 360 {
… …
297 pty_ev.start (cmd_fd, EVENT_READ); 373 pty_ev.start (cmd_fd, EVENT_READ);
298 374
299 check_ev.start (); 375 check_ev.start ();
300 376
301 return true; 377 return true;
378}
379
380static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
381
382void
383rxvt_init_signals ()
384{
385 /* install exit handler for cleanup */
386#if 0
387#ifdef HAVE_ATEXIT
388 atexit (rxvt_clean_exit);
389#else
390#endif
391#endif
392
393 struct sigaction sa;
394
395 sigfillset (&sa.sa_mask);
396 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
397 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
398 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
399 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
400 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
401 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
402 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
403
404 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
405 /* signal (SIGURG, SIG_DFL); */
406
407 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
408 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
302} 409}
303 410
304/* ------------------------------------------------------------------------- * 411/* ------------------------------------------------------------------------- *
305 * SIGNAL HANDLING & EXIT HANDLER * 412 * SIGNAL HANDLING & EXIT HANDLER *
306 * ------------------------------------------------------------------------- */ 413 * ------------------------------------------------------------------------- */
307/* 414/*
308 * Catch a SIGCHLD signal and exit if the direct child has died 415 * Catch a SIGCHLD signal and exit if the direct child has died
309 */ 416 */
417
418void rxvt_term::child_exited (int pid)
419{
420 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
421 if (pid == (*t)->cmd_pid)
422 {
423 (*t)->destroy ();
424 break;
425 }
426}
427
310/* ARGSUSED */ 428/* ARGSUSED */
311/* EXTPROTO */ 429/* EXTPROTO */
312RETSIGTYPE 430RETSIGTYPE
313rxvt_Child_signal (int sig __attribute__ ((unused))) 431rxvt_Child_signal (int sig __attribute__ ((unused)))
314{ 432{
315 int pid, save_errno = errno; 433 int pid, save_errno = errno;
434
316 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 435 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
317 ; 436 rxvt_term::child_exited (pid);
437
318 errno = save_errno; 438 errno = save_errno;
319
320#if 0
321 if (pid == cmd_pid)
322 exit (EXIT_SUCCESS);
323#endif
324} 439}
325 440
326/* 441/*
327 * Catch a fatal signal and tidy up before quitting 442 * Catch a fatal signal and tidy up before quitting
328 */ 443 */
… …
330RETSIGTYPE 445RETSIGTYPE
331rxvt_Exit_signal (int sig) 446rxvt_Exit_signal (int sig)
332{ 447{
333 signal (sig, SIG_DFL); 448 signal (sig, SIG_DFL);
334#ifdef DEBUG_CMD 449#ifdef DEBUG_CMD
335 rxvt_print_error ("signal %d", sig); 450 rxvt_warn ("caught signal %d, exiting.\n", sig);
336#endif 451#endif
337 rxvt_clean_exit (); 452 rxvt_clean_exit ();
338 kill (getpid (), sig); 453 kill (getpid (), sig);
339} 454}
340 455
… …
378 493
379 p = malloc (size); 494 p = malloc (size);
380 if (p) 495 if (p)
381 return p; 496 return p;
382 497
383 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 498 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
384 rxvt_clean_exit (); 499 rxvt_clean_exit ();
385 exit (EXIT_FAILURE); 500 exit (EXIT_FAILURE);
386 /* NOTREACHED */ 501 /* NOTREACHED */
387} 502}
388 503
… …
394 509
395 p = calloc (number, size); 510 p = calloc (number, size);
396 if (p) 511 if (p)
397 return p; 512 return p;
398 513
399 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 514 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
400 rxvt_clean_exit (); 515 rxvt_clean_exit ();
401 exit (EXIT_FAILURE); 516 exit (EXIT_FAILURE);
402 /* NOTREACHED */ 517 /* NOTREACHED */
403} 518}
404 519
… …
413 else 528 else
414 p = malloc (size); 529 p = malloc (size);
415 if (p) 530 if (p)
416 return p; 531 return p;
417 532
418 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 533 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
419 rxvt_clean_exit (); 534 rxvt_clean_exit ();
420 exit (EXIT_FAILURE); 535 exit (EXIT_FAILURE);
421 /* NOTREACHED */ 536 /* NOTREACHED */
422} 537}
423 538
… …
615 else 730 else
616 szHint.win_gravity = SouthWestGravity; 731 szHint.win_gravity = SouthWestGravity;
617 } 732 }
618 } 733 }
619 } 734 }
735
620 /* TODO: BOUNDS */ 736 /* TODO: BOUNDS */
621 TermWin.width = TermWin.ncol * TermWin.fwidth; 737 TermWin.width = TermWin.ncol * TermWin.fwidth;
622 TermWin.height = TermWin.nrow * TermWin.fheight; 738 TermWin.height = TermWin.nrow * TermWin.fheight;
623 max_width = MAX_COLS * TermWin.fwidth; 739 max_width = MAX_COLS * TermWin.fwidth;
624 max_height = MAX_ROWS * TermWin.fheight; 740 max_height = MAX_ROWS * TermWin.fheight;
… …
717 * init = 1 - initialize 833 * init = 1 - initialize
718 * 834 *
719 * fontname == FONT_UP - switch to bigger font 835 * fontname == FONT_UP - switch to bigger font
720 * fontname == FONT_DN - switch to smaller font 836 * fontname == FONT_DN - switch to smaller font
721 */ 837 */
722void 838bool
723rxvt_term::change_font (int init, const char *fontname) 839rxvt_term::change_font (const char *fontname)
724{} 840{
841 if (fontname == FONT_UP)
842 {
843 // TODO
844 }
845 else if (fontname == FONT_DN)
846 {
847 // TODO
848 }
849 else
850 {
851 rxvt_fontset *fs = new rxvt_fontset (this);
725 852
726void 853 if (fs && fs->populate (fontname ? fontname : "fixed"))
854 {
855 delete TermWin.fontset;
856 TermWin.fontset = fs;
857 TermWin.fwidth = fs->base_font ()->width;
858 TermWin.fheight = fs->base_font ()->height;
859 TermWin.fbase = fs->base_font ()->ascent;
860
861 if (TermWin.parent[0])
862 {
863 resize_all_windows (0, 0, 0);
864 scr_remap_chars ();
865 scr_touch (true);
866 }
867
868 return true;
869 }
870 }
871
872 return false;
873}
874
875bool
727rxvt_term::font_up_down (int n, int direction) 876rxvt_term::font_up_down (int n, int direction)
728{} 877{
878 return false;
879}
729 880
730/*----------------------------------------------------------------------*/ 881/*----------------------------------------------------------------------*/
731/*----------------------------------------------------------------------*/ 882/*----------------------------------------------------------------------*/
732/* xterm sequences - title, iconName, color (exptl) */ 883/* xterm sequences - title, iconName, color (exptl) */
733void 884void
734rxvt_term::set_title (const char *str) 885rxvt_term::set_title (const char *str)
735{ 886{
736#ifndef SMART_WINDOW_TITLE 887#ifdef SMART_WINDOW_TITLE
737 XStoreName (display->display, TermWin.parent[0], str); 888 char *name;
738#else
739 char *name;
740 889
741 if (XFetchName (display->display, TermWin.parent[0], &name) == 0) 890 if (!XFetchName (display->display, TermWin.parent[0], &name))
742 name = NULL; 891 name = NULL;
892
743 if (name == NULL || STRCMP (name, str)) 893 if (name == NULL || STRCMP (name, str))
894#endif
744 XStoreName (display->display, TermWin.parent[0], str); 895 XStoreName (display->display, TermWin.parent[0], str);
896
897#ifdef SMART_WINDOW_TITLE
745 if (name) 898 if (name)
746 XFree (name); 899 XFree (name);
747#endif 900#endif
748} 901}
749 902
750void 903void
751rxvt_term::set_iconName (const char *str) 904rxvt_term::set_icon_name (const char *str)
752{ 905{
753#ifndef SMART_WINDOW_TITLE 906#ifdef SMART_WINDOW_TITLE
754 XSetIconName (display->display, TermWin.parent[0], str); 907 char *name;
755#else
756 char *name;
757 908
758 if (XGetIconName (display->display, TermWin.parent[0], &name)) 909 if (!XGetIconName (display->display, TermWin.parent[0], &name))
759 name = NULL; 910 name = NULL;
911
760 if (name == NULL || STRCMP (name, str)) 912 if (name == NULL || STRCMP (name, str))
913#endif
761 XSetIconName (display->display, TermWin.parent[0], str); 914 XSetIconName (display->display, TermWin.parent[0], str);
915
916#ifdef SMART_WINDOW_TITLE
762 if (name) 917 if (name)
763 XFree (name); 918 XFree (name);
764#endif 919#endif
765} 920}
766 921
767#ifdef XTERM_COLOR_CHANGE 922#ifdef XTERM_COLOR_CHANGE
768void 923void
769rxvt_term::set_window_color (int idx, const char *color) 924rxvt_term::set_window_color (int idx, const char *color)
770{ 925{
771 rxvt_color xcol; 926 rxvt_color xcol;
772 int i; 927 int i;
773 928
774 if (color == NULL || *color == '\0') 929 if (color == NULL || *color == '\0')
775 return; 930 return;
776 931
777 /* handle color aliases */ 932 /* handle color aliases */
… …
793 PixColors[idx] = PixColors[minCOLOR + i]; 948 PixColors[idx] = PixColors[minCOLOR + i];
794 SET_PIXCOLOR (idx); 949 SET_PIXCOLOR (idx);
795 goto Done; 950 goto Done;
796 } 951 }
797 } 952 }
953
798 if (!rXParseAllocColor (& xcol, color)) 954 if (!rXParseAllocColor (& xcol, color))
799 return; 955 return;
956
800 /* XStoreColor (display->display, XCMAP, XColor*); */ 957 /* XStoreColor (display->display, XCMAP, XColor*); */
801 958
802 /* 959 /*
803 * FIXME: should free colors here, but no idea how to do it so instead, 960 * FIXME: should free colors here, but no idea how to do it so instead,
804 * so just keep gobbling up the colormap 961 * so just keep gobbling up the colormap
… …
827 984
828 /* handle Color_BD, scrollbar background, etc. */ 985 /* handle Color_BD, scrollbar background, etc. */
829 986
830 set_colorfgbg (); 987 set_colorfgbg ();
831 recolour_cursor (); 988 recolour_cursor ();
832 /* the only reasonable way to enforce a clean update */ 989 scr_touch (true);
833 scr_poweron ();
834} 990}
835 991
836#else 992#else
837# define set_window_color (idx,color) ((void)0) 993# define set_window_color (idx,color) ((void)0)
838#endif /* XTERM_COLOR_CHANGE */ 994#endif /* XTERM_COLOR_CHANGE */
839 995
840void 996void
841rxvt_term::recolour_cursor () 997rxvt_term::recolour_cursor ()
842{ 998{
843#if TODO
844 rxvt_color xcol[2]; 999 XColor xcol[2];
845 1000
846 xcol[0] = PixColors[Color_pointer]; 1001 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColors[Color_pointer_fg] : PixColors[Color_fg];
847 xcol[1] = PixColors[Color_bg]; 1002 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColors[Color_pointer_bg] : PixColors[Color_bg];
848 XQueryColors (display->display, XCMAP, xcol, 2); 1003 XQueryColors (display->display, XCMAP, xcol, 2);
849 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1])); 1004 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
850#endif
851} 1005}
852 1006
853/*----------------------------------------------------------------------*/ 1007/*----------------------------------------------------------------------*/
854/* 1008/*
855 * find if fg/bg matches any of the normal (low-intensity) colors 1009 * find if fg/bg matches any of the normal (low-intensity) colors
… …
904int 1058int
905rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1059rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
906{ 1060{
907 if (!screen_in_out->set (display, colour)) 1061 if (!screen_in_out->set (display, colour))
908 { 1062 {
909 rxvt_print_error ("can't allocate colour: %s", colour); 1063 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
910 return false; 1064 return false;
911 } 1065 }
912 1066
913 return true; 1067 return true;
914} 1068}
… …
994 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1148 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
995 1149
996 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1150 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
997 window_vt_y, TermWin_TotalWidth (), 1151 window_vt_y, TermWin_TotalWidth (),
998 TermWin_TotalHeight ()); 1152 TermWin_TotalHeight ());
999#ifdef RXVT_GRAPHICS 1153 scr_clear (height != old_height);
1000 if (old_height)
1001 Gr_Resize (old_width - szHint.base_width,
1002 old_height - szHint.base_height);
1003#endif
1004 scr_clear ();
1005#ifdef XPM_BACKGROUND 1154#ifdef XPM_BACKGROUND
1006 resize_pixmap (); 1155 resize_pixmap ();
1007#endif 1156#endif
1008 1157
1009 } 1158 }
… …
1286 if (preedit_attr) XFree (preedit_attr); 1435 if (preedit_attr) XFree (preedit_attr);
1287 if (status_attr) XFree (status_attr); 1436 if (status_attr) XFree (status_attr);
1288 1437
1289 if (Input_Context == NULL) 1438 if (Input_Context == NULL)
1290 { 1439 {
1291 rxvt_print_error ("failed to create input context"); 1440 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1292 display->put_xim (input_method); 1441 display->put_xim (input_method);
1293 return false; 1442 return false;
1294 } 1443 }
1295 1444
1296 if (input_style & XIMPreeditArea) 1445 if (input_style & XIMPreeditArea)
… …
1314 if (Input_Context) 1463 if (Input_Context)
1315 return; 1464 return;
1316 1465
1317#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1466#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1318 if (rs[Rs_imLocale]) 1467 if (rs[Rs_imLocale])
1319 setlocale (LC_CTYPE, rs[Rs_imLocale]); 1468 SET_LOCALE (rs[Rs_imLocale]);
1320#endif 1469#endif
1321 1470
1322 p = rs[Rs_inputMethod]; 1471 p = rs[Rs_inputMethod];
1323 if (p && *p) 1472 if (p && *p)
1324 { 1473 {
… …
1355 goto done; 1504 goto done;
1356 1505
1357done: 1506done:
1358#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1507#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1359 if (rs[Rs_imLocale]) 1508 if (rs[Rs_imLocale])
1360 setlocale (LC_CTYPE, locale); 1509 SET_LOCALE (locale);
1361#endif 1510#endif
1362} 1511}
1363 1512
1364void 1513void
1365rxvt_term::IMSetStatusPosition () 1514rxvt_term::IMSetStatusPosition ()

Diff Legend

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