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.31 by pcg, Fri Feb 13 12:11:05 2004 UTC vs.
Revision 1.60 by pcg, Sun Mar 28 02:07:08 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*;
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
16 * 17 *
17 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
20 * (at your option) any later version. 21 * (at your option) any later version.
… …
55 STRNCPY (curlocale, locale, 128); 56 STRNCPY (curlocale, locale, 128);
56 setlocale (LC_CTYPE, curlocale); 57 setlocale (LC_CTYPE, curlocale);
57 } 58 }
58} 59}
59 60
61#if ENABLE_COMBINING
62class rxvt_composite_vec rxvt_composite;
63
64text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
65{
66 compose_char *cc;
67
68 // break compose chains, as stupid readline really likes to duplicate
69 // composing characters for some reason near the end of a line.
70 cc = (*this)[c1];
71 while (cc)
72 {
73 if (cc->c2 == c2) return c1;
74 cc = (*this)[cc->c1];
75 }
76
77 // check to see wether this combination already exists otherwise
78 for (cc = v.end (); cc-- > v.begin (); )
79 {
80 if (cc->c1 == c1 && cc->c2 == c2)
81 return COMPOSE_LO + (cc - v.begin ());
82 }
83
84 // allocate a new combination
85 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
86 {
87 static int seen;
88
89 if (!seen++)
90 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");
91
92 return REPLACEMENT_CHAR;
93 }
94
95 v.push_back (compose_char (c1, c2));
96
97 return v.size () - 1 + COMPOSE_LO;
98}
99
100int rxvt_composite_vec::expand (unicode_t c, wchar_t *r)
101{
102 compose_char *cc = (*this)[c];
103
104 if (!cc)
105 {
106 if (r) *r = c;
107 return 1;
108 }
109
110 int len = expand (cc->c1, r);
111
112 if (r) r += len;
113
114 if (cc->c2 != NOCHAR)
115 {
116 len++;
117 if (r) *r++ = cc->c2;
118 }
119
120 return len;
121
122}
123#endif
124
60void * 125void *
61rxvt_term::operator new (size_t s) 126rxvt_term::operator new (size_t s)
62{ 127{
63 void *p = malloc (s); 128 void *p = malloc (s);
64 129
… …
79 vt_ev (this, &rxvt_term::x_cb), 144 vt_ev (this, &rxvt_term::x_cb),
80#ifdef HAVE_SCROLLBARS 145#ifdef HAVE_SCROLLBARS
81 scrollbar_ev (this, &rxvt_term::x_cb), 146 scrollbar_ev (this, &rxvt_term::x_cb),
82#endif 147#endif
83#ifdef MENUBAR 148#ifdef MENUBAR
84 menubar_ev (this, &rxvt_term::x_cb), fixme 149 menubar_ev (this, &rxvt_term::x_cb),
85#endif 150#endif
86#ifdef CURSOR_BLINK 151#ifdef CURSOR_BLINK
87 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 152 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
88#endif 153#endif
89#ifdef TEXT_BLINK 154#ifdef TEXT_BLINK
90 text_blink_ev (this, &rxvt_term::text_blink_cb), 155 text_blink_ev (this, &rxvt_term::text_blink_cb),
91#endif 156#endif
92#ifdef POINTER_BLANK 157#ifdef POINTER_BLANK
93 pointer_ev (this, &rxvt_term::pointer_cb), 158 pointer_ev (this, &rxvt_term::pointer_cb),
159#endif
160#ifdef USE_XIM
161 im_ev (this, &rxvt_term::im_cb),
94#endif 162#endif
95 check_ev (this, &rxvt_term::check_cb), 163 check_ev (this, &rxvt_term::check_cb),
96 destroy_ev (this, &rxvt_term::destroy_cb), 164 destroy_ev (this, &rxvt_term::destroy_cb),
97 pty_ev (this, &rxvt_term::pty_cb), 165 pty_ev (this, &rxvt_term::pty_cb),
98 incr_ev (this, &rxvt_term::incr_cb), 166 incr_ev (this, &rxvt_term::incr_cb)
99#ifdef USE_XIM
100 im_ev (this, &rxvt_term::im_cb)
101#endif
102{ 167{
103 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 168 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
104} 169}
105 170
106rxvt_term::~rxvt_term () 171rxvt_term::~rxvt_term ()
107{ 172{
108 if (cmd_fd >= 0) 173 if (cmd_fd >= 0)
109 close (cmd_fd); 174 close (cmd_fd);
110 175
111 scr_release ();
112
113 free (locale);
114 free (codeset);
115
116#ifndef NO_SETOWNER_TTYDEV 176#ifndef NO_SETOWNER_TTYDEV
117 privileged_ttydev (RESTORE); 177 privileged_ttydev (RESTORE);
118#endif 178#endif
119#ifdef UTMP_SUPPORT 179#ifdef UTMP_SUPPORT
120 privileged_utmp (RESTORE); 180 privileged_utmp (RESTORE);
121#endif 181#endif
122 182
123 // TODO: free pixcolours, colours should become part of rxvt_display
124
125 delete PixColors;
126 delete TermWin.fontset; 183 delete TermWin.fontset;
127 184
128 displays.put (display);
129}
130
131void
132rxvt_term::destroy ()
133{
134 if (display) 185 if (display)
135 { 186 {
187 selection_clear ();
188
189#ifdef MENUBAR
190 if (menubarGC) XFreeGC (display->display, menubarGC);
191#endif
192#ifdef XTERM_SCROLLBAR
193 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
194 if (ShadowGC) XFreeGC (display->display, ShadowGC);
195#endif
196#ifdef PLAIN_SCROLLBAR
197 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC);
198#endif
199#ifdef NEXT_SCROLLBAR
200 if (blackGC) XFreeGC (display->display, blackGC);
201 if (whiteGC) XFreeGC (display->display, whiteGC);
202 if (grayGC) XFreeGC (display->display, grayGC);
203 if (darkGC) XFreeGC (display->display, darkGC);
204 if (stippleGC) XFreeGC (display->display, stippleGC);
205 if (dimple) XFreePixmap (display->display, dimple);
206 if (upArrow) XFreePixmap (display->display, upArrow);
207 if (downArrow) XFreePixmap (display->display, downArrow);
208 if (upArrowHi) XFreePixmap (display->display, upArrowHi);
209 if (downArrowHi) XFreePixmap (display->display, downArrowHi);
210#endif
211#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
212 if (topShadowGC) XFreeGC (display->display, topShadowGC);
213 if (botShadowGC) XFreeGC (display->display, botShadowGC);
214 if (scrollbarGC) XFreeGC (display->display, scrollbarGC);
215#endif
216 if (TermWin.gc) XFreeGC (display->display, TermWin.gc);
217
218#if defined(MENUBAR) && (MENUBAR_MAX > 1)
219 delete menuBar.drawable;
220 //if (menuBar.win)
221 // XDestroyWindow (display->display, menuBar.win);
222#endif
223 delete TermWin.drawable;
224 // destroy all windows
136 if (TermWin.parent[0]) 225 if (TermWin.parent[0])
137 XDestroyWindow (display->display, TermWin.parent[0]); 226 XDestroyWindow (display->display, TermWin.parent[0]);
227 }
138 228
229 // TODO: free pixcolours, colours should become part of rxvt_display
230
231 delete PixColors;
232
233 displays.put (display);
234
235 scr_release ();
236
237 /* clear all resources */
238 for (int i = 0; i < allocated.size (); i++)
239 free (allocated[i]);
240
241 free (selection.text);
242 // TODO: manage env vars in child only(!)
243 free (env_windowid);
244 free (env_display);
245 free (env_term);
246 free (env_colorfgbg);
247 free (locale);
248#if 0
249 free (codeset);
250#endif
251
252 delete envv;
253 delete argv;
254}
255
256void
257rxvt_term::destroy ()
258{
259 if (display)
260 {
139 rootwin_ev.stop (display); 261 rootwin_ev.stop (display);
140 termwin_ev.stop (display); 262 termwin_ev.stop (display);
141 vt_ev.stop (display); 263 vt_ev.stop (display);
142
143#ifdef USE_XIM 264#ifdef USE_XIM
144 im_destroy (); 265 im_destroy ();
145 im_ev.stop (display); 266 im_ev.stop (display);
146#endif 267#endif
147#ifdef HAVE_SCROLLBARS 268#ifdef HAVE_SCROLLBARS
… …
174 295
175 delete this; 296 delete this;
176} 297}
177 298
178/*----------------------------------------------------------------------*/ 299/*----------------------------------------------------------------------*/
179/* rxvt_init() */ 300/* rxvt_init () */
180/* LIBPROTO */
181rxvt_t
182rxvt_init (int argc, const char *const *argv)
183{
184 SET_R (new rxvt_term);
185
186 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
187 {
188 delete GET_R;
189 SET_R (0);
190 }
191
192 return GET_R;
193}
194
195static int (*old_xerror_handler)(Display *dpy, XErrorEvent *event);
196
197void
198rxvt_init_signals ()
199{
200 /* install exit handler for cleanup */
201#if 0
202#ifdef HAVE_ATEXIT
203 atexit(rxvt_clean_exit);
204#else
205#endif
206#endif
207
208 struct sigaction sa;
209
210 sigfillset (&sa.sa_mask);
211 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
212 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
213 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
214 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
215 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
216 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
217 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
218
219 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
220 /* signal (SIGURG, SIG_DFL); */
221
222 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
223 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
224}
225
226bool 301bool
227rxvt_term::init (int argc, const char *const *argv) 302rxvt_term::init (int argc, const char *const *argv)
228{ 303{
304 SET_R (this);
305
306 if (!init_vars ())
307 return false;
308
229 /* 309 /*
230 * Save and then give up any super-user privileges 310 * Save and then give up any super-user privileges
231 * If we need privileges in any area then we must specifically request it. 311 * If we need privileges in any area then we must specifically request it.
232 * We should only need to be root in these cases: 312 * We should only need to be root in these cases:
233 * 1. write utmp entries on some systems 313 * 1. write utmp entries on some systems
… …
240 320
241 const char **cmd_argv = init_resources (argc, argv); 321 const char **cmd_argv = init_resources (argc, argv);
242 322
243 set_locale (""); 323 set_locale ("");
244 324
245#if (MENUBAR_MAX) 325#if MENUBAR_MAX
246 menubar_read (rs[Rs_menu]); 326 menubar_read (rs[Rs_menu]);
247#endif 327#endif
248#ifdef HAVE_SCROLLBARS 328#ifdef HAVE_SCROLLBARS
249 if (Options & Opt_scrollBar) 329 if (Options & Opt_scrollBar)
250 scrollBar.setIdle (); /* set existence for size calculations */ 330 scrollBar.setIdle (); /* set existence for size calculations */
… …
253 create_windows (argc, argv); 333 create_windows (argc, argv);
254 334
255 init_xlocale (); 335 init_xlocale ();
256 336
257 scr_reset (); /* initialize screen */ 337 scr_reset (); /* initialize screen */
258#ifdef RXVT_GRAPHICS
259 Gr_reset (); /* reset graphics */
260#endif
261 338
262#if 0 339#if 0
263#ifdef DEBUG_X
264 XSynchronize(display->display, True); 340 XSynchronize (display->display, True);
265#endif
266#endif 341#endif
267 342
268#ifdef HAVE_SCROLLBARS 343#ifdef HAVE_SCROLLBARS
269 if (Options & Opt_scrollBar) 344 if (Options & Opt_scrollBar)
270 resize_scrollbar (); /* create and map scrollbar */ 345 resize_scrollbar (); /* create and map scrollbar */
271#endif 346#endif
272#if (MENUBAR_MAX) 347#if (MENUBAR_MAX)
273 if (menubar_visible(r)) 348 if (menubar_visible ())
274 XMapWindow (display->display, menuBar.win); 349 XMapWindow (display->display, menuBar.win);
275#endif 350#endif
276#ifdef TRANSPARENT 351#ifdef TRANSPARENT
277 if (Options & Opt_transparent) 352 if (Options & Opt_transparent)
278 { 353 {
… …
284 rootwin_ev.start (display, display->root); 359 rootwin_ev.start (display, display->root);
285 360
286 XMapWindow (display->display, TermWin.vt); 361 XMapWindow (display->display, TermWin.vt);
287 XMapWindow (display->display, TermWin.parent[0]); 362 XMapWindow (display->display, TermWin.parent[0]);
288 363
289 init_env ();
290 init_command (cmd_argv); 364 init_command (cmd_argv);
291 365
292 pty_ev.start (cmd_fd, EVENT_READ); 366 pty_ev.start (cmd_fd, EVENT_READ);
293 367
294 check_ev.start (); 368 check_ev.start ();
295 369
296 return true; 370 return true;
371}
372
373static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
374
375void
376rxvt_init_signals ()
377{
378 /* install exit handler for cleanup */
379#if 0
380#ifdef HAVE_ATEXIT
381 atexit (rxvt_clean_exit);
382#else
383#endif
384#endif
385
386 struct sigaction sa;
387
388 sigfillset (&sa.sa_mask);
389 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
390 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
391 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
392 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
393 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
394 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
395 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
396
397 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
398 /* signal (SIGURG, SIG_DFL); */
399
400 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
401 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
297} 402}
298 403
299/* ------------------------------------------------------------------------- * 404/* ------------------------------------------------------------------------- *
300 * SIGNAL HANDLING & EXIT HANDLER * 405 * SIGNAL HANDLING & EXIT HANDLER *
301 * ------------------------------------------------------------------------- */ 406 * ------------------------------------------------------------------------- */
… …
303 * Catch a SIGCHLD signal and exit if the direct child has died 408 * Catch a SIGCHLD signal and exit if the direct child has died
304 */ 409 */
305/* ARGSUSED */ 410/* ARGSUSED */
306/* EXTPROTO */ 411/* EXTPROTO */
307RETSIGTYPE 412RETSIGTYPE
308rxvt_Child_signal(int sig __attribute__ ((unused))) 413rxvt_Child_signal (int sig __attribute__ ((unused)))
309{ 414{
310 int pid, save_errno = errno; 415 int pid, save_errno = errno;
311 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 416 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
312 ; 417 ;
313 errno = save_errno; 418 errno = save_errno;
… …
321/* 426/*
322 * Catch a fatal signal and tidy up before quitting 427 * Catch a fatal signal and tidy up before quitting
323 */ 428 */
324/* EXTPROTO */ 429/* EXTPROTO */
325RETSIGTYPE 430RETSIGTYPE
326rxvt_Exit_signal(int sig) 431rxvt_Exit_signal (int sig)
327{ 432{
328 signal (sig, SIG_DFL); 433 signal (sig, SIG_DFL);
329#ifdef DEBUG_CMD 434#ifdef DEBUG_CMD
330 rxvt_print_error ("signal %d", sig); 435 rxvt_warn ("caught signal %d, exiting.\n", sig);
331#endif 436#endif
332 rxvt_clean_exit(); 437 rxvt_clean_exit ();
333 kill (getpid (), sig); 438 kill (getpid (), sig);
334} 439}
335 440
336/* INTPROTO */ 441/* INTPROTO */
337int 442int
… …
365/* ------------------------------------------------------------------------- * 470/* ------------------------------------------------------------------------- *
366 * MEMORY ALLOCATION WRAPPERS * 471 * MEMORY ALLOCATION WRAPPERS *
367 * ------------------------------------------------------------------------- */ 472 * ------------------------------------------------------------------------- */
368/* EXTPROTO */ 473/* EXTPROTO */
369void * 474void *
370rxvt_malloc(size_t size) 475rxvt_malloc (size_t size)
371{ 476{
372 void *p; 477 void *p;
373 478
374 p = malloc(size); 479 p = malloc (size);
375 if (p) 480 if (p)
376 return p; 481 return p;
377 482
378 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 483 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
379 rxvt_clean_exit(); 484 rxvt_clean_exit ();
380 exit(EXIT_FAILURE); 485 exit (EXIT_FAILURE);
381 /* NOTREACHED */ 486 /* NOTREACHED */
382} 487}
383 488
384/* EXTPROTO */ 489/* EXTPROTO */
385void * 490void *
386rxvt_calloc(size_t number, size_t size) 491rxvt_calloc (size_t number, size_t size)
387{ 492{
388 void *p; 493 void *p;
389 494
390 p = calloc(number, size); 495 p = calloc (number, size);
391 if (p) 496 if (p)
392 return p; 497 return p;
393 498
394 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 499 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
395 rxvt_clean_exit(); 500 rxvt_clean_exit ();
396 exit(EXIT_FAILURE); 501 exit (EXIT_FAILURE);
397 /* NOTREACHED */ 502 /* NOTREACHED */
398} 503}
399 504
400/* EXTPROTO */ 505/* EXTPROTO */
401void * 506void *
402rxvt_realloc(void *ptr, size_t size) 507rxvt_realloc (void *ptr, size_t size)
403{ 508{
404 void *p; 509 void *p;
405 510
406 if (ptr) 511 if (ptr)
407 p = realloc(ptr, size); 512 p = realloc (ptr, size);
408 else 513 else
409 p = malloc(size); 514 p = malloc (size);
410 if (p) 515 if (p)
411 return p; 516 return p;
412 517
413 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 518 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
414 rxvt_clean_exit(); 519 rxvt_clean_exit ();
415 exit(EXIT_FAILURE); 520 exit (EXIT_FAILURE);
416 /* NOTREACHED */ 521 /* NOTREACHED */
417} 522}
418 523
419/* ------------------------------------------------------------------------- * 524/* ------------------------------------------------------------------------- *
420 * PRIVILEGED OPERATIONS * 525 * PRIVILEGED OPERATIONS *
… …
423void 528void
424rxvt_term::privileges (int mode) 529rxvt_term::privileges (int mode)
425{ 530{
426#if ! defined(__CYGWIN32__) 531#if ! defined(__CYGWIN32__)
427# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 532# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
428 /* setreuid() is the poor man's setuid(), seteuid() */ 533 /* setreuid () is the poor man's setuid (), seteuid () */
429# define seteuid(a) setreuid(-1, (a)) 534# define seteuid(a) setreuid(-1, (a))
430# define setegid(a) setregid(-1, (a)) 535# define setegid(a) setregid(-1, (a))
431# define HAVE_SETEUID 536# define HAVE_SETEUID
432# endif 537# endif
433# ifdef HAVE_SETEUID 538# ifdef HAVE_SETEUID
… …
436 case IGNORE: 541 case IGNORE:
437 /* 542 /*
438 * change effective uid/gid - not real uid/gid - so we can switch 543 * change effective uid/gid - not real uid/gid - so we can switch
439 * back to root later, as required 544 * back to root later, as required
440 */ 545 */
441 seteuid(getuid()); 546 seteuid (getuid ());
442 setegid(getgid()); 547 setegid (getgid ());
443 break; 548 break;
444 case SAVE: 549 case SAVE:
445 euid = geteuid(); 550 euid = geteuid ();
446 egid = getegid(); 551 egid = getegid ();
447 break; 552 break;
448 case RESTORE: 553 case RESTORE:
449 seteuid(euid); 554 seteuid (euid);
450 setegid(egid); 555 setegid (egid);
451 break; 556 break;
452 } 557 }
453# else 558# else
454 switch (mode) 559 switch (mode)
455 { 560 {
456 case IGNORE: 561 case IGNORE:
457 setuid(getuid()); 562 setuid (getuid ());
458 setgid(getgid()); 563 setgid (getgid ());
459 /* FALLTHROUGH */ 564 /* FALLTHROUGH */
460 case SAVE: 565 case SAVE:
461 /* FALLTHROUGH */ 566 /* FALLTHROUGH */
462 case RESTORE: 567 case RESTORE:
463 break; 568 break;
… …
468 573
469#ifdef UTMP_SUPPORT 574#ifdef UTMP_SUPPORT
470void 575void
471rxvt_term::privileged_utmp (char action) 576rxvt_term::privileged_utmp (char action)
472{ 577{
473 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 578 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
474 action, next_utmp_action, getpid())); 579 action, next_utmp_action, getpid ()));
475 if (next_utmp_action != action || (action != SAVE && action != RESTORE) 580 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
476 || (Options & Opt_utmpInhibit) 581 || (Options & Opt_utmpInhibit)
477 || ttydev == NULL || *ttydev == '\0') 582 || ttydev == NULL || *ttydev == '\0')
478 return; 583 return;
479 584
… …
494 599
495#ifndef NO_SETOWNER_TTYDEV 600#ifndef NO_SETOWNER_TTYDEV
496void 601void
497rxvt_term::privileged_ttydev (char action) 602rxvt_term::privileged_ttydev (char action)
498{ 603{
499 D_MAIN((stderr, 604 D_MAIN ((stderr,
500 "privileged_ttydev (%c); waiting for: %c (pid: %d)", 605 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
501 action, next_tty_action, getpid())); 606 action, next_tty_action, getpid ()));
502 if (next_tty_action != action || (action != SAVE && action != RESTORE) 607 if (next_tty_action != action || (action != SAVE && action != RESTORE)
503 || ttydev == NULL || *ttydev == '\0') 608 || ttydev == NULL || *ttydev == '\0')
504 return; 609 return;
505 610
506 privileges (RESTORE); 611 privileges (RESTORE);
507 612
508 if (action == SAVE) 613 if (action == SAVE)
509 { 614 {
510 next_tty_action = RESTORE; 615 next_tty_action = RESTORE;
511# ifndef RESET_TTY_TO_COMMON_DEFAULTS 616# ifndef RESET_TTY_TO_COMMON_DEFAULTS
512 /* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 617 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
513 if (lstat(ttydev, &ttyfd_stat) < 0) /* you lose out */ 618 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
514 next_tty_action = IGNORE; 619 next_tty_action = IGNORE;
515 else 620 else
516# endif 621# endif
517 622
518 { 623 {
519 chown(ttydev, getuid(), ttygid); /* fail silently */ 624 chown (ttydev, getuid (), ttygid); /* fail silently */
520 chmod(ttydev, ttymode); 625 chmod (ttydev, ttymode);
521# ifdef HAVE_REVOKE 626# ifdef HAVE_REVOKE
522 revoke(ttydev); 627 revoke (ttydev);
523# endif 628# endif
524 629
525 } 630 }
526 } 631 }
527 else 632 else
528 { /* action == RESTORE */ 633 { /* action == RESTORE */
529 next_tty_action = IGNORE; 634 next_tty_action = IGNORE;
530# ifndef RESET_TTY_TO_COMMON_DEFAULTS 635# ifndef RESET_TTY_TO_COMMON_DEFAULTS
531 chmod(ttydev, ttyfd_stat.st_mode); 636 chmod (ttydev, ttyfd_stat.st_mode);
532 chown(ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid); 637 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
533# else 638# else
534 chmod(ttydev, 639 chmod (ttydev,
535 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 640 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
536 chown(ttydev, 0, 0); 641 chown (ttydev, 0, 0);
537# endif 642# endif
538 643
539 } 644 }
540 645
541 privileges (IGNORE); 646 privileges (IGNORE);
542 647
543# ifndef RESET_TTY_TO_COMMON_DEFAULTS 648# ifndef RESET_TTY_TO_COMMON_DEFAULTS
544 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 649 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
545 action == RESTORE ? "Restoring" : (action == 650 action == RESTORE ? "Restoring" : (action ==
546 SAVE ? "Saving" : 651 SAVE ? "Saving" :
547 "UNKNOWN ERROR for"), ttydev, 652 "UNKNOWN ERROR for"), ttydev,
548 ttyfd_stat.st_mode, ttyfd_stat.st_uid, 653 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
549 ttyfd_stat.st_gid)); 654 ttyfd_stat.st_gid));
… …
562 short recalc_x, recalc_y; 667 short recalc_x, recalc_y;
563 int x, y, sb_w, mb_h, flags; 668 int x, y, sb_w, mb_h, flags;
564 unsigned int w, h; 669 unsigned int w, h;
565 unsigned int max_width, max_height; 670 unsigned int max_width, max_height;
566 671
567 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 672 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
568 TermWin.ncol, TermWin.nrow, szHint.width, 673 TermWin.ncol, TermWin.nrow, szHint.width,
569 szHint.height)); 674 szHint.height));
570 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 675 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
571 szHint.win_gravity = NorthWestGravity; 676 szHint.win_gravity = NorthWestGravity;
572 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 677 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
… …
575 flags = 0; 680 flags = 0;
576 if (!parsed_geometry) 681 if (!parsed_geometry)
577 { 682 {
578 parsed_geometry = 1; 683 parsed_geometry = 1;
579 if (rs[Rs_geometry]) 684 if (rs[Rs_geometry])
580 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h); 685 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
581 if (flags & WidthValue) 686 if (flags & WidthValue)
582 { 687 {
583 TermWin.ncol = BOUND_POSITIVE_INT16(w); 688 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
584 szHint.flags |= USSize; 689 szHint.flags |= USSize;
585 } 690 }
586 if (flags & HeightValue) 691 if (flags & HeightValue)
587 { 692 {
588 TermWin.nrow = BOUND_POSITIVE_INT16(h); 693 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
589 szHint.flags |= USSize; 694 szHint.flags |= USSize;
590 } 695 }
591 if (flags & XValue) 696 if (flags & XValue)
592 { 697 {
593 szHint.x = x; 698 szHint.x = x;
… …
610 else 715 else
611 szHint.win_gravity = SouthWestGravity; 716 szHint.win_gravity = SouthWestGravity;
612 } 717 }
613 } 718 }
614 } 719 }
720
615 /* TODO: BOUNDS */ 721 /* TODO: BOUNDS */
616 TermWin.width = TermWin.ncol * TermWin.fwidth; 722 TermWin.width = TermWin.ncol * TermWin.fwidth;
617 TermWin.height = TermWin.nrow * TermWin.fheight; 723 TermWin.height = TermWin.nrow * TermWin.fheight;
618 max_width = MAX_COLS * TermWin.fwidth; 724 max_width = MAX_COLS * TermWin.fwidth;
619 max_height = MAX_ROWS * TermWin.fheight; 725 max_height = MAX_ROWS * TermWin.fheight;
… …
622 728
623 sb_w = mb_h = 0; 729 sb_w = mb_h = 0;
624 window_vt_x = window_vt_y = 0; 730 window_vt_x = window_vt_y = 0;
625 if (scrollbar_visible ()) 731 if (scrollbar_visible ())
626 { 732 {
627 sb_w = scrollbar_TotalWidth(); 733 sb_w = scrollbar_TotalWidth ();
628 szHint.base_width += sb_w; 734 szHint.base_width += sb_w;
629 if (!(Options & Opt_scrollBar_right)) 735 if (! (Options & Opt_scrollBar_right))
630 window_vt_x = sb_w; 736 window_vt_x = sb_w;
631 } 737 }
632 if (menubar_visible ()) 738 if (menubar_visible ())
633 { 739 {
634 mb_h = menuBar_TotalHeight(); 740 mb_h = menuBar_TotalHeight ();
635 szHint.base_height += mb_h; 741 szHint.base_height += mb_h;
636 window_vt_y = mb_h; 742 window_vt_y = mb_h;
637 } 743 }
638 szHint.width_inc = TermWin.fwidth; 744 szHint.width_inc = TermWin.fwidth;
639 szHint.height_inc = TermWin.fheight; 745 szHint.height_inc = TermWin.fheight;
… …
645 szHint.width = width; 751 szHint.width = width;
646 TermWin.width = width - szHint.base_width; 752 TermWin.width = width - szHint.base_width;
647 } 753 }
648 else 754 else
649 { 755 {
650 MIN_IT(TermWin.width, max_width); 756 MIN_IT (TermWin.width, max_width);
651 szHint.width = szHint.base_width + TermWin.width; 757 szHint.width = szHint.base_width + TermWin.width;
652 } 758 }
653 if (height && height - szHint.base_height < max_height) 759 if (height && height - szHint.base_height < max_height)
654 { 760 {
655 szHint.height = height; 761 szHint.height = height;
656 TermWin.height = height - szHint.base_height; 762 TermWin.height = height - szHint.base_height;
657 } 763 }
658 else 764 else
659 { 765 {
660 MIN_IT(TermWin.height, max_height); 766 MIN_IT (TermWin.height, max_height);
661 szHint.height = szHint.base_height + TermWin.height; 767 szHint.height = szHint.base_height + TermWin.height;
662 } 768 }
663 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 769 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
664 window_sb_x = szHint.width - sb_w; 770 window_sb_x = szHint.width - sb_w;
665 771
… …
670 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 776 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
671 - szHint.height - 2 * TermWin.ext_bwidth); 777 - szHint.height - 2 * TermWin.ext_bwidth);
672 778
673 TermWin.ncol = TermWin.width / TermWin.fwidth; 779 TermWin.ncol = TermWin.width / TermWin.fwidth;
674 TermWin.nrow = TermWin.height / TermWin.fheight; 780 TermWin.nrow = TermWin.height / TermWin.fheight;
675 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 781 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
676 TermWin.ncol, TermWin.nrow, szHint.width, 782 TermWin.ncol, TermWin.nrow, szHint.width,
677 szHint.height)); 783 szHint.height));
678 return; 784 return;
679} 785}
680 786
… …
696 ws.ws_xpixel = ws.ws_ypixel = 0; 802 ws.ws_xpixel = ws.ws_ypixel = 0;
697#ifndef DEBUG_SIZE 803#ifndef DEBUG_SIZE
698 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 804 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
699#else 805#else
700 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 806 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
701 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 807 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
702# ifdef SIGWINCH 808# ifdef SIGWINCH
703 else if (cmd_pid) /* force through to the command */ 809 else if (cmd_pid) /* force through to the command */
704 kill (cmd_pid, SIGWINCH); 810 kill (cmd_pid, SIGWINCH);
705# endif 811# endif
706#endif 812#endif
707} 813}
708 814
709/*----------------------------------------------------------------------*/ 815/*----------------------------------------------------------------------*/
710/* rxvt_change_font() - Switch to a new font */ 816/* rxvt_change_font () - Switch to a new font */
711/* 817/*
712 * init = 1 - initialize 818 * init = 1 - initialize
713 * 819 *
714 * fontname == FONT_UP - switch to bigger font 820 * fontname == FONT_UP - switch to bigger font
715 * fontname == FONT_DN - switch to smaller font 821 * fontname == FONT_DN - switch to smaller font
716 */ 822 */
717void 823bool
718rxvt_term::change_font (int init, const char *fontname) 824rxvt_term::change_font (const char *fontname)
719{} 825{
826 if (fontname == FONT_UP)
827 {
828 // TODO
829 }
830 else if (fontname == FONT_DN)
831 {
832 // TODO
833 }
834 else
835 {
836 rxvt_fontset *fs = new rxvt_fontset (this);
720 837
721void 838 if (fs && fs->populate (fontname ? fontname : "fixed"))
839 {
840 delete TermWin.fontset;
841 TermWin.fontset = fs;
842 TermWin.fwidth = fs->base_font ()->width;
843 TermWin.fheight = fs->base_font ()->height;
844 TermWin.fbase = fs->base_font ()->ascent;
845
846 if (TermWin.parent[0])
847 {
848 resize_all_windows (0, 0, 0);
849 scr_remap_chars ();
850 scr_touch (true);
851 }
852
853 return true;
854 }
855 }
856
857 return false;
858}
859
860bool
722rxvt_term::font_up_down (int n, int direction) 861rxvt_term::font_up_down (int n, int direction)
723{} 862{
863 return false;
864}
724 865
725/*----------------------------------------------------------------------*/ 866/*----------------------------------------------------------------------*/
726/*----------------------------------------------------------------------*/ 867/*----------------------------------------------------------------------*/
727/* xterm sequences - title, iconName, color (exptl) */ 868/* xterm sequences - title, iconName, color (exptl) */
728void 869void
729rxvt_term::set_title (const char *str) 870rxvt_term::set_title (const char *str)
730{ 871{
731#ifndef SMART_WINDOW_TITLE 872#ifndef SMART_WINDOW_TITLE
732 XStoreName(display->display, TermWin.parent[0], str); 873 XStoreName (display->display, TermWin.parent[0], str);
733#else 874#else
734 char *name; 875 char *name;
735 876
736 if (XFetchName(display->display, TermWin.parent[0], &name) == 0) 877 if (!XFetchName (display->display, TermWin.parent[0], &name))
737 name = NULL; 878 name = NULL;
879
738 if (name == NULL || STRCMP(name, str)) 880 if (name == NULL || STRCMP (name, str))
739 XStoreName(display->display, TermWin.parent[0], str); 881 XStoreName (display->display, TermWin.parent[0], str);
882
740 if (name) 883 if (name)
741 XFree(name); 884 XFree (name);
742#endif 885#endif
743} 886}
744 887
745void 888void
746rxvt_term::set_iconName (const char *str) 889rxvt_term::set_icon_name (const char *str)
747{ 890{
748#ifndef SMART_WINDOW_TITLE 891#ifndef SMART_WINDOW_TITLE
749 XSetIconName(display->display, TermWin.parent[0], str); 892 XSetIconName (display->display, TermWin.parent[0], str);
750#else 893#else
751 char *name; 894 char *name;
752 895
753 if (XGetIconName(display->display, TermWin.parent[0], &name)) 896 if (!XGetIconName (display->display, TermWin.parent[0], &name))
754 name = NULL; 897 name = NULL;
898
755 if (name == NULL || STRCMP(name, str)) 899 if (name == NULL || STRCMP (name, str))
756 XSetIconName(display->display, TermWin.parent[0], str); 900 XSetIconName (display->display, TermWin.parent[0], str);
901
757 if (name) 902 if (name)
758 XFree(name); 903 XFree (name);
759#endif 904#endif
760} 905}
761 906
762#ifdef XTERM_COLOR_CHANGE 907#ifdef XTERM_COLOR_CHANGE
763void 908void
764rxvt_term::set_window_color (int idx, const char *color) 909rxvt_term::set_window_color (int idx, const char *color)
765{ 910{
766 rxvt_color xcol; 911 rxvt_color xcol;
767 int i; 912 int i;
768 913
769 if (color == NULL || *color == '\0') 914 if (color == NULL || *color == '\0')
770 return; 915 return;
771 916
772 /* handle color aliases */ 917 /* handle color aliases */
773 if (isdigit(*color)) 918 if (isdigit (*color))
774 { 919 {
775 i = atoi(color); 920 i = atoi (color);
776 if (i >= 8 && i <= 15) 921 if (i >= 8 && i <= 15)
777 { /* bright colors */ 922 { /* bright colors */
778 i -= 8; 923 i -= 8;
779# ifndef NO_BRIGHTCOLOR 924# ifndef NO_BRIGHTCOLOR
780 PixColors[idx] = PixColors[minBrightCOLOR + i]; 925 PixColors[idx] = PixColors[minBrightCOLOR + i];
781 SET_PIXCOLOR(idx); 926 SET_PIXCOLOR (idx);
782 goto Done; 927 goto Done;
783# endif 928# endif
784 929
785 } 930 }
786 if (i >= 0 && i <= 7) 931 if (i >= 0 && i <= 7)
787 { /* normal colors */ 932 { /* normal colors */
788 PixColors[idx] = PixColors[minCOLOR + i]; 933 PixColors[idx] = PixColors[minCOLOR + i];
789 SET_PIXCOLOR(idx); 934 SET_PIXCOLOR (idx);
790 goto Done; 935 goto Done;
791 } 936 }
792 } 937 }
793 if (!rXParseAllocColor (& xcol, color)) 938 if (!rXParseAllocColor (& xcol, color))
794 return; 939 return;
… …
803 if (PixColors[idx] == PixColors[i]) 948 if (PixColors[idx] == PixColors[i])
804 break; 949 break;
805 if (i > Color_White) 950 if (i > Color_White)
806 { 951 {
807 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 952 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
808 XFreeColors(display->display, XCMAP, (PixColors + idx), 1, 953 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
809 DisplayPlanes(display->display, display->screen)); 954 DisplayPlanes (display->display, display->screen));
810 } 955 }
811# endif 956# endif
812 957
813 PixColors[idx] = xcol; 958 PixColors[idx] = xcol;
814 SET_PIXCOLOR(idx); 959 SET_PIXCOLOR (idx);
815 960
816 /* XSetWindowAttributes attr; */ 961 /* XSetWindowAttributes attr; */
817 /* Cursor cursor; */ 962 /* Cursor cursor; */
818Done: 963Done:
819 if (idx == Color_bg && !(Options & Opt_transparent)) 964 if (idx == Color_bg && ! (Options & Opt_transparent))
820 XSetWindowBackground(display->display, TermWin.vt, 965 XSetWindowBackground (display->display, TermWin.vt,
821 PixColors[Color_bg]); 966 PixColors[Color_bg]);
822 967
823 /* handle Color_BD, scrollbar background, etc. */ 968 /* handle Color_BD, scrollbar background, etc. */
824 969
825 set_colorfgbg (); 970 set_colorfgbg ();
… …
839 rxvt_color xcol[2]; 984 rxvt_color xcol[2];
840 985
841 xcol[0] = PixColors[Color_pointer]; 986 xcol[0] = PixColors[Color_pointer];
842 xcol[1] = PixColors[Color_bg]; 987 xcol[1] = PixColors[Color_bg];
843 XQueryColors (display->display, XCMAP, xcol, 2); 988 XQueryColors (display->display, XCMAP, xcol, 2);
844 XRecolorCursor (display->display, TermWin_cursor, &(xcol[0]), &(xcol[1])); 989 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));
845#endif 990#endif
846} 991}
847 992
848/*----------------------------------------------------------------------*/ 993/*----------------------------------------------------------------------*/
849/* 994/*
… …
852void 997void
853rxvt_term::set_colorfgbg () 998rxvt_term::set_colorfgbg ()
854{ 999{
855 unsigned int i; 1000 unsigned int i;
856 const char *xpmb = "\0"; 1001 const char *xpmb = "\0";
857 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 1002 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
858 1003
859 env_colorfgbg = 1004 env_colorfgbg =
860 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 1005 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
861 STRCPY(fstr, "default"); 1006 STRCPY (fstr, "default");
862 STRCPY(bstr, "default"); 1007 STRCPY (bstr, "default");
863 for (i = Color_Black; i <= Color_White; i++) 1008 for (i = Color_Black; i <= Color_White; i++)
864 if (PixColors[Color_fg] == PixColors[i]) 1009 if (PixColors[Color_fg] == PixColors[i])
865 { 1010 {
866 sprintf(fstr, "%d", (i - Color_Black)); 1011 sprintf (fstr, "%d", (i - Color_Black));
867 break; 1012 break;
868 } 1013 }
869 for (i = Color_Black; i <= Color_White; i++) 1014 for (i = Color_Black; i <= Color_White; i++)
870 if (PixColors[Color_bg] == PixColors[i]) 1015 if (PixColors[Color_bg] == PixColors[i])
871 { 1016 {
872 sprintf(bstr, "%d", (i - Color_Black)); 1017 sprintf (bstr, "%d", (i - Color_Black));
873#ifdef XPM_BACKGROUND 1018#ifdef XPM_BACKGROUND
874 xpmb = "default;"; 1019 xpmb = "default;";
875#endif 1020#endif
876 break; 1021 break;
877 } 1022 }
1023
878 sprintf(env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1024 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
879 putenv(env_colorfgbg);
880 1025
881#ifndef NO_BRIGHTCOLOR 1026#ifndef NO_BRIGHTCOLOR
882 colorfgbg = DEFAULT_RSTYLE; 1027 colorfgbg = DEFAULT_RSTYLE;
883 for (i = minCOLOR; i <= maxCOLOR; i++) 1028 for (i = minCOLOR; i <= maxCOLOR; i++)
884 { 1029 {
885 if (PixColors[Color_fg] == PixColors[i]) 1030 if (PixColors[Color_fg] == PixColors[i])
886 colorfgbg = SET_FGCOLOR(colorfgbg, i); 1031 colorfgbg = SET_FGCOLOR (colorfgbg, i);
887 if (PixColors[Color_bg] == PixColors[i]) 1032 if (PixColors[Color_bg] == PixColors[i])
888 colorfgbg = SET_BGCOLOR(colorfgbg, i); 1033 colorfgbg = SET_BGCOLOR (colorfgbg, i);
889 } 1034 }
890#endif 1035#endif
891} 1036}
892 1037
893/*----------------------------------------------------------------------*/ 1038/*----------------------------------------------------------------------*/
… …
899int 1044int
900rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1045rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
901{ 1046{
902 if (!screen_in_out->set (display, colour)) 1047 if (!screen_in_out->set (display, colour))
903 { 1048 {
904 rxvt_print_error("can't allocate colour: %s", colour); 1049 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
905 return false; 1050 return false;
906 } 1051 }
907 1052
908 return true; 1053 return true;
909} 1054}
… …
989 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1134 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
990 1135
991 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1136 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
992 window_vt_y, TermWin_TotalWidth (), 1137 window_vt_y, TermWin_TotalWidth (),
993 TermWin_TotalHeight ()); 1138 TermWin_TotalHeight ());
994#ifdef RXVT_GRAPHICS 1139 scr_clear (height != old_height);
995 if (old_height)
996 Gr_Resize (old_width - szHint.base_width,
997 old_height - szHint.base_height);
998#endif
999 scr_clear ();
1000#ifdef XPM_BACKGROUND 1140#ifdef XPM_BACKGROUND
1001 resize_pixmap (); 1141 resize_pixmap ();
1002#endif 1142#endif
1003 1143
1004 } 1144 }
… …
1015 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1155 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1016 curr_screen = scr_change_screen (PRIMARY); 1156 curr_screen = scr_change_screen (PRIMARY);
1017 TermWin.ncol = ncol; 1157 TermWin.ncol = ncol;
1018 } 1158 }
1019 1159
1020 scr_reset(); 1160 scr_reset ();
1021 1161
1022 if (curr_screen >= 0) /* this is not the first time through */ 1162 if (curr_screen >= 0) /* this is not the first time through */
1023 { 1163 {
1024 scr_change_screen (curr_screen); 1164 scr_change_screen (curr_screen);
1025 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1165 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
… …
1043{ 1183{
1044 XWindowAttributes wattr; 1184 XWindowAttributes wattr;
1045 1185
1046 if (width == 0 || height == 0) 1186 if (width == 0 || height == 0)
1047 { 1187 {
1048 XGetWindowAttributes(display->display, display->root, &wattr); 1188 XGetWindowAttributes (display->display, display->root, &wattr);
1049 if (width == 0) 1189 if (width == 0)
1050 width = wattr.width - szHint.base_width; 1190 width = wattr.width - szHint.base_width;
1051 if (height == 0) 1191 if (height == 0)
1052 height = wattr.height - szHint.base_height; 1192 height = wattr.height - szHint.base_height;
1053 } 1193 }
… …
1067void 1207void
1068rxvt_term::im_set_size (XRectangle *size) 1208rxvt_term::im_set_size (XRectangle *size)
1069{ 1209{
1070 size->x = TermWin.int_bwidth; 1210 size->x = TermWin.int_bwidth;
1071 size->y = TermWin.int_bwidth; 1211 size->y = TermWin.int_bwidth;
1072 size->width = Width2Pixel(TermWin.ncol); 1212 size->width = Width2Pixel (TermWin.ncol);
1073 size->height = Height2Pixel(TermWin.nrow); 1213 size->height = Height2Pixel (TermWin.nrow);
1074} 1214}
1075 1215
1076void 1216void
1077rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg) 1217rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
1078{ 1218{
… …
1088 Atom atom; 1228 Atom atom;
1089 Window win; 1229 Window win;
1090 char server[IMBUFSIZ]; 1230 char server[IMBUFSIZ];
1091 1231
1092 /* get current locale modifier */ 1232 /* get current locale modifier */
1093 if ((p = XSetLocaleModifiers(NULL)) != NULL) 1233 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1094 { 1234 {
1095 STRCPY(server, "@server="); 1235 STRCPY (server, "@server=");
1096 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1236 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1097 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1237 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
1098 *p = '\0'; 1238 *p = '\0';
1099 1239
1100 atom = XInternAtom(display->display, server, False); 1240 atom = XInternAtom (display->display, server, False);
1101 win = XGetSelectionOwner(display->display, atom); 1241 win = XGetSelectionOwner (display->display, atom);
1102 if (win != None) 1242 if (win != None)
1103 return True; 1243 return True;
1104 } 1244 }
1105 return False; 1245 return False;
1106} 1246}
… …
1110{ 1250{
1111 XPoint spot; 1251 XPoint spot;
1112 XVaNestedList preedit_attr; 1252 XVaNestedList preedit_attr;
1113 1253
1114 if (Input_Context == NULL 1254 if (Input_Context == NULL
1115 || !TermWin.focus || !(input_style & XIMPreeditPosition) 1255 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
1116 || !(event_type == KeyPress 1256 || ! (event_type == KeyPress
1117 || event_type == Expose 1257 || event_type == Expose
1118 || event_type == NoExpose 1258 || event_type == NoExpose
1119 || event_type == SelectionNotify 1259 || event_type == SelectionNotify
1120 || event_type == ButtonRelease || event_type == FocusIn) 1260 || event_type == ButtonRelease || event_type == FocusIn)
1121 || !IMisRunning ()) 1261 || !IMisRunning ())
1122 return; 1262 return;
1123 1263
1124 im_set_position (&spot); 1264 im_set_position (&spot);
1125 1265
1126 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1266 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1127 XSetICValues(Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1267 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1128 XFree(preedit_attr); 1268 XFree (preedit_attr);
1129} 1269}
1130 1270
1131void 1271void
1132rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, 1272rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1133 XRectangle * needed_rect) 1273 XRectangle * needed_rect)
1134{ 1274{
1135 int mbh, vtx = 0; 1275 int mbh, vtx = 0;
1136 1276
1137 if (scrollbar_visible () && !(Options & Opt_scrollBar_right)) 1277 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1138 vtx = scrollbar_TotalWidth(); 1278 vtx = scrollbar_TotalWidth ();
1139 1279
1140 mbh = menubar_visible () ? menuBar_TotalHeight() : 0; 1280 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1141 mbh -= TermWin.lineSpace; 1281 mbh -= TermWin.lineSpace;
1142 1282
1143 preedit_rect->x = needed_rect->width + vtx; 1283 preedit_rect->x = needed_rect->width + vtx;
1144 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; 1284 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1145 1285
1146 preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx; 1286 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1147 preedit_rect->height = Height2Pixel(1); 1287 preedit_rect->height = Height2Pixel (1);
1148 1288
1149 status_rect->x = vtx; 1289 status_rect->x = vtx;
1150 status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; 1290 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1151 1291
1152 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1); 1292 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1153 status_rect->height = Height2Pixel(1); 1293 status_rect->height = Height2Pixel (1);
1154} 1294}
1155 1295
1156void 1296void
1157rxvt_term::im_destroy () 1297rxvt_term::im_destroy ()
1158{ 1298{
… …
1184 const char *p; 1324 const char *p;
1185 char **s; 1325 char **s;
1186 XIMStyles *xim_styles; 1326 XIMStyles *xim_styles;
1187 XVaNestedList preedit_attr, status_attr; 1327 XVaNestedList preedit_attr, status_attr;
1188 1328
1189 if (!((p = XSetLocaleModifiers (modifiers)) && *p)) 1329 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1190 return false; 1330 return false;
1191 1331
1192 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1332 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1193 input_method = display->get_xim (locale, modifiers); 1333 input_method = display->get_xim (locale, modifiers);
1194 if (input_method == NULL) 1334 if (input_method == NULL)
1195 return false; 1335 return false;
1196 1336
1197 xim = input_method->xim; 1337 xim = input_method->xim;
… …
1203 display->put_xim (input_method); 1343 display->put_xim (input_method);
1204 return false; 1344 return false;
1205 } 1345 }
1206 1346
1207 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1347 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1208 s = rxvt_splitcommastring(p); 1348 s = rxvt_splitcommastring (p);
1209 for (i = found = 0; !found && s[i]; i++) 1349 for (i = found = 0; !found && s[i]; i++)
1210 { 1350 {
1211 if (!STRCMP(s[i], "OverTheSpot")) 1351 if (!STRCMP (s[i], "OverTheSpot"))
1212 input_style = (XIMPreeditPosition | XIMStatusNothing); 1352 input_style = (XIMPreeditPosition | XIMStatusNothing);
1213 else if (!STRCMP(s[i], "OffTheSpot")) 1353 else if (!STRCMP (s[i], "OffTheSpot"))
1214 input_style = (XIMPreeditArea | XIMStatusArea); 1354 input_style = (XIMPreeditArea | XIMStatusArea);
1215 else if (!STRCMP(s[i], "Root")) 1355 else if (!STRCMP (s[i], "Root"))
1216 input_style = (XIMPreeditNothing | XIMStatusNothing); 1356 input_style = (XIMPreeditNothing | XIMStatusNothing);
1217 1357
1218 for (j = 0; j < xim_styles->count_styles; j++) 1358 for (j = 0; j < xim_styles->count_styles; j++)
1219 if (input_style == xim_styles->supported_styles[j]) 1359 if (input_style == xim_styles->supported_styles[j])
1220 { 1360 {
… …
1241 { 1381 {
1242 im_set_size (&rect); 1382 im_set_size (&rect);
1243 im_set_position (&spot); 1383 im_set_position (&spot);
1244 im_set_color (&fg, &bg); 1384 im_set_color (&fg, &bg);
1245 1385
1246 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1386 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1247 XNSpotLocation, &spot, 1387 XNSpotLocation, &spot,
1248 XNForeground, fg, XNBackground, bg, 1388 XNForeground, fg, XNBackground, bg,
1249 //XNFontSet, TermWin.fontset, 1389 //XNFontSet, TermWin.fontset,
1250 NULL); 1390 NULL);
1251 } 1391 }
… …
1259 */ 1399 */
1260 needed_rect.width = 0; 1400 needed_rect.width = 0;
1261 1401
1262 im_set_preedit_area (&rect, &status_rect, &needed_rect); 1402 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1263 1403
1264 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1404 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1265 XNForeground, fg, XNBackground, bg, 1405 XNForeground, fg, XNBackground, bg,
1266 //XNFontSet, TermWin.fontset, 1406 //XNFontSet, TermWin.fontset,
1267 NULL); 1407 NULL);
1268 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, 1408 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1269 XNForeground, fg, XNBackground, bg, 1409 XNForeground, fg, XNBackground, bg,
1270 //XNFontSet, TermWin.fontset, 1410 //XNFontSet, TermWin.fontset,
1271 NULL); 1411 NULL);
1272 } 1412 }
1273 1413
1274 Input_Context = XCreateIC(xim, XNInputStyle, input_style, 1414 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1275 XNClientWindow, TermWin.parent[0], 1415 XNClientWindow, TermWin.parent[0],
1276 XNFocusWindow, TermWin.parent[0], 1416 XNFocusWindow, TermWin.parent[0],
1277 preedit_attr ? XNPreeditAttributes : NULL, 1417 preedit_attr ? XNPreeditAttributes : NULL,
1278 preedit_attr, 1418 preedit_attr,
1279 status_attr ? XNStatusAttributes : NULL, 1419 status_attr ? XNStatusAttributes : NULL,
1280 status_attr, NULL); 1420 status_attr, NULL);
1281 if (preedit_attr) XFree(preedit_attr); 1421 if (preedit_attr) XFree (preedit_attr);
1282 if (status_attr) XFree(status_attr); 1422 if (status_attr) XFree (status_attr);
1283 1423
1284 if (Input_Context == NULL) 1424 if (Input_Context == NULL)
1285 { 1425 {
1286 rxvt_print_error("failed to create input context"); 1426 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1287 display->put_xim (input_method); 1427 display->put_xim (input_method);
1288 return false; 1428 return false;
1289 } 1429 }
1290 1430
1291 if (input_style & XIMPreeditArea) 1431 if (input_style & XIMPreeditArea)
1292 IMSetStatusPosition (); 1432 IMSetStatusPosition ();
1293 1433
1294 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); 1434 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1295 return true; 1435 return true;
1296} 1436}
1297 1437
1298void 1438void
1299rxvt_term::im_cb () 1439rxvt_term::im_cb ()
… …
1303 char **s; 1443 char **s;
1304 char buf[IMBUFSIZ]; 1444 char buf[IMBUFSIZ];
1305 1445
1306 im_destroy (); 1446 im_destroy ();
1307 1447
1308 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1448 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1309 if (Input_Context) 1449 if (Input_Context)
1310 return; 1450 return;
1311 1451
1312#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1452#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1313 if (rs[Rs_imLocale]) 1453 if (rs[Rs_imLocale])
1314 setlocale (LC_CTYPE, rs[Rs_imLocale]); 1454 SET_LOCALE (rs[Rs_imLocale]);
1315#endif 1455#endif
1316 1456
1317 p = rs[Rs_inputMethod]; 1457 p = rs[Rs_inputMethod];
1318 if (p && *p) 1458 if (p && *p)
1319 { 1459 {
… …
1332 break; 1472 break;
1333 } 1473 }
1334 } 1474 }
1335 } 1475 }
1336 for (i = 0; s[i]; i++) 1476 for (i = 0; s[i]; i++)
1337 free(s[i]); 1477 free (s[i]);
1338 free(s); 1478 free (s);
1339 1479
1340 if (found) 1480 if (found)
1341 goto done; 1481 goto done;
1342 } 1482 }
1343 1483
… …
1350 goto done; 1490 goto done;
1351 1491
1352done: 1492done:
1353#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1493#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1354 if (rs[Rs_imLocale]) 1494 if (rs[Rs_imLocale])
1355 setlocale (LC_CTYPE, locale); 1495 SET_LOCALE (locale);
1356#endif 1496#endif
1357} 1497}
1358 1498
1359void 1499void
1360rxvt_term::IMSetStatusPosition () 1500rxvt_term::IMSetStatusPosition ()
1361{ 1501{
1362 XRectangle preedit_rect, status_rect, *needed_rect; 1502 XRectangle preedit_rect, status_rect, *needed_rect;
1363 XVaNestedList preedit_attr, status_attr; 1503 XVaNestedList preedit_attr, status_attr;
1364 1504
1365 if (Input_Context == NULL 1505 if (Input_Context == NULL
1366 || !TermWin.focus || !(input_style & XIMPreeditArea) 1506 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1367 || !IMisRunning ()) 1507 || !IMisRunning ())
1368 return; 1508 return;
1369 1509
1370 /* Getting the necessary width of preedit area */ 1510 /* Getting the necessary width of preedit area */
1371 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1511 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1372 XGetICValues(Input_Context, XNStatusAttributes, status_attr, NULL); 1512 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1373 XFree(status_attr); 1513 XFree (status_attr);
1374 1514
1375 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect); 1515 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1376 1516
1377 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1517 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1378 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1518 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1379 1519
1380 XSetICValues(Input_Context, 1520 XSetICValues (Input_Context,
1381 XNPreeditAttributes, preedit_attr, 1521 XNPreeditAttributes, preedit_attr,
1382 XNStatusAttributes, status_attr, NULL); 1522 XNStatusAttributes, status_attr, NULL);
1383 1523
1384 XFree(preedit_attr); 1524 XFree (preedit_attr);
1385 XFree(status_attr); 1525 XFree (status_attr);
1386} 1526}
1387#endif /* USE_XIM */ 1527#endif /* USE_XIM */
1388 1528
1389/*----------------------------------------------------------------------*/ 1529/*----------------------------------------------------------------------*/
1390rxvt_t rxvt_current_term; 1530rxvt_t rxvt_current_term;

Diff Legend

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