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.30 by pcg, Thu Feb 12 01:53:25 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 190 delete TermWin.fontset;
124 191
125 delete PixColors;
126
127 displays.put (display);
128}
129
130void
131rxvt_term::destroy ()
132{
133 if (display) 192 if (display)
134 { 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
135 if (TermWin.parent[0]) 232 if (TermWin.parent[0])
136 XDestroyWindow (display->display, TermWin.parent[0]); 233 XDestroyWindow (display->display, TermWin.parent[0]);
234 }
137 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 {
268 rootwin_ev.stop (display);
138 termwin_ev.stop (display); 269 termwin_ev.stop (display);
139 vt_ev.stop (display); 270 vt_ev.stop (display);
140
141#ifdef USE_XIM 271#ifdef USE_XIM
142 im_destroy (); 272 im_destroy ();
143 im_ev.stop (display); 273 im_ev.stop (display);
144#endif 274#endif
145#ifdef HAVE_SCROLLBARS 275#ifdef HAVE_SCROLLBARS
… …
172 302
173 delete this; 303 delete this;
174} 304}
175 305
176/*----------------------------------------------------------------------*/ 306/*----------------------------------------------------------------------*/
177/* rxvt_init() */ 307/* rxvt_init () */
178/* LIBPROTO */
179rxvt_t
180rxvt_init (int argc, const char *const *argv)
181{
182 SET_R (new rxvt_term);
183
184 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
185 {
186 delete GET_R;
187 SET_R (0);
188 }
189
190 return GET_R;
191}
192
193static int (*old_xerror_handler)(Display *dpy, XErrorEvent *event);
194
195void
196rxvt_init_signals ()
197{
198 /* install exit handler for cleanup */
199#if 0
200#ifdef HAVE_ATEXIT
201 atexit(rxvt_clean_exit);
202#else
203#endif
204#endif
205
206 struct sigaction sa;
207
208 sigfillset (&sa.sa_mask);
209 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
210 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
211 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
212 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
213 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
214 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
215 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
216
217 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
218 /* signal (SIGURG, SIG_DFL); */
219
220 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
221 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
222}
223
224bool 308bool
225rxvt_term::init (int argc, const char *const *argv) 309rxvt_term::init (int argc, const char *const *argv)
226{ 310{
311 SET_R (this);
312
313 if (!init_vars ())
314 return false;
315
227 /* 316 /*
228 * Save and then give up any super-user privileges 317 * Save and then give up any super-user privileges
229 * 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.
230 * We should only need to be root in these cases: 319 * We should only need to be root in these cases:
231 * 1. write utmp entries on some systems 320 * 1. write utmp entries on some systems
… …
238 327
239 const char **cmd_argv = init_resources (argc, argv); 328 const char **cmd_argv = init_resources (argc, argv);
240 329
241 set_locale (""); 330 set_locale ("");
242 331
243#if (MENUBAR_MAX) 332#if MENUBAR_MAX
244 menubar_read (rs[Rs_menu]); 333 menubar_read (rs[Rs_menu]);
245#endif 334#endif
246#ifdef HAVE_SCROLLBARS 335#ifdef HAVE_SCROLLBARS
247 if (Options & Opt_scrollBar) 336 if (Options & Opt_scrollBar)
248 scrollBar.setIdle (); /* set existence for size calculations */ 337 scrollBar.setIdle (); /* set existence for size calculations */
… …
251 create_windows (argc, argv); 340 create_windows (argc, argv);
252 341
253 init_xlocale (); 342 init_xlocale ();
254 343
255 scr_reset (); /* initialize screen */ 344 scr_reset (); /* initialize screen */
256#ifdef RXVT_GRAPHICS
257 Gr_reset (); /* reset graphics */
258#endif
259 345
260#if 0 346#if 0
261#ifdef DEBUG_X
262 XSynchronize(display->display, True); 347 XSynchronize (display->display, True);
263#endif
264#endif 348#endif
265 349
266#ifdef HAVE_SCROLLBARS 350#ifdef HAVE_SCROLLBARS
267 if (Options & Opt_scrollBar) 351 if (Options & Opt_scrollBar)
268 resize_scrollbar (); /* create and map scrollbar */ 352 resize_scrollbar (); /* create and map scrollbar */
269#endif 353#endif
270#if (MENUBAR_MAX) 354#if (MENUBAR_MAX)
271 if (menubar_visible(r)) 355 if (menubar_visible ())
272 XMapWindow (display->display, menuBar.win); 356 XMapWindow (display->display, menuBar.win);
273#endif 357#endif
274#ifdef TRANSPARENT 358#ifdef TRANSPARENT
275 if (Options & Opt_transparent) 359 if (Options & Opt_transparent)
276 { 360 {
… …
282 rootwin_ev.start (display, display->root); 366 rootwin_ev.start (display, display->root);
283 367
284 XMapWindow (display->display, TermWin.vt); 368 XMapWindow (display->display, TermWin.vt);
285 XMapWindow (display->display, TermWin.parent[0]); 369 XMapWindow (display->display, TermWin.parent[0]);
286 370
287 init_env ();
288 init_command (cmd_argv); 371 init_command (cmd_argv);
289 372
290 pty_ev.start (cmd_fd, EVENT_READ); 373 pty_ev.start (cmd_fd, EVENT_READ);
291 374
292 check_ev.start (); 375 check_ev.start ();
293 376
294 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);
295} 409}
296 410
297/* ------------------------------------------------------------------------- * 411/* ------------------------------------------------------------------------- *
298 * SIGNAL HANDLING & EXIT HANDLER * 412 * SIGNAL HANDLING & EXIT HANDLER *
299 * ------------------------------------------------------------------------- */ 413 * ------------------------------------------------------------------------- */
300/* 414/*
301 * 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
302 */ 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
303/* ARGSUSED */ 428/* ARGSUSED */
304/* EXTPROTO */ 429/* EXTPROTO */
305RETSIGTYPE 430RETSIGTYPE
306rxvt_Child_signal(int sig __attribute__ ((unused))) 431rxvt_Child_signal (int sig __attribute__ ((unused)))
307{ 432{
308 int pid, save_errno = errno; 433 int pid, save_errno = errno;
434
309 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 435 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
310 ; 436 rxvt_term::child_exited (pid);
437
311 errno = save_errno; 438 errno = save_errno;
312
313#if 0
314 if (pid == cmd_pid)
315 exit (EXIT_SUCCESS);
316#endif
317} 439}
318 440
319/* 441/*
320 * Catch a fatal signal and tidy up before quitting 442 * Catch a fatal signal and tidy up before quitting
321 */ 443 */
322/* EXTPROTO */ 444/* EXTPROTO */
323RETSIGTYPE 445RETSIGTYPE
324rxvt_Exit_signal(int sig) 446rxvt_Exit_signal (int sig)
325{ 447{
326 signal (sig, SIG_DFL); 448 signal (sig, SIG_DFL);
327#ifdef DEBUG_CMD 449#ifdef DEBUG_CMD
328 rxvt_print_error ("signal %d", sig); 450 rxvt_warn ("caught signal %d, exiting.\n", sig);
329#endif 451#endif
330 rxvt_clean_exit(); 452 rxvt_clean_exit ();
331 kill (getpid (), sig); 453 kill (getpid (), sig);
332} 454}
333 455
334/* INTPROTO */ 456/* INTPROTO */
335int 457int
… …
363/* ------------------------------------------------------------------------- * 485/* ------------------------------------------------------------------------- *
364 * MEMORY ALLOCATION WRAPPERS * 486 * MEMORY ALLOCATION WRAPPERS *
365 * ------------------------------------------------------------------------- */ 487 * ------------------------------------------------------------------------- */
366/* EXTPROTO */ 488/* EXTPROTO */
367void * 489void *
368rxvt_malloc(size_t size) 490rxvt_malloc (size_t size)
369{ 491{
370 void *p; 492 void *p;
371 493
372 p = malloc(size); 494 p = malloc (size);
373 if (p) 495 if (p)
374 return p; 496 return p;
375 497
376 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 498 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
377 rxvt_clean_exit(); 499 rxvt_clean_exit ();
378 exit(EXIT_FAILURE); 500 exit (EXIT_FAILURE);
379 /* NOTREACHED */ 501 /* NOTREACHED */
380} 502}
381 503
382/* EXTPROTO */ 504/* EXTPROTO */
383void * 505void *
384rxvt_calloc(size_t number, size_t size) 506rxvt_calloc (size_t number, size_t size)
385{ 507{
386 void *p; 508 void *p;
387 509
388 p = calloc(number, size); 510 p = calloc (number, size);
389 if (p) 511 if (p)
390 return p; 512 return p;
391 513
392 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 514 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
393 rxvt_clean_exit(); 515 rxvt_clean_exit ();
394 exit(EXIT_FAILURE); 516 exit (EXIT_FAILURE);
395 /* NOTREACHED */ 517 /* NOTREACHED */
396} 518}
397 519
398/* EXTPROTO */ 520/* EXTPROTO */
399void * 521void *
400rxvt_realloc(void *ptr, size_t size) 522rxvt_realloc (void *ptr, size_t size)
401{ 523{
402 void *p; 524 void *p;
403 525
404 if (ptr) 526 if (ptr)
405 p = realloc(ptr, size); 527 p = realloc (ptr, size);
406 else 528 else
407 p = malloc(size); 529 p = malloc (size);
408 if (p) 530 if (p)
409 return p; 531 return p;
410 532
411 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 533 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
412 rxvt_clean_exit(); 534 rxvt_clean_exit ();
413 exit(EXIT_FAILURE); 535 exit (EXIT_FAILURE);
414 /* NOTREACHED */ 536 /* NOTREACHED */
415} 537}
416 538
417/* ------------------------------------------------------------------------- * 539/* ------------------------------------------------------------------------- *
418 * PRIVILEGED OPERATIONS * 540 * PRIVILEGED OPERATIONS *
… …
421void 543void
422rxvt_term::privileges (int mode) 544rxvt_term::privileges (int mode)
423{ 545{
424#if ! defined(__CYGWIN32__) 546#if ! defined(__CYGWIN32__)
425# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 547# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
426 /* setreuid() is the poor man's setuid(), seteuid() */ 548 /* setreuid () is the poor man's setuid (), seteuid () */
427# define seteuid(a) setreuid(-1, (a)) 549# define seteuid(a) setreuid(-1, (a))
428# define setegid(a) setregid(-1, (a)) 550# define setegid(a) setregid(-1, (a))
429# define HAVE_SETEUID 551# define HAVE_SETEUID
430# endif 552# endif
431# ifdef HAVE_SETEUID 553# ifdef HAVE_SETEUID
… …
434 case IGNORE: 556 case IGNORE:
435 /* 557 /*
436 * change effective uid/gid - not real uid/gid - so we can switch 558 * change effective uid/gid - not real uid/gid - so we can switch
437 * back to root later, as required 559 * back to root later, as required
438 */ 560 */
439 seteuid(getuid()); 561 seteuid (getuid ());
440 setegid(getgid()); 562 setegid (getgid ());
441 break; 563 break;
442 case SAVE: 564 case SAVE:
443 euid = geteuid(); 565 euid = geteuid ();
444 egid = getegid(); 566 egid = getegid ();
445 break; 567 break;
446 case RESTORE: 568 case RESTORE:
447 seteuid(euid); 569 seteuid (euid);
448 setegid(egid); 570 setegid (egid);
449 break; 571 break;
450 } 572 }
451# else 573# else
452 switch (mode) 574 switch (mode)
453 { 575 {
454 case IGNORE: 576 case IGNORE:
455 setuid(getuid()); 577 setuid (getuid ());
456 setgid(getgid()); 578 setgid (getgid ());
457 /* FALLTHROUGH */ 579 /* FALLTHROUGH */
458 case SAVE: 580 case SAVE:
459 /* FALLTHROUGH */ 581 /* FALLTHROUGH */
460 case RESTORE: 582 case RESTORE:
461 break; 583 break;
… …
466 588
467#ifdef UTMP_SUPPORT 589#ifdef UTMP_SUPPORT
468void 590void
469rxvt_term::privileged_utmp (char action) 591rxvt_term::privileged_utmp (char action)
470{ 592{
471 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 593 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
472 action, next_utmp_action, getpid())); 594 action, next_utmp_action, getpid ()));
473 if (next_utmp_action != action || (action != SAVE && action != RESTORE) 595 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
474 || (Options & Opt_utmpInhibit) 596 || (Options & Opt_utmpInhibit)
475 || ttydev == NULL || *ttydev == '\0') 597 || ttydev == NULL || *ttydev == '\0')
476 return; 598 return;
477 599
… …
492 614
493#ifndef NO_SETOWNER_TTYDEV 615#ifndef NO_SETOWNER_TTYDEV
494void 616void
495rxvt_term::privileged_ttydev (char action) 617rxvt_term::privileged_ttydev (char action)
496{ 618{
497 D_MAIN((stderr, 619 D_MAIN ((stderr,
498 "privileged_ttydev (%c); waiting for: %c (pid: %d)", 620 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
499 action, next_tty_action, getpid())); 621 action, next_tty_action, getpid ()));
500 if (next_tty_action != action || (action != SAVE && action != RESTORE) 622 if (next_tty_action != action || (action != SAVE && action != RESTORE)
501 || ttydev == NULL || *ttydev == '\0') 623 || ttydev == NULL || *ttydev == '\0')
502 return; 624 return;
503 625
504 privileges (RESTORE); 626 privileges (RESTORE);
505 627
506 if (action == SAVE) 628 if (action == SAVE)
507 { 629 {
508 next_tty_action = RESTORE; 630 next_tty_action = RESTORE;
509# ifndef RESET_TTY_TO_COMMON_DEFAULTS 631# ifndef RESET_TTY_TO_COMMON_DEFAULTS
510 /* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 632 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
511 if (lstat(ttydev, &ttyfd_stat) < 0) /* you lose out */ 633 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
512 next_tty_action = IGNORE; 634 next_tty_action = IGNORE;
513 else 635 else
514# endif 636# endif
515 637
516 { 638 {
517 chown(ttydev, getuid(), ttygid); /* fail silently */ 639 chown (ttydev, getuid (), ttygid); /* fail silently */
518 chmod(ttydev, ttymode); 640 chmod (ttydev, ttymode);
519# ifdef HAVE_REVOKE 641# ifdef HAVE_REVOKE
520 revoke(ttydev); 642 revoke (ttydev);
521# endif 643# endif
522 644
523 } 645 }
524 } 646 }
525 else 647 else
526 { /* action == RESTORE */ 648 { /* action == RESTORE */
527 next_tty_action = IGNORE; 649 next_tty_action = IGNORE;
528# ifndef RESET_TTY_TO_COMMON_DEFAULTS 650# ifndef RESET_TTY_TO_COMMON_DEFAULTS
529 chmod(ttydev, ttyfd_stat.st_mode); 651 chmod (ttydev, ttyfd_stat.st_mode);
530 chown(ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid); 652 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
531# else 653# else
532 chmod(ttydev, 654 chmod (ttydev,
533 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 655 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
534 chown(ttydev, 0, 0); 656 chown (ttydev, 0, 0);
535# endif 657# endif
536 658
537 } 659 }
538 660
539 privileges (IGNORE); 661 privileges (IGNORE);
540 662
541# ifndef RESET_TTY_TO_COMMON_DEFAULTS 663# ifndef RESET_TTY_TO_COMMON_DEFAULTS
542 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 664 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
543 action == RESTORE ? "Restoring" : (action == 665 action == RESTORE ? "Restoring" : (action ==
544 SAVE ? "Saving" : 666 SAVE ? "Saving" :
545 "UNKNOWN ERROR for"), ttydev, 667 "UNKNOWN ERROR for"), ttydev,
546 ttyfd_stat.st_mode, ttyfd_stat.st_uid, 668 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
547 ttyfd_stat.st_gid)); 669 ttyfd_stat.st_gid));
… …
560 short recalc_x, recalc_y; 682 short recalc_x, recalc_y;
561 int x, y, sb_w, mb_h, flags; 683 int x, y, sb_w, mb_h, flags;
562 unsigned int w, h; 684 unsigned int w, h;
563 unsigned int max_width, max_height; 685 unsigned int max_width, max_height;
564 686
565 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 687 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
566 TermWin.ncol, TermWin.nrow, szHint.width, 688 TermWin.ncol, TermWin.nrow, szHint.width,
567 szHint.height)); 689 szHint.height));
568 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 690 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
569 szHint.win_gravity = NorthWestGravity; 691 szHint.win_gravity = NorthWestGravity;
570 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 692 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
… …
573 flags = 0; 695 flags = 0;
574 if (!parsed_geometry) 696 if (!parsed_geometry)
575 { 697 {
576 parsed_geometry = 1; 698 parsed_geometry = 1;
577 if (rs[Rs_geometry]) 699 if (rs[Rs_geometry])
578 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h); 700 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
579 if (flags & WidthValue) 701 if (flags & WidthValue)
580 { 702 {
581 TermWin.ncol = BOUND_POSITIVE_INT16(w); 703 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
582 szHint.flags |= USSize; 704 szHint.flags |= USSize;
583 } 705 }
584 if (flags & HeightValue) 706 if (flags & HeightValue)
585 { 707 {
586 TermWin.nrow = BOUND_POSITIVE_INT16(h); 708 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
587 szHint.flags |= USSize; 709 szHint.flags |= USSize;
588 } 710 }
589 if (flags & XValue) 711 if (flags & XValue)
590 { 712 {
591 szHint.x = x; 713 szHint.x = x;
… …
608 else 730 else
609 szHint.win_gravity = SouthWestGravity; 731 szHint.win_gravity = SouthWestGravity;
610 } 732 }
611 } 733 }
612 } 734 }
735
613 /* TODO: BOUNDS */ 736 /* TODO: BOUNDS */
614 TermWin.width = TermWin.ncol * TermWin.fwidth; 737 TermWin.width = TermWin.ncol * TermWin.fwidth;
615 TermWin.height = TermWin.nrow * TermWin.fheight; 738 TermWin.height = TermWin.nrow * TermWin.fheight;
616 max_width = MAX_COLS * TermWin.fwidth; 739 max_width = MAX_COLS * TermWin.fwidth;
617 max_height = MAX_ROWS * TermWin.fheight; 740 max_height = MAX_ROWS * TermWin.fheight;
… …
620 743
621 sb_w = mb_h = 0; 744 sb_w = mb_h = 0;
622 window_vt_x = window_vt_y = 0; 745 window_vt_x = window_vt_y = 0;
623 if (scrollbar_visible ()) 746 if (scrollbar_visible ())
624 { 747 {
625 sb_w = scrollbar_TotalWidth(); 748 sb_w = scrollbar_TotalWidth ();
626 szHint.base_width += sb_w; 749 szHint.base_width += sb_w;
627 if (!(Options & Opt_scrollBar_right)) 750 if (! (Options & Opt_scrollBar_right))
628 window_vt_x = sb_w; 751 window_vt_x = sb_w;
629 } 752 }
630 if (menubar_visible ()) 753 if (menubar_visible ())
631 { 754 {
632 mb_h = menuBar_TotalHeight(); 755 mb_h = menuBar_TotalHeight ();
633 szHint.base_height += mb_h; 756 szHint.base_height += mb_h;
634 window_vt_y = mb_h; 757 window_vt_y = mb_h;
635 } 758 }
636 szHint.width_inc = TermWin.fwidth; 759 szHint.width_inc = TermWin.fwidth;
637 szHint.height_inc = TermWin.fheight; 760 szHint.height_inc = TermWin.fheight;
… …
643 szHint.width = width; 766 szHint.width = width;
644 TermWin.width = width - szHint.base_width; 767 TermWin.width = width - szHint.base_width;
645 } 768 }
646 else 769 else
647 { 770 {
648 MIN_IT(TermWin.width, max_width); 771 MIN_IT (TermWin.width, max_width);
649 szHint.width = szHint.base_width + TermWin.width; 772 szHint.width = szHint.base_width + TermWin.width;
650 } 773 }
651 if (height && height - szHint.base_height < max_height) 774 if (height && height - szHint.base_height < max_height)
652 { 775 {
653 szHint.height = height; 776 szHint.height = height;
654 TermWin.height = height - szHint.base_height; 777 TermWin.height = height - szHint.base_height;
655 } 778 }
656 else 779 else
657 { 780 {
658 MIN_IT(TermWin.height, max_height); 781 MIN_IT (TermWin.height, max_height);
659 szHint.height = szHint.base_height + TermWin.height; 782 szHint.height = szHint.base_height + TermWin.height;
660 } 783 }
661 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 784 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
662 window_sb_x = szHint.width - sb_w; 785 window_sb_x = szHint.width - sb_w;
663 786
… …
668 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 791 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
669 - szHint.height - 2 * TermWin.ext_bwidth); 792 - szHint.height - 2 * TermWin.ext_bwidth);
670 793
671 TermWin.ncol = TermWin.width / TermWin.fwidth; 794 TermWin.ncol = TermWin.width / TermWin.fwidth;
672 TermWin.nrow = TermWin.height / TermWin.fheight; 795 TermWin.nrow = TermWin.height / TermWin.fheight;
673 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 796 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
674 TermWin.ncol, TermWin.nrow, szHint.width, 797 TermWin.ncol, TermWin.nrow, szHint.width,
675 szHint.height)); 798 szHint.height));
676 return; 799 return;
677} 800}
678 801
… …
694 ws.ws_xpixel = ws.ws_ypixel = 0; 817 ws.ws_xpixel = ws.ws_ypixel = 0;
695#ifndef DEBUG_SIZE 818#ifndef DEBUG_SIZE
696 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 819 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
697#else 820#else
698 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 821 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
699 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 822 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
700# ifdef SIGWINCH 823# ifdef SIGWINCH
701 else if (cmd_pid) /* force through to the command */ 824 else if (cmd_pid) /* force through to the command */
702 kill (cmd_pid, SIGWINCH); 825 kill (cmd_pid, SIGWINCH);
703# endif 826# endif
704#endif 827#endif
705} 828}
706 829
707/*----------------------------------------------------------------------*/ 830/*----------------------------------------------------------------------*/
708/* rxvt_change_font() - Switch to a new font */ 831/* rxvt_change_font () - Switch to a new font */
709/* 832/*
710 * init = 1 - initialize 833 * init = 1 - initialize
711 * 834 *
712 * fontname == FONT_UP - switch to bigger font 835 * fontname == FONT_UP - switch to bigger font
713 * fontname == FONT_DN - switch to smaller font 836 * fontname == FONT_DN - switch to smaller font
714 */ 837 */
715void 838bool
716rxvt_term::change_font (int init, const char *fontname) 839rxvt_term::change_font (const char *fontname)
717{} 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);
718 852
719void 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
720rxvt_term::font_up_down (int n, int direction) 876rxvt_term::font_up_down (int n, int direction)
721{} 877{
878 return false;
879}
722 880
723/*----------------------------------------------------------------------*/ 881/*----------------------------------------------------------------------*/
724/*----------------------------------------------------------------------*/ 882/*----------------------------------------------------------------------*/
725/* xterm sequences - title, iconName, color (exptl) */ 883/* xterm sequences - title, iconName, color (exptl) */
726void 884void
727rxvt_term::set_title (const char *str) 885rxvt_term::set_title (const char *str)
728{ 886{
729#ifndef SMART_WINDOW_TITLE 887#ifdef SMART_WINDOW_TITLE
730 XStoreName(display->display, TermWin.parent[0], str); 888 char *name;
731#else
732 char *name;
733 889
734 if (XFetchName(display->display, TermWin.parent[0], &name) == 0) 890 if (!XFetchName (display->display, TermWin.parent[0], &name))
735 name = NULL; 891 name = NULL;
892
736 if (name == NULL || STRCMP(name, str)) 893 if (name == NULL || STRCMP (name, str))
894#endif
737 XStoreName(display->display, TermWin.parent[0], str); 895 XStoreName (display->display, TermWin.parent[0], str);
896
897#ifdef SMART_WINDOW_TITLE
738 if (name) 898 if (name)
739 XFree(name); 899 XFree (name);
740#endif 900#endif
741} 901}
742 902
743void 903void
744rxvt_term::set_iconName (const char *str) 904rxvt_term::set_icon_name (const char *str)
745{ 905{
746#ifndef SMART_WINDOW_TITLE 906#ifdef SMART_WINDOW_TITLE
747 XSetIconName(display->display, TermWin.parent[0], str); 907 char *name;
748#else
749 char *name;
750 908
751 if (XGetIconName(display->display, TermWin.parent[0], &name)) 909 if (!XGetIconName (display->display, TermWin.parent[0], &name))
752 name = NULL; 910 name = NULL;
911
753 if (name == NULL || STRCMP(name, str)) 912 if (name == NULL || STRCMP (name, str))
913#endif
754 XSetIconName(display->display, TermWin.parent[0], str); 914 XSetIconName (display->display, TermWin.parent[0], str);
915
916#ifdef SMART_WINDOW_TITLE
755 if (name) 917 if (name)
756 XFree(name); 918 XFree (name);
757#endif 919#endif
758} 920}
759 921
760#ifdef XTERM_COLOR_CHANGE 922#ifdef XTERM_COLOR_CHANGE
761void 923void
762rxvt_term::set_window_color (int idx, const char *color) 924rxvt_term::set_window_color (int idx, const char *color)
763{ 925{
764 rxvt_color xcol; 926 rxvt_color xcol;
765 int i; 927 int i;
766 928
767 if (color == NULL || *color == '\0') 929 if (color == NULL || *color == '\0')
768 return; 930 return;
769 931
770 /* handle color aliases */ 932 /* handle color aliases */
771 if (isdigit(*color)) 933 if (isdigit (*color))
772 { 934 {
773 i = atoi(color); 935 i = atoi (color);
774 if (i >= 8 && i <= 15) 936 if (i >= 8 && i <= 15)
775 { /* bright colors */ 937 { /* bright colors */
776 i -= 8; 938 i -= 8;
777# ifndef NO_BRIGHTCOLOR 939# ifndef NO_BRIGHTCOLOR
778 PixColors[idx] = PixColors[minBrightCOLOR + i]; 940 PixColors[idx] = PixColors[minBrightCOLOR + i];
779 SET_PIXCOLOR(idx); 941 SET_PIXCOLOR (idx);
780 goto Done; 942 goto Done;
781# endif 943# endif
782 944
783 } 945 }
784 if (i >= 0 && i <= 7) 946 if (i >= 0 && i <= 7)
785 { /* normal colors */ 947 { /* normal colors */
786 PixColors[idx] = PixColors[minCOLOR + i]; 948 PixColors[idx] = PixColors[minCOLOR + i];
787 SET_PIXCOLOR(idx); 949 SET_PIXCOLOR (idx);
788 goto Done; 950 goto Done;
789 } 951 }
790 } 952 }
953
791 if (!rXParseAllocColor (& xcol, color)) 954 if (!rXParseAllocColor (& xcol, color))
792 return; 955 return;
956
793 /* XStoreColor (display->display, XCMAP, XColor*); */ 957 /* XStoreColor (display->display, XCMAP, XColor*); */
794 958
795 /* 959 /*
796 * 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,
797 * so just keep gobbling up the colormap 961 * so just keep gobbling up the colormap
… …
801 if (PixColors[idx] == PixColors[i]) 965 if (PixColors[idx] == PixColors[i])
802 break; 966 break;
803 if (i > Color_White) 967 if (i > Color_White)
804 { 968 {
805 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 969 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
806 XFreeColors(display->display, XCMAP, (PixColors + idx), 1, 970 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
807 DisplayPlanes(display->display, display->screen)); 971 DisplayPlanes (display->display, display->screen));
808 } 972 }
809# endif 973# endif
810 974
811 PixColors[idx] = xcol; 975 PixColors[idx] = xcol;
812 SET_PIXCOLOR(idx); 976 SET_PIXCOLOR (idx);
813 977
814 /* XSetWindowAttributes attr; */ 978 /* XSetWindowAttributes attr; */
815 /* Cursor cursor; */ 979 /* Cursor cursor; */
816Done: 980Done:
817 if (idx == Color_bg && !(Options & Opt_transparent)) 981 if (idx == Color_bg && ! (Options & Opt_transparent))
818 XSetWindowBackground(display->display, TermWin.vt, 982 XSetWindowBackground (display->display, TermWin.vt,
819 PixColors[Color_bg]); 983 PixColors[Color_bg]);
820 984
821 /* handle Color_BD, scrollbar background, etc. */ 985 /* handle Color_BD, scrollbar background, etc. */
822 986
823 set_colorfgbg (); 987 set_colorfgbg ();
824 recolour_cursor (); 988 recolour_cursor ();
825 /* the only reasonable way to enforce a clean update */ 989 scr_touch (true);
826 scr_poweron ();
827} 990}
828 991
829#else 992#else
830# define set_window_color (idx,color) ((void)0) 993# define set_window_color (idx,color) ((void)0)
831#endif /* XTERM_COLOR_CHANGE */ 994#endif /* XTERM_COLOR_CHANGE */
832 995
833void 996void
834rxvt_term::recolour_cursor () 997rxvt_term::recolour_cursor ()
835{ 998{
836#if TODO
837 rxvt_color xcol[2]; 999 XColor xcol[2];
838 1000
839 xcol[0] = PixColors[Color_pointer]; 1001 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColors[Color_pointer_fg] : PixColors[Color_fg];
840 xcol[1] = PixColors[Color_bg]; 1002 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColors[Color_pointer_bg] : PixColors[Color_bg];
841 XQueryColors (display->display, XCMAP, xcol, 2); 1003 XQueryColors (display->display, XCMAP, xcol, 2);
842 XRecolorCursor (display->display, TermWin_cursor, &(xcol[0]), &(xcol[1])); 1004 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
843#endif
844} 1005}
845 1006
846/*----------------------------------------------------------------------*/ 1007/*----------------------------------------------------------------------*/
847/* 1008/*
848 * 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
… …
850void 1011void
851rxvt_term::set_colorfgbg () 1012rxvt_term::set_colorfgbg ()
852{ 1013{
853 unsigned int i; 1014 unsigned int i;
854 const char *xpmb = "\0"; 1015 const char *xpmb = "\0";
855 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 1016 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
856 1017
857 env_colorfgbg = 1018 env_colorfgbg =
858 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 1019 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
859 STRCPY(fstr, "default"); 1020 STRCPY (fstr, "default");
860 STRCPY(bstr, "default"); 1021 STRCPY (bstr, "default");
861 for (i = Color_Black; i <= Color_White; i++) 1022 for (i = Color_Black; i <= Color_White; i++)
862 if (PixColors[Color_fg] == PixColors[i]) 1023 if (PixColors[Color_fg] == PixColors[i])
863 { 1024 {
864 sprintf(fstr, "%d", (i - Color_Black)); 1025 sprintf (fstr, "%d", (i - Color_Black));
865 break; 1026 break;
866 } 1027 }
867 for (i = Color_Black; i <= Color_White; i++) 1028 for (i = Color_Black; i <= Color_White; i++)
868 if (PixColors[Color_bg] == PixColors[i]) 1029 if (PixColors[Color_bg] == PixColors[i])
869 { 1030 {
870 sprintf(bstr, "%d", (i - Color_Black)); 1031 sprintf (bstr, "%d", (i - Color_Black));
871#ifdef XPM_BACKGROUND 1032#ifdef XPM_BACKGROUND
872 xpmb = "default;"; 1033 xpmb = "default;";
873#endif 1034#endif
874 break; 1035 break;
875 } 1036 }
1037
876 sprintf(env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1038 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
877 putenv(env_colorfgbg);
878 1039
879#ifndef NO_BRIGHTCOLOR 1040#ifndef NO_BRIGHTCOLOR
880 colorfgbg = DEFAULT_RSTYLE; 1041 colorfgbg = DEFAULT_RSTYLE;
881 for (i = minCOLOR; i <= maxCOLOR; i++) 1042 for (i = minCOLOR; i <= maxCOLOR; i++)
882 { 1043 {
883 if (PixColors[Color_fg] == PixColors[i]) 1044 if (PixColors[Color_fg] == PixColors[i])
884 colorfgbg = SET_FGCOLOR(colorfgbg, i); 1045 colorfgbg = SET_FGCOLOR (colorfgbg, i);
885 if (PixColors[Color_bg] == PixColors[i]) 1046 if (PixColors[Color_bg] == PixColors[i])
886 colorfgbg = SET_BGCOLOR(colorfgbg, i); 1047 colorfgbg = SET_BGCOLOR (colorfgbg, i);
887 } 1048 }
888#endif 1049#endif
889} 1050}
890 1051
891/*----------------------------------------------------------------------*/ 1052/*----------------------------------------------------------------------*/
… …
897int 1058int
898rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1059rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
899{ 1060{
900 if (!screen_in_out->set (display, colour)) 1061 if (!screen_in_out->set (display, colour))
901 { 1062 {
902 rxvt_print_error("can't allocate colour: %s", colour); 1063 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
903 return false; 1064 return false;
904 } 1065 }
905 1066
906 return true; 1067 return true;
907} 1068}
… …
987 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1148 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
988 1149
989 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1150 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
990 window_vt_y, TermWin_TotalWidth (), 1151 window_vt_y, TermWin_TotalWidth (),
991 TermWin_TotalHeight ()); 1152 TermWin_TotalHeight ());
992#ifdef RXVT_GRAPHICS 1153 scr_clear (height != old_height);
993 if (old_height)
994 Gr_Resize (old_width - szHint.base_width,
995 old_height - szHint.base_height);
996#endif
997 scr_clear ();
998#ifdef XPM_BACKGROUND 1154#ifdef XPM_BACKGROUND
999 resize_pixmap (); 1155 resize_pixmap ();
1000#endif 1156#endif
1001 1157
1002 } 1158 }
… …
1013 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1169 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1014 curr_screen = scr_change_screen (PRIMARY); 1170 curr_screen = scr_change_screen (PRIMARY);
1015 TermWin.ncol = ncol; 1171 TermWin.ncol = ncol;
1016 } 1172 }
1017 1173
1018 scr_reset(); 1174 scr_reset ();
1019 1175
1020 if (curr_screen >= 0) /* this is not the first time through */ 1176 if (curr_screen >= 0) /* this is not the first time through */
1021 { 1177 {
1022 scr_change_screen (curr_screen); 1178 scr_change_screen (curr_screen);
1023 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1179 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
… …
1041{ 1197{
1042 XWindowAttributes wattr; 1198 XWindowAttributes wattr;
1043 1199
1044 if (width == 0 || height == 0) 1200 if (width == 0 || height == 0)
1045 { 1201 {
1046 XGetWindowAttributes(display->display, display->root, &wattr); 1202 XGetWindowAttributes (display->display, display->root, &wattr);
1047 if (width == 0) 1203 if (width == 0)
1048 width = wattr.width - szHint.base_width; 1204 width = wattr.width - szHint.base_width;
1049 if (height == 0) 1205 if (height == 0)
1050 height = wattr.height - szHint.base_height; 1206 height = wattr.height - szHint.base_height;
1051 } 1207 }
… …
1065void 1221void
1066rxvt_term::im_set_size (XRectangle *size) 1222rxvt_term::im_set_size (XRectangle *size)
1067{ 1223{
1068 size->x = TermWin.int_bwidth; 1224 size->x = TermWin.int_bwidth;
1069 size->y = TermWin.int_bwidth; 1225 size->y = TermWin.int_bwidth;
1070 size->width = Width2Pixel(TermWin.ncol); 1226 size->width = Width2Pixel (TermWin.ncol);
1071 size->height = Height2Pixel(TermWin.nrow); 1227 size->height = Height2Pixel (TermWin.nrow);
1072} 1228}
1073 1229
1074void 1230void
1075rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg) 1231rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
1076{ 1232{
… …
1086 Atom atom; 1242 Atom atom;
1087 Window win; 1243 Window win;
1088 char server[IMBUFSIZ]; 1244 char server[IMBUFSIZ];
1089 1245
1090 /* get current locale modifier */ 1246 /* get current locale modifier */
1091 if ((p = XSetLocaleModifiers(NULL)) != NULL) 1247 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1092 { 1248 {
1093 STRCPY(server, "@server="); 1249 STRCPY (server, "@server=");
1094 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1250 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1095 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1251 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
1096 *p = '\0'; 1252 *p = '\0';
1097 1253
1098 atom = XInternAtom(display->display, server, False); 1254 atom = XInternAtom (display->display, server, False);
1099 win = XGetSelectionOwner(display->display, atom); 1255 win = XGetSelectionOwner (display->display, atom);
1100 if (win != None) 1256 if (win != None)
1101 return True; 1257 return True;
1102 } 1258 }
1103 return False; 1259 return False;
1104} 1260}
… …
1108{ 1264{
1109 XPoint spot; 1265 XPoint spot;
1110 XVaNestedList preedit_attr; 1266 XVaNestedList preedit_attr;
1111 1267
1112 if (Input_Context == NULL 1268 if (Input_Context == NULL
1113 || !TermWin.focus || !(input_style & XIMPreeditPosition) 1269 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
1114 || !(event_type == KeyPress 1270 || ! (event_type == KeyPress
1115 || event_type == Expose 1271 || event_type == Expose
1116 || event_type == NoExpose 1272 || event_type == NoExpose
1117 || event_type == SelectionNotify 1273 || event_type == SelectionNotify
1118 || event_type == ButtonRelease || event_type == FocusIn) 1274 || event_type == ButtonRelease || event_type == FocusIn)
1119 || !IMisRunning ()) 1275 || !IMisRunning ())
1120 return; 1276 return;
1121 1277
1122 im_set_position (&spot); 1278 im_set_position (&spot);
1123 1279
1124 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1280 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1125 XSetICValues(Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1281 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1126 XFree(preedit_attr); 1282 XFree (preedit_attr);
1127} 1283}
1128 1284
1129void 1285void
1130rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, 1286rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1131 XRectangle * needed_rect) 1287 XRectangle * needed_rect)
1132{ 1288{
1133 int mbh, vtx = 0; 1289 int mbh, vtx = 0;
1134 1290
1135 if (scrollbar_visible () && !(Options & Opt_scrollBar_right)) 1291 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1136 vtx = scrollbar_TotalWidth(); 1292 vtx = scrollbar_TotalWidth ();
1137 1293
1138 mbh = menubar_visible () ? menuBar_TotalHeight() : 0; 1294 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1139 mbh -= TermWin.lineSpace; 1295 mbh -= TermWin.lineSpace;
1140 1296
1141 preedit_rect->x = needed_rect->width + vtx; 1297 preedit_rect->x = needed_rect->width + vtx;
1142 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; 1298 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1143 1299
1144 preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx; 1300 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1145 preedit_rect->height = Height2Pixel(1); 1301 preedit_rect->height = Height2Pixel (1);
1146 1302
1147 status_rect->x = vtx; 1303 status_rect->x = vtx;
1148 status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; 1304 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1149 1305
1150 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1); 1306 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1151 status_rect->height = Height2Pixel(1); 1307 status_rect->height = Height2Pixel (1);
1152} 1308}
1153 1309
1154void 1310void
1155rxvt_term::im_destroy () 1311rxvt_term::im_destroy ()
1156{ 1312{
… …
1182 const char *p; 1338 const char *p;
1183 char **s; 1339 char **s;
1184 XIMStyles *xim_styles; 1340 XIMStyles *xim_styles;
1185 XVaNestedList preedit_attr, status_attr; 1341 XVaNestedList preedit_attr, status_attr;
1186 1342
1187 if (!((p = XSetLocaleModifiers (modifiers)) && *p)) 1343 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1188 return false; 1344 return false;
1189 1345
1190 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1346 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1191 input_method = display->get_xim (locale, modifiers); 1347 input_method = display->get_xim (locale, modifiers);
1192 if (input_method == NULL) 1348 if (input_method == NULL)
1193 return false; 1349 return false;
1194 1350
1195 xim = input_method->xim; 1351 xim = input_method->xim;
… …
1201 display->put_xim (input_method); 1357 display->put_xim (input_method);
1202 return false; 1358 return false;
1203 } 1359 }
1204 1360
1205 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1361 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1206 s = rxvt_splitcommastring(p); 1362 s = rxvt_splitcommastring (p);
1207 for (i = found = 0; !found && s[i]; i++) 1363 for (i = found = 0; !found && s[i]; i++)
1208 { 1364 {
1209 if (!STRCMP(s[i], "OverTheSpot")) 1365 if (!STRCMP (s[i], "OverTheSpot"))
1210 input_style = (XIMPreeditPosition | XIMStatusNothing); 1366 input_style = (XIMPreeditPosition | XIMStatusNothing);
1211 else if (!STRCMP(s[i], "OffTheSpot")) 1367 else if (!STRCMP (s[i], "OffTheSpot"))
1212 input_style = (XIMPreeditArea | XIMStatusArea); 1368 input_style = (XIMPreeditArea | XIMStatusArea);
1213 else if (!STRCMP(s[i], "Root")) 1369 else if (!STRCMP (s[i], "Root"))
1214 input_style = (XIMPreeditNothing | XIMStatusNothing); 1370 input_style = (XIMPreeditNothing | XIMStatusNothing);
1215 1371
1216 for (j = 0; j < xim_styles->count_styles; j++) 1372 for (j = 0; j < xim_styles->count_styles; j++)
1217 if (input_style == xim_styles->supported_styles[j]) 1373 if (input_style == xim_styles->supported_styles[j])
1218 { 1374 {
… …
1239 { 1395 {
1240 im_set_size (&rect); 1396 im_set_size (&rect);
1241 im_set_position (&spot); 1397 im_set_position (&spot);
1242 im_set_color (&fg, &bg); 1398 im_set_color (&fg, &bg);
1243 1399
1244 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1400 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1245 XNSpotLocation, &spot, 1401 XNSpotLocation, &spot,
1246 XNForeground, fg, XNBackground, bg, 1402 XNForeground, fg, XNBackground, bg,
1247 //XNFontSet, TermWin.fontset, 1403 //XNFontSet, TermWin.fontset,
1248 NULL); 1404 NULL);
1249 } 1405 }
… …
1257 */ 1413 */
1258 needed_rect.width = 0; 1414 needed_rect.width = 0;
1259 1415
1260 im_set_preedit_area (&rect, &status_rect, &needed_rect); 1416 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1261 1417
1262 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1418 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1263 XNForeground, fg, XNBackground, bg, 1419 XNForeground, fg, XNBackground, bg,
1264 //XNFontSet, TermWin.fontset, 1420 //XNFontSet, TermWin.fontset,
1265 NULL); 1421 NULL);
1266 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, 1422 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1267 XNForeground, fg, XNBackground, bg, 1423 XNForeground, fg, XNBackground, bg,
1268 //XNFontSet, TermWin.fontset, 1424 //XNFontSet, TermWin.fontset,
1269 NULL); 1425 NULL);
1270 } 1426 }
1271 1427
1272 Input_Context = XCreateIC(xim, XNInputStyle, input_style, 1428 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1273 XNClientWindow, TermWin.parent[0], 1429 XNClientWindow, TermWin.parent[0],
1274 XNFocusWindow, TermWin.parent[0], 1430 XNFocusWindow, TermWin.parent[0],
1275 preedit_attr ? XNPreeditAttributes : NULL, 1431 preedit_attr ? XNPreeditAttributes : NULL,
1276 preedit_attr, 1432 preedit_attr,
1277 status_attr ? XNStatusAttributes : NULL, 1433 status_attr ? XNStatusAttributes : NULL,
1278 status_attr, NULL); 1434 status_attr, NULL);
1279 if (preedit_attr) XFree(preedit_attr); 1435 if (preedit_attr) XFree (preedit_attr);
1280 if (status_attr) XFree(status_attr); 1436 if (status_attr) XFree (status_attr);
1281 1437
1282 if (Input_Context == NULL) 1438 if (Input_Context == NULL)
1283 { 1439 {
1284 rxvt_print_error("failed to create input context"); 1440 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1285 display->put_xim (input_method); 1441 display->put_xim (input_method);
1286 return false; 1442 return false;
1287 } 1443 }
1288 1444
1289 if (input_style & XIMPreeditArea) 1445 if (input_style & XIMPreeditArea)
1290 IMSetStatusPosition (); 1446 IMSetStatusPosition ();
1291 1447
1292 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); 1448 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1293 return true; 1449 return true;
1294} 1450}
1295 1451
1296void 1452void
1297rxvt_term::im_cb () 1453rxvt_term::im_cb ()
… …
1301 char **s; 1457 char **s;
1302 char buf[IMBUFSIZ]; 1458 char buf[IMBUFSIZ];
1303 1459
1304 im_destroy (); 1460 im_destroy ();
1305 1461
1306 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1462 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1307 if (Input_Context) 1463 if (Input_Context)
1308 return; 1464 return;
1309 1465
1310#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1466#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1311 if (rs[Rs_imLocale]) 1467 if (rs[Rs_imLocale])
1312 setlocale (LC_CTYPE, rs[Rs_imLocale]); 1468 SET_LOCALE (rs[Rs_imLocale]);
1313#endif 1469#endif
1314 1470
1315 p = rs[Rs_inputMethod]; 1471 p = rs[Rs_inputMethod];
1316 if (p && *p) 1472 if (p && *p)
1317 { 1473 {
… …
1330 break; 1486 break;
1331 } 1487 }
1332 } 1488 }
1333 } 1489 }
1334 for (i = 0; s[i]; i++) 1490 for (i = 0; s[i]; i++)
1335 free(s[i]); 1491 free (s[i]);
1336 free(s); 1492 free (s);
1337 1493
1338 if (found) 1494 if (found)
1339 goto done; 1495 goto done;
1340 } 1496 }
1341 1497
… …
1348 goto done; 1504 goto done;
1349 1505
1350done: 1506done:
1351#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1507#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1352 if (rs[Rs_imLocale]) 1508 if (rs[Rs_imLocale])
1353 setlocale (LC_CTYPE, locale); 1509 SET_LOCALE (locale);
1354#endif 1510#endif
1355} 1511}
1356 1512
1357void 1513void
1358rxvt_term::IMSetStatusPosition () 1514rxvt_term::IMSetStatusPosition ()
1359{ 1515{
1360 XRectangle preedit_rect, status_rect, *needed_rect; 1516 XRectangle preedit_rect, status_rect, *needed_rect;
1361 XVaNestedList preedit_attr, status_attr; 1517 XVaNestedList preedit_attr, status_attr;
1362 1518
1363 if (Input_Context == NULL 1519 if (Input_Context == NULL
1364 || !TermWin.focus || !(input_style & XIMPreeditArea) 1520 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1365 || !IMisRunning ()) 1521 || !IMisRunning ())
1366 return; 1522 return;
1367 1523
1368 /* Getting the necessary width of preedit area */ 1524 /* Getting the necessary width of preedit area */
1369 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1525 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1370 XGetICValues(Input_Context, XNStatusAttributes, status_attr, NULL); 1526 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1371 XFree(status_attr); 1527 XFree (status_attr);
1372 1528
1373 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect); 1529 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1374 1530
1375 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1531 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1376 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1532 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1377 1533
1378 XSetICValues(Input_Context, 1534 XSetICValues (Input_Context,
1379 XNPreeditAttributes, preedit_attr, 1535 XNPreeditAttributes, preedit_attr,
1380 XNStatusAttributes, status_attr, NULL); 1536 XNStatusAttributes, status_attr, NULL);
1381 1537
1382 XFree(preedit_attr); 1538 XFree (preedit_attr);
1383 XFree(status_attr); 1539 XFree (status_attr);
1384} 1540}
1385#endif /* USE_XIM */ 1541#endif /* USE_XIM */
1386 1542
1387/*----------------------------------------------------------------------*/ 1543/*----------------------------------------------------------------------*/
1388rxvt_t rxvt_current_term; 1544rxvt_t rxvt_current_term;

Diff Legend

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