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.65 by pcg, Fri Apr 2 15:15:26 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.
… …
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
90 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
91#endif 159#endif
92#ifdef POINTER_BLANK 160#ifdef POINTER_BLANK
93 pointer_ev (this, &rxvt_term::pointer_cb), 161 pointer_ev (this, &rxvt_term::pointer_cb),
162#endif
163#ifdef USE_XIM
164 im_ev (this, &rxvt_term::im_cb),
94#endif 165#endif
95 check_ev (this, &rxvt_term::check_cb), 166 check_ev (this, &rxvt_term::check_cb),
96 destroy_ev (this, &rxvt_term::destroy_cb), 167 destroy_ev (this, &rxvt_term::destroy_cb),
97 pty_ev (this, &rxvt_term::pty_cb), 168 pty_ev (this, &rxvt_term::pty_cb),
98 incr_ev (this, &rxvt_term::incr_cb), 169 incr_ev (this, &rxvt_term::incr_cb)
99#ifdef USE_XIM
100 im_ev (this, &rxvt_term::im_cb)
101#endif
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 scr_release ();
112
113 free (locale);
114 free (codeset);
115
116#ifndef NO_SETOWNER_TTYDEV 183#ifndef NO_SETOWNER_TTYDEV
117 privileged_ttydev (RESTORE); 184 privileged_ttydev (RESTORE);
118#endif 185#endif
119#ifdef UTMP_SUPPORT 186#ifdef UTMP_SUPPORT
120 privileged_utmp (RESTORE); 187 privileged_utmp (RESTORE);
121#endif 188#endif
122 189
123 // TODO: free pixcolours, colours should become part of rxvt_display
124
125 delete PixColors;
126 delete TermWin.fontset; 190 delete TermWin.fontset;
127 191
128 displays.put (display);
129}
130
131void
132rxvt_term::destroy ()
133{
134 if (display) 192 if (display)
135 { 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
136 if (TermWin.parent[0]) 232 if (TermWin.parent[0])
137 XDestroyWindow (display->display, TermWin.parent[0]); 233 XDestroyWindow (display->display, TermWin.parent[0]);
234 }
138 235
236 // TODO: free pixcolours, colours should become part of rxvt_display
237
238 delete PixColors;
239
240 displays.put (display);
241
242 scr_release ();
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(!)
250 free (env_windowid);
251 free (env_display);
252 free (env_term);
253 free (env_colorfgbg);
254 free (locale);
255#if 0
256 free (codeset);
257#endif
258
259 delete envv;
260 delete argv;
261}
262
263void
264rxvt_term::destroy ()
265{
266 if (display)
267 {
139 rootwin_ev.stop (display); 268 rootwin_ev.stop (display);
140 termwin_ev.stop (display); 269 termwin_ev.stop (display);
141 vt_ev.stop (display); 270 vt_ev.stop (display);
142
143#ifdef USE_XIM 271#ifdef USE_XIM
144 im_destroy (); 272 im_destroy ();
145 im_ev.stop (display); 273 im_ev.stop (display);
146#endif 274#endif
147#ifdef HAVE_SCROLLBARS 275#ifdef HAVE_SCROLLBARS
… …
175 delete this; 303 delete this;
176} 304}
177 305
178/*----------------------------------------------------------------------*/ 306/*----------------------------------------------------------------------*/
179/* rxvt_init () */ 307/* 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 308bool
227rxvt_term::init (int argc, const char *const *argv) 309rxvt_term::init (int argc, const char *const *argv)
228{ 310{
311 SET_R (this);
312
313 if (!init_vars ())
314 return false;
315
229 /* 316 /*
230 * Save and then give up any super-user privileges 317 * Save and then give up any super-user privileges
231 * 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.
232 * We should only need to be root in these cases: 319 * We should only need to be root in these cases:
233 * 1. write utmp entries on some systems 320 * 1. write utmp entries on some systems
… …
240 327
241 const char **cmd_argv = init_resources (argc, argv); 328 const char **cmd_argv = init_resources (argc, argv);
242 329
243 set_locale (""); 330 set_locale ("");
244 331
245#if (MENUBAR_MAX) 332#if MENUBAR_MAX
246 menubar_read (rs[Rs_menu]); 333 menubar_read (rs[Rs_menu]);
247#endif 334#endif
248#ifdef HAVE_SCROLLBARS 335#ifdef HAVE_SCROLLBARS
249 if (Options & Opt_scrollBar) 336 if (Options & Opt_scrollBar)
250 scrollBar.setIdle (); /* set existence for size calculations */ 337 scrollBar.setIdle (); /* set existence for size calculations */
… …
253 create_windows (argc, argv); 340 create_windows (argc, argv);
254 341
255 init_xlocale (); 342 init_xlocale ();
256 343
257 scr_reset (); /* initialize screen */ 344 scr_reset (); /* initialize screen */
258#ifdef RXVT_GRAPHICS
259 Gr_reset (); /* reset graphics */
260#endif
261 345
262#if 0 346#if 0
263#ifdef DEBUG_X
264 XSynchronize (display->display, True); 347 XSynchronize (display->display, True);
265#endif
266#endif 348#endif
267 349
268#ifdef HAVE_SCROLLBARS 350#ifdef HAVE_SCROLLBARS
269 if (Options & Opt_scrollBar) 351 if (Options & Opt_scrollBar)
270 resize_scrollbar (); /* create and map scrollbar */ 352 resize_scrollbar (); /* create and map scrollbar */
271#endif 353#endif
272#if (MENUBAR_MAX) 354#if (MENUBAR_MAX)
273 if (menubar_visible (r)) 355 if (menubar_visible ())
274 XMapWindow (display->display, menuBar.win); 356 XMapWindow (display->display, menuBar.win);
275#endif 357#endif
276#ifdef TRANSPARENT 358#ifdef TRANSPARENT
277 if (Options & Opt_transparent) 359 if (Options & Opt_transparent)
278 { 360 {
… …
284 rootwin_ev.start (display, display->root); 366 rootwin_ev.start (display, display->root);
285 367
286 XMapWindow (display->display, TermWin.vt); 368 XMapWindow (display->display, TermWin.vt);
287 XMapWindow (display->display, TermWin.parent[0]); 369 XMapWindow (display->display, TermWin.parent[0]);
288 370
289 init_env ();
290 init_command (cmd_argv); 371 init_command (cmd_argv);
291 372
292 pty_ev.start (cmd_fd, EVENT_READ); 373 pty_ev.start (cmd_fd, EVENT_READ);
293 374
294 check_ev.start (); 375 check_ev.start ();
295 376
296 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);
297} 409}
298 410
299/* ------------------------------------------------------------------------- * 411/* ------------------------------------------------------------------------- *
300 * SIGNAL HANDLING & EXIT HANDLER * 412 * SIGNAL HANDLING & EXIT HANDLER *
301 * ------------------------------------------------------------------------- */ 413 * ------------------------------------------------------------------------- */
302/* 414/*
303 * 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
304 */ 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
305/* ARGSUSED */ 428/* ARGSUSED */
306/* EXTPROTO */ 429/* EXTPROTO */
307RETSIGTYPE 430RETSIGTYPE
308rxvt_Child_signal (int sig __attribute__ ((unused))) 431rxvt_Child_signal (int sig __attribute__ ((unused)))
309{ 432{
310 int pid, save_errno = errno; 433 int pid, save_errno = errno;
434
311 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 435 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
312 ; 436 rxvt_term::child_exited (pid);
437
313 errno = save_errno; 438 errno = save_errno;
314
315#if 0
316 if (pid == cmd_pid)
317 exit (EXIT_SUCCESS);
318#endif
319} 439}
320 440
321/* 441/*
322 * Catch a fatal signal and tidy up before quitting 442 * Catch a fatal signal and tidy up before quitting
323 */ 443 */
… …
325RETSIGTYPE 445RETSIGTYPE
326rxvt_Exit_signal (int sig) 446rxvt_Exit_signal (int sig)
327{ 447{
328 signal (sig, SIG_DFL); 448 signal (sig, SIG_DFL);
329#ifdef DEBUG_CMD 449#ifdef DEBUG_CMD
330 rxvt_print_error ("signal %d", sig); 450 rxvt_warn ("caught signal %d, exiting.\n", sig);
331#endif 451#endif
332 rxvt_clean_exit (); 452 rxvt_clean_exit ();
333 kill (getpid (), sig); 453 kill (getpid (), sig);
334} 454}
335 455
… …
373 493
374 p = malloc (size); 494 p = malloc (size);
375 if (p) 495 if (p)
376 return p; 496 return p;
377 497
378 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 498 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
379 rxvt_clean_exit (); 499 rxvt_clean_exit ();
380 exit (EXIT_FAILURE); 500 exit (EXIT_FAILURE);
381 /* NOTREACHED */ 501 /* NOTREACHED */
382} 502}
383 503
… …
389 509
390 p = calloc (number, size); 510 p = calloc (number, size);
391 if (p) 511 if (p)
392 return p; 512 return p;
393 513
394 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 514 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
395 rxvt_clean_exit (); 515 rxvt_clean_exit ();
396 exit (EXIT_FAILURE); 516 exit (EXIT_FAILURE);
397 /* NOTREACHED */ 517 /* NOTREACHED */
398} 518}
399 519
… …
408 else 528 else
409 p = malloc (size); 529 p = malloc (size);
410 if (p) 530 if (p)
411 return p; 531 return p;
412 532
413 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 533 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
414 rxvt_clean_exit (); 534 rxvt_clean_exit ();
415 exit (EXIT_FAILURE); 535 exit (EXIT_FAILURE);
416 /* NOTREACHED */ 536 /* NOTREACHED */
417} 537}
418 538
… …
610 else 730 else
611 szHint.win_gravity = SouthWestGravity; 731 szHint.win_gravity = SouthWestGravity;
612 } 732 }
613 } 733 }
614 } 734 }
735
615 /* TODO: BOUNDS */ 736 /* TODO: BOUNDS */
616 TermWin.width = TermWin.ncol * TermWin.fwidth; 737 TermWin.width = TermWin.ncol * TermWin.fwidth;
617 TermWin.height = TermWin.nrow * TermWin.fheight; 738 TermWin.height = TermWin.nrow * TermWin.fheight;
618 max_width = MAX_COLS * TermWin.fwidth; 739 max_width = MAX_COLS * TermWin.fwidth;
619 max_height = MAX_ROWS * TermWin.fheight; 740 max_height = MAX_ROWS * TermWin.fheight;
… …
712 * init = 1 - initialize 833 * init = 1 - initialize
713 * 834 *
714 * fontname == FONT_UP - switch to bigger font 835 * fontname == FONT_UP - switch to bigger font
715 * fontname == FONT_DN - switch to smaller font 836 * fontname == FONT_DN - switch to smaller font
716 */ 837 */
717void 838bool
718rxvt_term::change_font (int init, const char *fontname) 839rxvt_term::change_font (const char *fontname)
719{} 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);
720 852
721void 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
722rxvt_term::font_up_down (int n, int direction) 876rxvt_term::font_up_down (int n, int direction)
723{} 877{
878 return false;
879}
724 880
725/*----------------------------------------------------------------------*/ 881/*----------------------------------------------------------------------*/
726/*----------------------------------------------------------------------*/ 882/*----------------------------------------------------------------------*/
727/* xterm sequences - title, iconName, color (exptl) */ 883/* xterm sequences - title, iconName, color (exptl) */
728void 884void
729rxvt_term::set_title (const char *str) 885rxvt_term::set_title (const char *str)
730{ 886{
731#ifndef SMART_WINDOW_TITLE 887#ifdef SMART_WINDOW_TITLE
732 XStoreName (display->display, TermWin.parent[0], str); 888 char *name;
733#else
734 char *name;
735 889
736 if (XFetchName (display->display, TermWin.parent[0], &name) == 0) 890 if (!XFetchName (display->display, TermWin.parent[0], &name))
737 name = NULL; 891 name = NULL;
892
738 if (name == NULL || STRCMP (name, str)) 893 if (name == NULL || STRCMP (name, str))
894#endif
739 XStoreName (display->display, TermWin.parent[0], str); 895 XStoreName (display->display, TermWin.parent[0], str);
896
897#ifdef SMART_WINDOW_TITLE
740 if (name) 898 if (name)
741 XFree (name); 899 XFree (name);
742#endif 900#endif
743} 901}
744 902
745void 903void
746rxvt_term::set_iconName (const char *str) 904rxvt_term::set_icon_name (const char *str)
747{ 905{
748#ifndef SMART_WINDOW_TITLE 906#ifdef SMART_WINDOW_TITLE
749 XSetIconName (display->display, TermWin.parent[0], str); 907 char *name;
750#else
751 char *name;
752 908
753 if (XGetIconName (display->display, TermWin.parent[0], &name)) 909 if (!XGetIconName (display->display, TermWin.parent[0], &name))
754 name = NULL; 910 name = NULL;
911
755 if (name == NULL || STRCMP (name, str)) 912 if (name == NULL || STRCMP (name, str))
913#endif
756 XSetIconName (display->display, TermWin.parent[0], str); 914 XSetIconName (display->display, TermWin.parent[0], str);
915
916#ifdef SMART_WINDOW_TITLE
757 if (name) 917 if (name)
758 XFree (name); 918 XFree (name);
759#endif 919#endif
760} 920}
761 921
762#ifdef XTERM_COLOR_CHANGE 922#ifdef XTERM_COLOR_CHANGE
763void 923void
764rxvt_term::set_window_color (int idx, const char *color) 924rxvt_term::set_window_color (int idx, const char *color)
765{ 925{
766 rxvt_color xcol; 926 rxvt_color xcol;
767 int i; 927 int i;
768 928
769 if (color == NULL || *color == '\0') 929 if (color == NULL || *color == '\0')
770 return; 930 return;
771 931
772 /* handle color aliases */ 932 /* handle color aliases */
… …
788 PixColors[idx] = PixColors[minCOLOR + i]; 948 PixColors[idx] = PixColors[minCOLOR + i];
789 SET_PIXCOLOR (idx); 949 SET_PIXCOLOR (idx);
790 goto Done; 950 goto Done;
791 } 951 }
792 } 952 }
953
793 if (!rXParseAllocColor (& xcol, color)) 954 if (!rXParseAllocColor (& xcol, color))
794 return; 955 return;
956
795 /* XStoreColor (display->display, XCMAP, XColor*); */ 957 /* XStoreColor (display->display, XCMAP, XColor*); */
796 958
797 /* 959 /*
798 * 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,
799 * so just keep gobbling up the colormap 961 * so just keep gobbling up the colormap
… …
822 984
823 /* handle Color_BD, scrollbar background, etc. */ 985 /* handle Color_BD, scrollbar background, etc. */
824 986
825 set_colorfgbg (); 987 set_colorfgbg ();
826 recolour_cursor (); 988 recolour_cursor ();
827 /* the only reasonable way to enforce a clean update */ 989 scr_touch (true);
828 scr_poweron ();
829} 990}
830 991
831#else 992#else
832# define set_window_color (idx,color) ((void)0) 993# define set_window_color (idx,color) ((void)0)
833#endif /* XTERM_COLOR_CHANGE */ 994#endif /* XTERM_COLOR_CHANGE */
834 995
835void 996void
836rxvt_term::recolour_cursor () 997rxvt_term::recolour_cursor ()
837{ 998{
838#if TODO
839 rxvt_color xcol[2]; 999 XColor xcol[2];
840 1000
841 xcol[0] = PixColors[Color_pointer]; 1001 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColors[Color_pointer_fg] : PixColors[Color_fg];
842 xcol[1] = PixColors[Color_bg]; 1002 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColors[Color_pointer_bg] : PixColors[Color_bg];
843 XQueryColors (display->display, XCMAP, xcol, 2); 1003 XQueryColors (display->display, XCMAP, xcol, 2);
844 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1])); 1004 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
845#endif
846} 1005}
847 1006
848/*----------------------------------------------------------------------*/ 1007/*----------------------------------------------------------------------*/
849/* 1008/*
850 * 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
… …
873#ifdef XPM_BACKGROUND 1032#ifdef XPM_BACKGROUND
874 xpmb = "default;"; 1033 xpmb = "default;";
875#endif 1034#endif
876 break; 1035 break;
877 } 1036 }
1037
878 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1038 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
879 putenv (env_colorfgbg);
880 1039
881#ifndef NO_BRIGHTCOLOR 1040#ifndef NO_BRIGHTCOLOR
882 colorfgbg = DEFAULT_RSTYLE; 1041 colorfgbg = DEFAULT_RSTYLE;
883 for (i = minCOLOR; i <= maxCOLOR; i++) 1042 for (i = minCOLOR; i <= maxCOLOR; i++)
884 { 1043 {
… …
899int 1058int
900rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1059rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
901{ 1060{
902 if (!screen_in_out->set (display, colour)) 1061 if (!screen_in_out->set (display, colour))
903 { 1062 {
904 rxvt_print_error ("can't allocate colour: %s", colour); 1063 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
905 return false; 1064 return false;
906 } 1065 }
907 1066
908 return true; 1067 return true;
909} 1068}
… …
989 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1148 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
990 1149
991 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1150 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
992 window_vt_y, TermWin_TotalWidth (), 1151 window_vt_y, TermWin_TotalWidth (),
993 TermWin_TotalHeight ()); 1152 TermWin_TotalHeight ());
994#ifdef RXVT_GRAPHICS 1153 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 1154#ifdef XPM_BACKGROUND
1001 resize_pixmap (); 1155 resize_pixmap ();
1002#endif 1156#endif
1003 1157
1004 } 1158 }
… …
1281 if (preedit_attr) XFree (preedit_attr); 1435 if (preedit_attr) XFree (preedit_attr);
1282 if (status_attr) XFree (status_attr); 1436 if (status_attr) XFree (status_attr);
1283 1437
1284 if (Input_Context == NULL) 1438 if (Input_Context == NULL)
1285 { 1439 {
1286 rxvt_print_error ("failed to create input context"); 1440 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1287 display->put_xim (input_method); 1441 display->put_xim (input_method);
1288 return false; 1442 return false;
1289 } 1443 }
1290 1444
1291 if (input_style & XIMPreeditArea) 1445 if (input_style & XIMPreeditArea)
… …
1309 if (Input_Context) 1463 if (Input_Context)
1310 return; 1464 return;
1311 1465
1312#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1466#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1313 if (rs[Rs_imLocale]) 1467 if (rs[Rs_imLocale])
1314 setlocale (LC_CTYPE, rs[Rs_imLocale]); 1468 SET_LOCALE (rs[Rs_imLocale]);
1315#endif 1469#endif
1316 1470
1317 p = rs[Rs_inputMethod]; 1471 p = rs[Rs_inputMethod];
1318 if (p && *p) 1472 if (p && *p)
1319 { 1473 {
… …
1350 goto done; 1504 goto done;
1351 1505
1352done: 1506done:
1353#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1507#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1354 if (rs[Rs_imLocale]) 1508 if (rs[Rs_imLocale])
1355 setlocale (LC_CTYPE, locale); 1509 SET_LOCALE (locale);
1356#endif 1510#endif
1357} 1511}
1358 1512
1359void 1513void
1360rxvt_term::IMSetStatusPosition () 1514rxvt_term::IMSetStatusPosition ()

Diff Legend

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