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.53 by pcg, Sun Mar 14 17:33:07 2004 UTC vs.
Revision 1.164 by root, Fri Jan 6 05:37:59 2006 UTC

1/*--------------------------------*-C-*---------------------------------*; 1/*--------------------------------*-C-*---------------------------------*
2 * File: main.c 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * 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
19 * 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
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "main.intpro" /* PROTOS for internal routines */ 35#include "keyboard.h"
36#include "rxvtperl.h"
36 37
38#include <limits>
39
37#include <signal.h> 40#include <csignal>
41#include <cstring>
38 42
39#ifdef TTY_GID_SUPPORT 43#ifdef TTY_GID_SUPPORT
40# include <grp.h> 44# include <grp.h>
41#endif 45#endif
42 46
43#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
44# include <termios.h> 48# include <termios.h>
45#endif 49#endif
46 50
47#include <cstring> 51vector<rxvt_term *> rxvt_term::termlist;
48 52
49static char curlocale[128]; 53static char curlocale[128], savelocale[128];
50 54
51void 55bool
52rxvt_set_locale (const char *locale) 56rxvt_set_locale (const char *locale)
53{ 57{
54 if (locale && STRNCMP (locale, curlocale, 128)) 58 if (!locale || !strncmp (locale, curlocale, 128))
55 { 59 return false;
60
56 STRNCPY (curlocale, locale, 128); 61 strncpy (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale); 62 setlocale (LC_CTYPE, curlocale);
58 } 63 return true;
64}
65
66bool
67rxvt_push_locale (const char *locale)
68{
69 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale);
71}
72
73void
74rxvt_pop_locale ()
75{
76 rxvt_set_locale (savelocale);
59} 77}
60 78
61#if ENABLE_COMBINING 79#if ENABLE_COMBINING
62class rxvt_composite_vec rxvt_composite; 80class rxvt_composite_vec rxvt_composite;
63 81
64text_t rxvt_composite_vec::compose (uint32_t c1, uint32_t c2) 82text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
65{ 83{
66 compose_char *cc; 84 compose_char *cc;
67 85
68 // break compose chains, as stupid readline really likes to duplicate 86 // break compose chains, as stupid readline really likes to duplicate
69 // composing characters for some reason near the end of a line. 87 // composing characters for some reason near the end of a line.
95 v.push_back (compose_char (c1, c2)); 113 v.push_back (compose_char (c1, c2));
96 114
97 return v.size () - 1 + COMPOSE_LO; 115 return v.size () - 1 + COMPOSE_LO;
98} 116}
99 117
100int rxvt_composite_vec::expand (uint32_t c, wchar_t *r) 118int rxvt_composite_vec::expand (unicode_t c, wchar_t *r)
101{ 119{
102 compose_char *cc = (*this)[c]; 120 compose_char *cc = (*this)[c];
103 121
104 if (!cc) 122 if (!cc)
105 { 123 {
120 return len; 138 return len;
121 139
122} 140}
123#endif 141#endif
124 142
125void *
126rxvt_term::operator new (size_t s)
127{
128 void *p = malloc (s);
129
130 MEMSET (p, 0, s);
131 return p;
132}
133
134void
135rxvt_term::operator delete (void *p, size_t s)
136{
137 free (p);
138}
139
140rxvt_term::rxvt_term () 143rxvt_term::rxvt_term ()
141 : 144 :
145#if TRANSPARENT
142 rootwin_ev (this, &rxvt_term::rootwin_cb), 146 rootwin_ev (this, &rxvt_term::rootwin_cb),
147#endif
148#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif
154#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif
157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb),
159#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162#endif
163#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168#endif
169#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
143 termwin_ev (this, &rxvt_term::x_cb), 175 termwin_ev (this, &rxvt_term::x_cb),
144 vt_ev (this, &rxvt_term::x_cb), 176 vt_ev (this, &rxvt_term::x_cb),
145#ifdef HAVE_SCROLLBARS
146 scrollbar_ev (this, &rxvt_term::x_cb),
147#endif
148#ifdef MENUBAR
149 menubar_ev (this, &rxvt_term::x_cb),
150#endif
151#ifdef CURSOR_BLINK
152 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
153#endif
154#ifdef TEXT_BLINK
155 text_blink_ev (this, &rxvt_term::text_blink_cb),
156#endif
157#ifdef POINTER_BLANK
158 pointer_ev (this, &rxvt_term::pointer_cb),
159#endif
160#ifdef USE_XIM
161 im_ev (this, &rxvt_term::im_cb),
162#endif
163 check_ev (this, &rxvt_term::check_cb), 177 check_ev (this, &rxvt_term::check_cb),
178 flush_ev (this, &rxvt_term::flush_cb),
164 destroy_ev (this, &rxvt_term::destroy_cb), 179 destroy_ev (this, &rxvt_term::destroy_cb),
165 pty_ev (this, &rxvt_term::pty_cb), 180 pty_ev (this, &rxvt_term::pty_cb),
166 incr_ev (this, &rxvt_term::incr_cb) 181 incr_ev (this, &rxvt_term::incr_cb)
167{ 182{
168 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 183 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
169}
170 184
171rxvt_term::~rxvt_term () 185 termlist.push_back (this);
186
187#ifdef KEYSYM_RESOURCE
188 keyboard = new keyboard_manager;
189
190 if (!keyboard)
191 rxvt_fatal ("out of memory, aborting.\n");
192#endif
193}
194
195// clean up the most important stuff, do *not* call x or free mem etc.
196// for use before an emergency exit
197void rxvt_term::emergency_cleanup ()
172{ 198{
173 if (cmd_fd >= 0) 199 if (cmd_pid)
174 close (cmd_fd); 200 kill (-cmd_pid, SIGHUP);
175 201
176#ifndef NO_SETOWNER_TTYDEV
177 privileged_ttydev (RESTORE);
178#endif
179#ifdef UTMP_SUPPORT 202#ifdef UTMP_SUPPORT
180 privileged_utmp (RESTORE); 203 privileged_utmp (RESTORE);
181#endif 204#endif
182 205
206 pty.put ();
207}
208
209rxvt_term::~rxvt_term ()
210{
211 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
212
213 termlist.erase (find (termlist.begin (), termlist.end(), this));
214
215 emergency_cleanup ();
216
217#if ENABLE_STYLES
218 for (int i = RS_styleCount; --i; )
219 if (fontset[i] != fontset[0])
220 delete fontset[i];
221#endif
183 delete TermWin.fontset; 222 delete fontset[0];
184 223
185 if (display) 224 if (display)
186 { 225 {
226 dDisp;
227
228 selection_clear ();
229
230#ifdef USE_XIM
231 im_destroy ();
232#endif
233#ifdef MENUBAR
234 if (menubarGC) XFreeGC (disp, menubarGC);
235#endif
236#ifdef XTERM_SCROLLBAR
237 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
238 if (ShadowGC) XFreeGC (disp, ShadowGC);
239#endif
240#ifdef PLAIN_SCROLLBAR
241 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
242#endif
243#ifdef NEXT_SCROLLBAR
244 if (blackGC) XFreeGC (disp, blackGC);
245 if (whiteGC) XFreeGC (disp, whiteGC);
246 if (grayGC) XFreeGC (disp, grayGC);
247 if (darkGC) XFreeGC (disp, darkGC);
248 if (stippleGC) XFreeGC (disp, stippleGC);
249 if (dimple) XFreePixmap (disp, dimple);
250 if (upArrow) XFreePixmap (disp, upArrow);
251 if (downArrow) XFreePixmap (disp, downArrow);
252 if (upArrowHi) XFreePixmap (disp, upArrowHi);
253 if (downArrowHi) XFreePixmap (disp, downArrowHi);
254#endif
255#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
256 if (topShadowGC) XFreeGC (disp, topShadowGC);
257 if (botShadowGC) XFreeGC (disp, botShadowGC);
258 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
259#endif
260 if (gc) XFreeGC (disp, gc);
261
187#if defined(MENUBAR) && (MENUBAR_MAX > 1) 262#if defined(MENUBAR) && (MENUBAR_MAX > 1)
188 delete menuBar.drawable; 263 delete menuBar.drawable;
189 //if (menuBar.win) 264 //if (menuBar.win)
190 // XDestroyWindow (display->display, menuBar.win); 265 // XDestroyWindow (disp, menuBar.win);
191#endif 266#endif
192 delete TermWin.drawable; 267 delete drawable;
193 // destroy all windows 268 // destroy all windows
194 if (TermWin.parent[0]) 269 if (parent[0])
195 XDestroyWindow (display->display, TermWin.parent[0]); 270 XDestroyWindow (disp, parent[0]);
196 } 271 }
197 272
198 // TODO: free pixcolours, colours should become part of rxvt_display 273 // TODO: free pixcolours, colours should become part of rxvt_display
199 274
200 delete PixColors; 275 delete pix_colors_focused;
276#if OFF_FOCUS_FADING
277 delete pix_colors_unfocused;
278#endif
201 279
202 displays.put (display); 280 displays.put (display);
203 281
204 scr_release (); 282 scr_release ();
205 283
284 /* clear all resources */
285 for (int i = 0; i < allocated.size (); i++)
286 free (allocated [i]);
287
288 free (selection.text);
289 // TODO: manage env vars in child only(!)
206 free (env_windowid); 290 free (env_windowid);
207 free (env_display); 291 free (env_display);
208 free (env_term); 292 free (env_term);
209 free (env_colorfgbg); 293 free (env_colorfgbg);
210 free (locale); 294 free (locale);
211 free (codeset); 295 free (v_buffer);
296 free (incr_buf);
212 297
213 delete envv; 298 delete envv;
214 delete argv; 299 delete argv;
300
301#ifdef KEYSYM_RESOURCE
302 delete keyboard;
303#endif
304}
305
306void
307rxvt_term::child_exit ()
308{
309 cmd_pid = 0;
310
311 if (!OPTION (Opt_hold))
312 destroy ();
215} 313}
216 314
217void 315void
218rxvt_term::destroy () 316rxvt_term::destroy ()
219{ 317{
318 if (destroy_ev.active)
319 return;
320
321#if ENABLE_OVERLAY
322 scr_overlay_off ();
323#endif
324
220 if (display) 325 if (display)
221 { 326 {
327#if USE_XIM
328 im_ev.stop (display);
329#endif
330#if HAVE_SCROLLBARS
331 scrollbar_ev.stop (display);
332#endif
333#if MENUBAR
334 menubar_ev.stop (display);
335#endif
336#if TRANSPARENT
222 rootwin_ev.stop (display); 337 rootwin_ev.stop (display);
338#endif
339 incr_ev.stop ();
223 termwin_ev.stop (display); 340 termwin_ev.stop (display);
224 vt_ev.stop (display); 341 vt_ev.stop (display);
225#ifdef USE_XIM
226 im_destroy ();
227 im_ev.stop (display);
228#endif
229#ifdef HAVE_SCROLLBARS
230 scrollbar_ev.stop (display);
231#endif
232#ifdef MENUBAR
233 menubar_ev.stop (display);
234#endif
235 } 342 }
236 343
237 check_ev.stop (); 344 check_ev.stop ();
238 pty_ev.stop (); 345 pty_ev.stop ();
239#ifdef CURSOR_BLINK 346#ifdef CURSOR_BLINK
240 cursor_blink_ev.stop (); 347 cursor_blink_ev.stop ();
241#endif 348#endif
242#ifdef TEXT_BLINK 349#ifdef TEXT_BLINK
243 text_blink_ev.stop (); 350 text_blink_ev.stop ();
244#endif 351#endif
352#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
353 cont_scroll_ev.stop ();
354#endif
355#ifdef SELECTION_SCROLLING
356 sel_scroll_ev.stop ();
357#endif
245#ifdef POINTER_BLANK 358#ifdef POINTER_BLANK
246 pointer_ev.stop (); 359 pointer_ev.stop ();
247#endif 360#endif
248 361
249 destroy_ev.start (0); 362 destroy_ev.start (0);
256 369
257 delete this; 370 delete this;
258} 371}
259 372
260/*----------------------------------------------------------------------*/ 373/*----------------------------------------------------------------------*/
261/* rxvt_init () */ 374/*
262/* LIBPROTO */ 375 * Exit gracefully, clearing the utmp entry and restoring tty attributes
263rxvt_t 376 * TODO: if debugging, this should free up any known resources if we can
264rxvt_init (int argc, const char *const *argv) 377 */
265{ 378static XErrorHandler old_xerror_handler;
266 SET_R (new rxvt_term);
267 379
268 if (!GET_R->init_vars () || !GET_R->init (argc, argv)) 380static void
381rxvt_emergency_cleanup ()
382{
383 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
384 (*t)->emergency_cleanup ();
385}
386
387#if ENABLE_FRILLS
388static void
389print_x_error (Display *dpy, XErrorEvent *event)
390{
391 char buffer[BUFSIZ];
392 char mesg[BUFSIZ];
393 char number[32];
394 char *mtype = "XlibMessage";
395 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
396 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
397 rxvt_warn ("An X Error occured, trying to continue after report.\n");
398 rxvt_warn ("%s: %s\n", mesg, buffer);
399 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
401 sprintf(number, "%d", event->request_code);
402 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
403 rxvt_warn ("(which is %s)\n", buffer);
404 if (event->request_code >= 128) {
405 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
406 mesg, BUFSIZ);
407 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
269 { 408 }
270 delete GET_R; 409 if ((event->error_code == BadWindow) ||
271 SET_R (0); 410 (event->error_code == BadPixmap) ||
411 (event->error_code == BadCursor) ||
412 (event->error_code == BadFont) ||
413 (event->error_code == BadDrawable) ||
414 (event->error_code == BadColor) ||
415 (event->error_code == BadGC) ||
416 (event->error_code == BadIDChoice) ||
417 (event->error_code == BadValue) ||
418 (event->error_code == BadAtom)) {
419 if (event->error_code == BadValue)
420 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
421 mesg, BUFSIZ);
422 else if (event->error_code == BadAtom)
423 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
424 mesg, BUFSIZ);
425 else
426 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
427 mesg, BUFSIZ);
428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
272 } 429 }
273 430 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
274 return GET_R; 431 mesg, BUFSIZ);
432 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
275} 433}
434#endif
276 435
436int
277static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event); 437rxvt_xerror_handler (Display *display, XErrorEvent *event)
278
279void
280rxvt_init_signals ()
281{ 438{
282 /* install exit handler for cleanup */ 439 if (GET_R->allowedxerror == -1)
283#if 0 440 GET_R->allowedxerror = event->error_code;
284#ifdef HAVE_ATEXIT 441 else
285 atexit (rxvt_clean_exit); 442 {
443 // GET_R is most likely not the terminal which caused the error,
444 // so just output the error and continue
445#if ENABLE_FRILLS
446 print_x_error (display, event);
286#else 447#else
448 old_xerror_handler (display, event);
287#endif 449#endif
288#endif 450 }
289 451
290 struct sigaction sa; 452 return 0;
291
292 sigfillset (&sa.sa_mask);
293 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
294 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
295 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
296 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
297 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
298 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
299 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
300
301 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
302 /* signal (SIGURG, SIG_DFL); */
303
304 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
305 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
306} 453}
307 454
455int
456rxvt_xioerror_handler (Display *display)
457{
458 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
459 DisplayString (display));
460 rxvt_emergency_cleanup ();
461 _exit (EXIT_FAILURE);
462}
463
464/*----------------------------------------------------------------------*/
308bool 465bool
309rxvt_term::init (int argc, const char *const *argv) 466rxvt_term::init (int argc, const char *const *argv)
467{
468 SET_R (this);
469
470 set_locale ("");
471
472 if (!init_vars ())
473 return false;
474
475 init_secondary ();
476
477 const char **cmd_argv = init_resources (argc, argv);
478
479#ifdef KEYSYM_RESOURCE
480 keyboard->register_done ();
481#endif
482
483#if MENUBAR_MAX
484 menubar_read (rs[Rs_menu]);
485#endif
486#ifdef HAVE_SCROLLBARS
487 if (OPTION (Opt_scrollBar))
488 scrollBar.setIdle (); /* set existence for size calculations */
489#endif
490
491#if ENABLE_PERL
492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495 {
496 rxvt_perl.init ();
497 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
498 }
499#endif
500
501 create_windows (argc, argv);
502
503 dDisp;
504
505 init_xlocale ();
506
507 scr_reset (); /* initialize screen */
508
509#if 0
510 XSynchronize (disp, True);
511#endif
512
513#ifdef HAVE_SCROLLBARS
514 if (OPTION (Opt_scrollBar))
515 resize_scrollbar (); /* create and map scrollbar */
516#endif
517#if (MENUBAR_MAX)
518 if (menubar_visible ())
519 XMapWindow (disp, menuBar.win);
520#endif
521#ifdef TRANSPARENT
522 if (OPTION (Opt_transparent))
523 {
524 XSelectInput (disp, display->root, PropertyChangeMask);
525 check_our_parents ();
526 rootwin_ev.start (display, display->root);
527 }
528#endif
529
530 XMapWindow (disp, vt);
531 XMapWindow (disp, parent[0]);
532
533 set_colorfgbg ();
534
535 init_command (cmd_argv);
536
537 free (cmd_argv);
538
539 if (pty.pty >= 0)
540 pty_ev.start (pty.pty, EVENT_READ);
541
542 check_ev.start ();
543
544 HOOK_INVOKE ((this, HOOK_START, DT_END));
545
546 return true;
547}
548
549static struct sig_handlers
550{
551 sig_watcher sw_chld, sw_term, sw_int;
552
553 void sig_chld (sig_watcher &w)
554 {
555 // we are being called for every SIGCHLD, find the corresponding term
556 int pid;
557
558 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
559 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
560 if (pid == (*t)->cmd_pid)
561 {
562 (*t)->child_exit ();
563 break;
564 }
565 }
566
567 /*
568 * Catch a fatal signal and tidy up before quitting
569 */
570 void
571 sig_term (sig_watcher &w)
572 {
573#ifdef DEBUG_CMD
574 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
575#endif
576 rxvt_emergency_cleanup ();
577 signal (w.signum, SIG_DFL);
578 kill (getpid (), w.signum);
579 }
580
581 sig_handlers ()
582 : sw_chld (this, &sig_handlers::sig_chld),
583 sw_term (this, &sig_handlers::sig_term),
584 sw_int (this, &sig_handlers::sig_term)
585 {
586 }
587} sig_handlers;
588
589void
590rxvt_init ()
310{ 591{
311 /* 592 /*
312 * Save and then give up any super-user privileges 593 * Save and then give up any super-user privileges
313 * If we need privileges in any area then we must specifically request it. 594 * If we need privileges in any area then we must specifically request it.
314 * We should only need to be root in these cases: 595 * We should only need to be root in these cases:
315 * 1. write utmp entries on some systems 596 * 1. write utmp entries on some systems
316 * 2. chown tty on some systems 597 * 2. chown tty on some systems
317 */ 598 */
318 privileges (SAVE); 599 rxvt_privileges (SAVE);
319 privileges (IGNORE); 600 rxvt_privileges (IGNORE);
320 601
321 init_secondary (); 602 signal (SIGHUP, SIG_IGN);
603 signal (SIGPIPE, SIG_IGN);
322 604
323 const char **cmd_argv = init_resources (argc, argv); 605 sig_handlers.sw_chld.start (SIGCHLD);
606 sig_handlers.sw_term.start (SIGTERM);
607 sig_handlers.sw_int.start (SIGINT);
324 608
325 set_locale (""); 609 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
610 /* signal (SIGURG, SIG_DFL); */
326 611
327#if MENUBAR_MAX 612 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
328 menubar_read (rs[Rs_menu]); 613 // TODO: handle this with exceptions and tolerate the memory loss
329#endif 614 XSetIOErrorHandler (rxvt_xioerror_handler);
330#ifdef HAVE_SCROLLBARS
331 if (Options & Opt_scrollBar)
332 scrollBar.setIdle (); /* set existence for size calculations */
333#endif
334
335 create_windows (argc, argv);
336
337 init_xlocale ();
338
339 scr_reset (); /* initialize screen */
340
341#if 0
342 XSynchronize (display->display, True);
343#endif
344
345#ifdef HAVE_SCROLLBARS
346 if (Options & Opt_scrollBar)
347 resize_scrollbar (); /* create and map scrollbar */
348#endif
349#if (MENUBAR_MAX)
350 if (menubar_visible ())
351 XMapWindow (display->display, menuBar.win);
352#endif
353#ifdef TRANSPARENT
354 if (Options & Opt_transparent)
355 {
356 XSelectInput (display->display, display->root, PropertyChangeMask);
357 check_our_parents ();
358 }
359#endif
360
361 rootwin_ev.start (display, display->root);
362
363 XMapWindow (display->display, TermWin.vt);
364 XMapWindow (display->display, TermWin.parent[0]);
365
366 init_command (cmd_argv);
367
368 pty_ev.start (cmd_fd, EVENT_READ);
369
370 check_ev.start ();
371
372 return true;
373}
374
375/* ------------------------------------------------------------------------- *
376 * SIGNAL HANDLING & EXIT HANDLER *
377 * ------------------------------------------------------------------------- */
378/*
379 * Catch a SIGCHLD signal and exit if the direct child has died
380 */
381/* ARGSUSED */
382/* EXTPROTO */
383RETSIGTYPE
384rxvt_Child_signal (int sig __attribute__ ((unused)))
385{
386 int pid, save_errno = errno;
387 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
388 ;
389 errno = save_errno;
390
391#if 0
392 if (pid == cmd_pid)
393 exit (EXIT_SUCCESS);
394#endif
395}
396
397/*
398 * Catch a fatal signal and tidy up before quitting
399 */
400/* EXTPROTO */
401RETSIGTYPE
402rxvt_Exit_signal (int sig)
403{
404 signal (sig, SIG_DFL);
405#ifdef DEBUG_CMD
406 rxvt_print_error ("signal %d", sig);
407#endif
408 rxvt_clean_exit ();
409 kill (getpid (), sig);
410}
411
412/* INTPROTO */
413int
414rxvt_xerror_handler (Display *display, XErrorEvent *event)
415{
416 if (GET_R->allowedxerror == -1)
417 GET_R->allowedxerror = event->error_code;
418 else
419 {
420 old_xerror_handler (display, event);
421 GET_R->destroy ();
422 }
423
424 return 0;
425}
426
427/*----------------------------------------------------------------------*/
428/*
429 * Exit gracefully, clearing the utmp entry and restoring tty attributes
430 * TODO: if debugging, this should free up any known resources if we can
431 */
432/* EXTPROTO */
433void
434rxvt_clean_exit ()
435{
436 // TODO: rxvtd should clean up all ressources
437 if (GET_R)
438 GET_R->destroy ();
439} 615}
440 616
441/* ------------------------------------------------------------------------- * 617/* ------------------------------------------------------------------------- *
442 * MEMORY ALLOCATION WRAPPERS * 618 * MEMORY ALLOCATION WRAPPERS *
443 * ------------------------------------------------------------------------- */ 619 * ------------------------------------------------------------------------- */
444/* EXTPROTO */ 620void *
445void *
446rxvt_malloc (size_t size) 621rxvt_malloc (size_t size)
447{ 622{
448 void *p;
449
450 p = malloc (size); 623 void *p = malloc (size);
624
451 if (p) 625 if (!p)
626 rxvt_fatal ("memory allocation failure. aborting.\n");
627
452 return p; 628 return p;
453
454 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
455 rxvt_clean_exit ();
456 exit (EXIT_FAILURE);
457 /* NOTREACHED */
458} 629}
459 630
460/* EXTPROTO */ 631void *
461void *
462rxvt_calloc (size_t number, size_t size) 632rxvt_calloc (size_t number, size_t size)
463{ 633{
464 void *p;
465
466 p = calloc (number, size); 634 void *p = calloc (number, size);
635
467 if (p) 636 if (!p)
637 rxvt_fatal ("memory allocation failure. aborting.\n");
638
468 return p; 639 return p;
469
470 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
471 rxvt_clean_exit ();
472 exit (EXIT_FAILURE);
473 /* NOTREACHED */
474} 640}
475 641
476/* EXTPROTO */
477void * 642void *
478rxvt_realloc (void *ptr, size_t size) 643rxvt_realloc (void *ptr, size_t size)
479{ 644{
480 void *p;
481
482 if (ptr)
483 p = realloc (ptr, size); 645 void *p = realloc (ptr, size);
484 else 646
485 p = malloc (size);
486 if (p) 647 if (!p)
648 rxvt_fatal ("memory allocation failure. aborting.\n");
649
487 return p; 650 return p;
488
489 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
490 rxvt_clean_exit ();
491 exit (EXIT_FAILURE);
492 /* NOTREACHED */
493} 651}
494 652
495/* ------------------------------------------------------------------------- * 653/* ------------------------------------------------------------------------- *
496 * PRIVILEGED OPERATIONS * 654 * PRIVILEGED OPERATIONS *
497 * ------------------------------------------------------------------------- */ 655 * ------------------------------------------------------------------------- */
498/* take care of suid/sgid super-user (root) privileges */ 656/* take care of suid/sgid super-user (root) privileges */
499void 657void
500rxvt_term::privileges (int mode) 658rxvt_privileges (rxvt_privaction action)
501{ 659{
660#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
661 static uid_t euid;
662 static gid_t egid;
663#endif
664
502#if ! defined(__CYGWIN32__) 665#if ! defined(__CYGWIN32__)
503# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 666# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
504 /* setreuid () is the poor man's setuid (), seteuid () */ 667 /* setreuid () is the poor man's setuid (), seteuid () */
505# define seteuid(a) setreuid(-1, (a)) 668# define seteuid(a) setreuid(-1, (a))
506# define setegid(a) setregid(-1, (a)) 669# define setegid(a) setregid(-1, (a))
507# define HAVE_SETEUID 670# define HAVE_SETEUID
508# endif 671# endif
509# ifdef HAVE_SETEUID 672# ifdef HAVE_SETEUID
510 switch (mode) 673 switch (action)
511 { 674 {
512 case IGNORE: 675 case IGNORE:
513 /* 676 /*
514 * change effective uid/gid - not real uid/gid - so we can switch 677 * change effective uid/gid - not real uid/gid - so we can switch
515 * back to root later, as required 678 * back to root later, as required
525 seteuid (euid); 688 seteuid (euid);
526 setegid (egid); 689 setegid (egid);
527 break; 690 break;
528 } 691 }
529# else 692# else
530 switch (mode) 693 switch (action)
531 { 694 {
532 case IGNORE: 695 case IGNORE:
533 setuid (getuid ()); 696 setuid (getuid ());
534 setgid (getgid ()); 697 setgid (getgid ());
535 /* FALLTHROUGH */ 698 /* FALLTHROUGH */
542#endif 705#endif
543} 706}
544 707
545#ifdef UTMP_SUPPORT 708#ifdef UTMP_SUPPORT
546void 709void
547rxvt_term::privileged_utmp (char action) 710rxvt_term::privileged_utmp (rxvt_privaction action)
548{ 711{
549 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)", 712 if (OPTION (Opt_utmpInhibit)
550 action, next_utmp_action, getpid ())); 713 || !pty.name || !*pty.name)
551 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
552 || (Options & Opt_utmpInhibit)
553 || ttydev == NULL || *ttydev == '\0')
554 return; 714 return;
555 715
556 privileges (RESTORE); 716 rxvt_privileges (RESTORE);
717
557 if (action == SAVE) 718 if (action == SAVE)
558 {
559 next_utmp_action = RESTORE;
560 makeutent (ttydev, rs[Rs_display_name]); 719 makeutent (pty.name, rs[Rs_display_name]);
561 }
562 else 720 else
563 { /* action == RESTORE */
564 next_utmp_action = IGNORE;
565 cleanutent (); 721 cleanutent ();
566 } 722
567 privileges (IGNORE); 723 rxvt_privileges (IGNORE);
568}
569#endif
570
571#ifndef NO_SETOWNER_TTYDEV
572void
573rxvt_term::privileged_ttydev (char action)
574{
575 D_MAIN ((stderr,
576 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
577 action, next_tty_action, getpid ()));
578 if (next_tty_action != action || (action != SAVE && action != RESTORE)
579 || ttydev == NULL || *ttydev == '\0')
580 return;
581
582 privileges (RESTORE);
583
584 if (action == SAVE)
585 {
586 next_tty_action = RESTORE;
587# ifndef RESET_TTY_TO_COMMON_DEFAULTS
588 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
589 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
590 next_tty_action = IGNORE;
591 else
592# endif
593
594 {
595 chown (ttydev, getuid (), ttygid); /* fail silently */
596 chmod (ttydev, ttymode);
597# ifdef HAVE_REVOKE
598 revoke (ttydev);
599# endif
600
601 }
602 }
603 else
604 { /* action == RESTORE */
605 next_tty_action = IGNORE;
606# ifndef RESET_TTY_TO_COMMON_DEFAULTS
607 chmod (ttydev, ttyfd_stat.st_mode);
608 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
609# else
610 chmod (ttydev,
611 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
612 chown (ttydev, 0, 0);
613# endif
614
615 }
616
617 privileges (IGNORE);
618
619# ifndef RESET_TTY_TO_COMMON_DEFAULTS
620 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
621 action == RESTORE ? "Restoring" : (action ==
622 SAVE ? "Saving" :
623 "UNKNOWN ERROR for"), ttydev,
624 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
625 ttyfd_stat.st_gid));
626# endif
627} 724}
628#endif 725#endif
629 726
630/*----------------------------------------------------------------------*/ 727/*----------------------------------------------------------------------*/
631/* 728/*
632 * window size/position calculcations for XSizeHint and other storage. 729 * window size/position calculcations for XSizeHint and other storage.
633 * if width/height are non-zero then override calculated width/height 730 * if width/height are non-zero then override calculated width/height
634 */ 731 */
635void 732void
636rxvt_term::window_calc (unsigned int width, unsigned int height) 733rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
637{ 734{
638 short recalc_x, recalc_y; 735 short recalc_x, recalc_y;
639 int x, y, sb_w, mb_h, flags; 736 int x, y, sb_w, mb_h, flags;
640 unsigned int w, h; 737 unsigned int w, h;
641 unsigned int max_width, max_height; 738 unsigned int max_width, max_height;
739 dDisp;
642 740
643 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 741 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
644 TermWin.ncol, TermWin.nrow, szHint.width, 742 ncol, nrow, szHint.width, szHint.height));
645 szHint.height)); 743
646 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 744 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
647 szHint.win_gravity = NorthWestGravity; 745 szHint.win_gravity = NorthWestGravity;
648 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 746 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
649 747
650 recalc_x = recalc_y = 0; 748 recalc_x = recalc_y = 0;
651 flags = 0; 749 flags = 0;
750
652 if (!parsed_geometry) 751 if (!parsed_geometry)
653 { 752 {
654 parsed_geometry = 1; 753 parsed_geometry = 1;
754
655 if (rs[Rs_geometry]) 755 if (rs[Rs_geometry])
656 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 756 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
757
657 if (flags & WidthValue) 758 if (flags & WidthValue)
658 { 759 {
659 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 760 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
660 szHint.flags |= USSize; 761 szHint.flags |= USSize;
661 } 762 }
763
662 if (flags & HeightValue) 764 if (flags & HeightValue)
663 { 765 {
664 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 766 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
665 szHint.flags |= USSize; 767 szHint.flags |= USSize;
666 } 768 }
769
667 if (flags & XValue) 770 if (flags & XValue)
668 { 771 {
669 szHint.x = x; 772 szHint.x = x;
670 szHint.flags |= USPosition; 773 szHint.flags |= USPosition;
774
671 if (flags & XNegative) 775 if (flags & XNegative)
672 { 776 {
673 recalc_x = 1; 777 recalc_x = 1;
674 szHint.win_gravity = NorthEastGravity; 778 szHint.win_gravity = NorthEastGravity;
675 } 779 }
676 } 780 }
781
677 if (flags & YValue) 782 if (flags & YValue)
678 { 783 {
679 szHint.y = y; 784 szHint.y = y;
680 szHint.flags |= USPosition; 785 szHint.flags |= USPosition;
786
681 if (flags & YNegative) 787 if (flags & YNegative)
682 { 788 {
683 recalc_y = 1; 789 recalc_y = 1;
790
684 if (szHint.win_gravity == NorthEastGravity) 791 if (szHint.win_gravity == NorthEastGravity)
685 szHint.win_gravity = SouthEastGravity; 792 szHint.win_gravity = SouthEastGravity;
686 else 793 else
687 szHint.win_gravity = SouthWestGravity; 794 szHint.win_gravity = SouthWestGravity;
688 } 795 }
689 } 796 }
690 } 797 }
691 798
692 /* TODO: BOUNDS */ 799 /* TODO: BOUNDS */
693 TermWin.width = TermWin.ncol * TermWin.fwidth; 800 width = ncol * fwidth;
694 TermWin.height = TermWin.nrow * TermWin.fheight; 801 height = nrow * fheight;
695 max_width = MAX_COLS * TermWin.fwidth; 802 max_width = MAX_COLS * fwidth;
696 max_height = MAX_ROWS * TermWin.fheight; 803 max_height = MAX_ROWS * fheight;
697 804
698 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 805 szHint.base_width = szHint.base_height = 2 * int_bwidth;
699 806
700 sb_w = mb_h = 0; 807 sb_w = mb_h = 0;
701 window_vt_x = window_vt_y = 0; 808 window_vt_x = window_vt_y = int_bwidth;
809
702 if (scrollbar_visible ()) 810 if (scrollbar_visible ())
703 { 811 {
704 sb_w = scrollbar_TotalWidth (); 812 sb_w = scrollbar_TotalWidth ();
705 szHint.base_width += sb_w; 813 szHint.base_width += sb_w;
706 if (! (Options & Opt_scrollBar_right)) 814 if (!OPTION (Opt_scrollBar_right))
707 window_vt_x = sb_w; 815 window_vt_x += sb_w;
708 } 816 }
817
709 if (menubar_visible ()) 818 if (menubar_visible ())
710 { 819 {
711 mb_h = menuBar_TotalHeight (); 820 mb_h = menuBar_TotalHeight ();
712 szHint.base_height += mb_h; 821 szHint.base_height += mb_h;
713 window_vt_y = mb_h; 822 window_vt_y += mb_h;
714 } 823 }
824
715 szHint.width_inc = TermWin.fwidth; 825 szHint.width_inc = fwidth;
716 szHint.height_inc = TermWin.fheight; 826 szHint.height_inc = fheight;
717 szHint.min_width = szHint.base_width + szHint.width_inc; 827 szHint.min_width = szHint.base_width + szHint.width_inc;
718 szHint.min_height = szHint.base_height + szHint.height_inc; 828 szHint.min_height = szHint.base_height + szHint.height_inc;
719 829
720 if (width && width - szHint.base_width < max_width) 830 if (newwidth && newwidth - szHint.base_width < max_width)
721 { 831 {
722 szHint.width = width; 832 szHint.width = newwidth;
723 TermWin.width = width - szHint.base_width; 833 width = newwidth - szHint.base_width;
724 } 834 }
725 else 835 else
726 { 836 {
727 MIN_IT (TermWin.width, max_width); 837 min_it (width, max_width);
728 szHint.width = szHint.base_width + TermWin.width; 838 szHint.width = szHint.base_width + width;
729 } 839 }
840
730 if (height && height - szHint.base_height < max_height) 841 if (newheight && newheight - szHint.base_height < max_height)
731 { 842 {
732 szHint.height = height; 843 szHint.height = newheight;
733 TermWin.height = height - szHint.base_height; 844 height = newheight - szHint.base_height;
734 } 845 }
735 else 846 else
736 { 847 {
737 MIN_IT (TermWin.height, max_height); 848 min_it (height, max_height);
738 szHint.height = szHint.base_height + TermWin.height; 849 szHint.height = szHint.base_height + height;
739 } 850 }
851
740 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 852 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
741 window_sb_x = szHint.width - sb_w; 853 window_sb_x = szHint.width - sb_w;
742 854
743 if (recalc_x) 855 if (recalc_x)
744 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 856 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
745 - szHint.width - 2 * TermWin.ext_bwidth);
746 if (recalc_y) 857 if (recalc_y)
747 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 858 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
748 - szHint.height - 2 * TermWin.ext_bwidth);
749 859
750 TermWin.ncol = TermWin.width / TermWin.fwidth; 860 ncol = width / fwidth;
751 TermWin.nrow = TermWin.height / TermWin.fheight; 861 nrow = height / fheight;
752 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 862 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
753 TermWin.ncol, TermWin.nrow, szHint.width, 863 ncol, nrow, szHint.width,
754 szHint.height)); 864 szHint.height));
755 return; 865 return;
756} 866}
757 867
758/*----------------------------------------------------------------------*/ 868/*----------------------------------------------------------------------*/
761 * Called after a window size change. 871 * Called after a window size change.
762 */ 872 */
763void 873void
764rxvt_term::tt_winch () 874rxvt_term::tt_winch ()
765{ 875{
876 if (pty.pty < 0)
877 return;
878
766 struct winsize ws; 879 struct winsize ws;
767 880
768 if (cmd_fd < 0)
769 return;
770
771 ws.ws_col = TermWin.ncol; 881 ws.ws_col = ncol;
772 ws.ws_row = TermWin.nrow; 882 ws.ws_row = nrow;
773 ws.ws_xpixel = ws.ws_ypixel = 0; 883 ws.ws_xpixel = width;
774#ifndef DEBUG_SIZE 884 ws.ws_ypixel = height;
775 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 885 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
776#else 886
777 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 887#if 0
778 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 888 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
779# ifdef SIGWINCH
780 else if (cmd_pid) /* force through to the command */ 889 if (cmd_pid) /* force through to the command */
781 kill (cmd_pid, SIGWINCH); 890 kill (-cmd_pid, SIGWINCH);
782# endif
783#endif 891#endif
784} 892}
785 893
786/*----------------------------------------------------------------------*/ 894/*----------------------------------------------------------------------*/
787/* rxvt_change_font () - Switch to a new font */ 895/* set_fonts () - load and set the various fonts
788/* 896 *
789 * init = 1 - initialize 897 * init = 1 - initialize
790 * 898 *
791 * fontname == FONT_UP - switch to bigger font 899 * fontname == FONT_UP - switch to bigger font
792 * fontname == FONT_DN - switch to smaller font 900 * fontname == FONT_DN - switch to smaller font
793 */ 901 */
794bool 902bool
795rxvt_term::change_font (const char *fontname) 903rxvt_term::set_fonts ()
796{ 904{
797 if (fontname == FONT_UP)
798 {
799 // TODO
800 }
801 else if (fontname == FONT_DN)
802 {
803 // TODO
804 }
805 else
806 {
807 rxvt_fontset *fs = new rxvt_fontset (this); 905 rxvt_fontset *fs = new rxvt_fontset (this);
906 rxvt_fontprop prop;
808 907
809 if (fs && fs->populate (fontname ? fontname : "fixed")) 908 if (!fs
909 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
910 || !fs->realize_font (1))
911 {
912 delete fs;
913 return false;
914 }
915
916#if ENABLE_STYLES
917 for (int i = RS_styleCount; --i; )
918 if (fontset[i] != fontset[0])
919 delete fontset[i];
920#endif
921
922 delete fontset[0];
923 fontset[0] = fs;
924
925 prop = (*fs)[1]->properties ();
926 prop.height += lineSpace;
927 fs->set_prop (prop);
928
929 fwidth = prop.width;
930 fheight = prop.height;
931 fbase = prop.ascent;
932
933 for (int style = 1; style < 4; style++)
934 {
935#if ENABLE_STYLES
936 const char *res = rs[Rs_font + style];
937
938 if (res && !*res)
939 fontset[style] = fontset[0];
940 else
810 { 941 {
811 delete TermWin.fontset; 942 fontset[style] = fs = new rxvt_fontset (this);
812 TermWin.fontset = fs; 943 rxvt_fontprop prop2 = prop;
813 TermWin.fwidth = fs->base_font ()->width;
814 TermWin.fheight = fs->base_font ()->height;
815 TermWin.fbase = fs->base_font ()->ascent;
816 944
817 if (TermWin.parent[0]) 945 if (res)
946 prop2.weight = prop2.slant = rxvt_fontprop::unset;
947 else
818 { 948 {
819 resize_all_windows (0, 0, 0); 949 res = fontset[0]->fontdesc;
820 scr_remap_chars (); 950
821 scr_touch (true); 951 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
952 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
822 } 953 }
823 954
824 return true; 955 fs->populate (res);
956 fs->set_prop (prop2);
825 } 957 }
958#else
959 fontset[style] = fontset[0];
960#endif
961 }
962
963 if (parent[0])
826 } 964 {
965 resize_all_windows (0, 0, 0);
966 scr_remap_chars ();
967 scr_touch (true);
968 }
827 969
828 return false; 970 return true;
829} 971}
830 972
831bool 973void rxvt_term::set_string_property (Atom prop, const char *str, int len)
832rxvt_term::font_up_down (int n, int direction)
833{ 974{
834 return false; 975 XChangeProperty (display->display, parent[0],
976 prop, XA_STRING, 8, PropModeReplace,
977 (const unsigned char *)str, len >= 0 ? len : strlen (str));
978}
979
980void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
981{
982 wchar_t *ws = rxvt_mbstowcs (str, len);
983 char *s = rxvt_wcstoutf8 (ws);
984
985 XChangeProperty (display->display, parent[0],
986 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
987 (const unsigned char *)s, strlen (s));
988
989 free (s);
990 free (ws);
835} 991}
836 992
837/*----------------------------------------------------------------------*/ 993/*----------------------------------------------------------------------*/
838/*----------------------------------------------------------------------*/ 994/*----------------------------------------------------------------------*/
839/* xterm sequences - title, iconName, color (exptl) */ 995/* xterm sequences - title, iconName, color (exptl) */
840void 996void
841rxvt_term::set_title (const char *str) 997rxvt_term::set_title (const char *str)
842{ 998{
843#ifndef SMART_WINDOW_TITLE 999 set_string_property (XA_WM_NAME, str);
844 XStoreName (display->display, TermWin.parent[0], str); 1000#if ENABLE_EWMH
845#else 1001 set_utf8_property (xa[XA_NET_WM_NAME], str);
846 char *name;
847
848 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
849 name = NULL;
850 if (name == NULL || STRCMP (name, str))
851 XStoreName (display->display, TermWin.parent[0], str);
852 if (name)
853 XFree (name);
854#endif 1002#endif
855} 1003}
856 1004
857void 1005void
858rxvt_term::set_iconName (const char *str) 1006rxvt_term::set_icon_name (const char *str)
859{ 1007{
860#ifndef SMART_WINDOW_TITLE 1008 set_string_property (XA_WM_ICON_NAME, str);
861 XSetIconName (display->display, TermWin.parent[0], str); 1009#if ENABLE_EWMH
862#else 1010 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
863 char *name;
864
865 if (XGetIconName (display->display, TermWin.parent[0], &name))
866 name = NULL;
867 if (name == NULL || STRCMP (name, str))
868 XSetIconName (display->display, TermWin.parent[0], str);
869 if (name)
870 XFree (name);
871#endif 1011#endif
872} 1012}
873 1013
874#ifdef XTERM_COLOR_CHANGE 1014#ifdef XTERM_COLOR_CHANGE
875void 1015void
883 1023
884 /* handle color aliases */ 1024 /* handle color aliases */
885 if (isdigit (*color)) 1025 if (isdigit (*color))
886 { 1026 {
887 i = atoi (color); 1027 i = atoi (color);
1028
888 if (i >= 8 && i <= 15) 1029 if (i >= 8 && i <= 15)
889 { /* bright colors */ 1030 { /* bright colors */
890 i -= 8; 1031 i -= 8;
891# ifndef NO_BRIGHTCOLOR
892 PixColors[idx] = PixColors[minBrightCOLOR + i]; 1032 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
893 SET_PIXCOLOR (idx); 1033 SET_PIXCOLOR (idx);
894 goto Done; 1034 goto done;
895# endif
896
897 } 1035 }
1036
898 if (i >= 0 && i <= 7) 1037 if (i >= 0 && i <= 7)
899 { /* normal colors */ 1038 { /* normal colors */
900 PixColors[idx] = PixColors[minCOLOR + i]; 1039 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
901 SET_PIXCOLOR (idx); 1040 SET_PIXCOLOR (idx);
902 goto Done; 1041 goto done;
903 } 1042 }
904 } 1043 }
1044
905 if (!rXParseAllocColor (& xcol, color)) 1045 if (!rXParseAllocColor (&xcol, color))
906 return; 1046 return;
1047
907 /* XStoreColor (display->display, XCMAP, XColor*); */ 1048 /* XStoreColor (display->display, display->cmap, XColor*); */
908 1049
909 /* 1050 /*
910 * FIXME: should free colors here, but no idea how to do it so instead, 1051 * FIXME: should free colors here, but no idea how to do it so instead,
911 * so just keep gobbling up the colormap 1052 * so just keep gobbling up the colormap
912 */ 1053 */
913# if 0 1054# if 0
914 for (i = Color_Black; i <= Color_White; i++) 1055 for (i = Color_Black; i <= Color_White; i++)
915 if (PixColors[idx] == PixColors[i]) 1056 if (pix_colors[idx] == pix_colors[i])
916 break; 1057 break;
917 if (i > Color_White) 1058 if (i > Color_White)
918 { 1059 {
919 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 1060 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
920 XFreeColors (display->display, XCMAP, (PixColors + idx), 1, 1061 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
921 DisplayPlanes (display->display, display->screen)); 1062 DisplayPlanes (display->display, display->screen));
922 } 1063 }
923# endif 1064# endif
924 1065
925 PixColors[idx] = xcol; 1066 pix_colors_focused[idx] = xcol;
926 SET_PIXCOLOR (idx); 1067 SET_PIXCOLOR (idx);
927 1068
928 /* XSetWindowAttributes attr; */ 1069 /* XSetWindowAttributes attr; */
929 /* Cursor cursor; */ 1070 /* Cursor cursor; */
930Done: 1071done:
931 if (idx == Color_bg && ! (Options & Opt_transparent))
932 XSetWindowBackground (display->display, TermWin.vt,
933 PixColors[Color_bg]);
934 1072
1073#if OFF_FOCUS_FADING
1074 if (rs[Rs_fade])
1075 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1076#endif
1077
935 /* handle Color_BD, scrollbar background, etc. */ 1078 /*TODO: handle Color_BD, scrollbar background, etc. */
936 1079
937 set_colorfgbg ();
938 recolour_cursor (); 1080 recolour_cursor ();
939 /* the only reasonable way to enforce a clean update */ 1081 scr_recolour ();
940 scr_poweron ();
941} 1082}
942 1083
943#else 1084#else
944# define set_window_color (idx,color) ((void)0) 1085# define set_window_color (idx,color) ((void)0)
945#endif /* XTERM_COLOR_CHANGE */ 1086#endif /* XTERM_COLOR_CHANGE */
946 1087
947void 1088void
948rxvt_term::recolour_cursor () 1089rxvt_term::recolour_cursor ()
949{ 1090{
950#if TODO
951 rxvt_color xcol[2]; 1091 XColor xcol[2];
952 1092
953 xcol[0] = PixColors[Color_pointer]; 1093 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)
954 xcol[1] = PixColors[Color_bg]; 1094 ? pix_colors_focused[Color_pointer_fg]
1095 : pix_colors_focused[Color_fg];
1096 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1097 ? pix_colors_focused[Color_pointer_bg]
1098 : pix_colors_focused[Color_bg];
1099
955 XQueryColors (display->display, XCMAP, xcol, 2); 1100 XQueryColors (display->display, display->cmap, xcol, 2);
956 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1])); 1101 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
957#endif
958} 1102}
959 1103
960/*----------------------------------------------------------------------*/ 1104/*----------------------------------------------------------------------*/
961/* 1105/*
962 * find if fg/bg matches any of the normal (low-intensity) colors 1106 * find if fg/bg matches any of the normal (low-intensity) colors
963 */ 1107 */
964void 1108void
965rxvt_term::set_colorfgbg () 1109rxvt_term::set_colorfgbg ()
966{ 1110{
967 unsigned int i; 1111 unsigned int i;
968 const char *xpmb = "\0"; 1112 const char *xpmb = "\0";
969 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1113 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
970 1114
971 env_colorfgbg =
972 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1); 1115 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
973 STRCPY (fstr, "default"); 1116 strcpy (fstr, "default");
974 STRCPY (bstr, "default"); 1117 strcpy (bstr, "default");
975 for (i = Color_Black; i <= Color_White; i++) 1118 for (i = Color_Black; i <= Color_White; i++)
976 if (PixColors[Color_fg] == PixColors[i]) 1119 if (pix_colors[Color_fg] == pix_colors[i])
977 { 1120 {
978 sprintf (fstr, "%d", (i - Color_Black)); 1121 sprintf (fstr, "%d", (i - Color_Black));
979 break; 1122 break;
980 } 1123 }
1124
981 for (i = Color_Black; i <= Color_White; i++) 1125 for (i = Color_Black; i <= Color_White; i++)
982 if (PixColors[Color_bg] == PixColors[i]) 1126 if (pix_colors[Color_bg] == pix_colors[i])
983 { 1127 {
984 sprintf (bstr, "%d", (i - Color_Black)); 1128 sprintf (bstr, "%d", (i - Color_Black));
985#ifdef XPM_BACKGROUND 1129#ifdef XPM_BACKGROUND
986 xpmb = "default;"; 1130 xpmb = "default;";
987#endif 1131#endif
988 break; 1132 break;
989 } 1133 }
990 1134
991 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1135 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
992
993#ifndef NO_BRIGHTCOLOR
994 colorfgbg = DEFAULT_RSTYLE;
995 for (i = minCOLOR; i <= maxCOLOR; i++)
996 {
997 if (PixColors[Color_fg] == PixColors[i])
998 colorfgbg = SET_FGCOLOR (colorfgbg, i);
999 if (PixColors[Color_bg] == PixColors[i])
1000 colorfgbg = SET_BGCOLOR (colorfgbg, i);
1001 }
1002#endif
1003} 1136}
1004 1137
1005/*----------------------------------------------------------------------*/ 1138/*----------------------------------------------------------------------*/
1006/*
1007 * Colour determination for low colour displays, routine from
1008 * Hans de Goede <hans@highrise.nl>
1009 */
1010 1139
1011int 1140int
1012rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1141rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1013{ 1142{
1014 if (!screen_in_out->set (display, colour)) 1143 if (!screen_in_out->set (display, colour))
1015 { 1144 {
1016 rxvt_print_error ("can't allocate colour: %s", colour); 1145 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1017 return false; 1146 return false;
1018 } 1147 }
1019 1148
1020 return true; 1149 return true;
1021} 1150}
1022 1151
1023/* -------------------------------------------------------------------- * 1152/* -------------------------------------------------------------------- *
1024 * - WINDOW RESIZING - * 1153 * - WINDOW RESIZING - *
1025 * -------------------------------------------------------------------- */ 1154 * -------------------------------------------------------------------- */
1026void 1155void
1027rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1156rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1028{ 1157{
1029 int fix_screen; 1158 int fix_screen;
1030
1031#ifdef SMART_RESIZE
1032 int old_width = szHint.width, old_height = szHint.height; 1159 int old_width = szHint.width, old_height = szHint.height;
1033#endif 1160 dDisp;
1034 1161
1035 window_calc (width, height); 1162 window_calc (newwidth, newheight);
1036 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1163 XSetWMNormalHints (disp, parent[0], &szHint);
1164
1037 if (!ignoreparent) 1165 if (!ignoreparent)
1038 { 1166 {
1039#ifdef SMART_RESIZE 1167#ifdef SMART_RESIZE
1040 /* 1168 /*
1041 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 1169 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
1044 int x, y, x1, y1; 1172 int x, y, x1, y1;
1045 int dx, dy; 1173 int dx, dy;
1046 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1174 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1047 Window unused_cr; 1175 Window unused_cr;
1048 1176
1049 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1177 XTranslateCoordinates (disp, parent[0], display->root,
1050 0, 0, &x, &y, &unused_cr); 1178 0, 0, &x, &y, &unused_cr);
1051 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1179 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1052 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1180 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1053 /* 1181 /*
1054 * if display->root isn't the parent window, a WM will probably have offset 1182 * if display->root isn't the parent window, a WM will probably have offset
1055 * our position for handles and decorations. Counter it 1183 * our position for handles and decorations. Counter it
1056 */ 1184 */
1058 { 1186 {
1059 x -= x1; 1187 x -= x1;
1060 y -= y1; 1188 y -= y1;
1061 } 1189 }
1062 1190
1063 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1191 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1064 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1192 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1065 dx = old_width - szHint.width; 1193 dx = old_width - szHint.width;
1066 dy = old_height - szHint.height; 1194 dy = old_height - szHint.height;
1067 1195
1068 /* Check position of the center of the window */ 1196 /* Check position of the center of the window */
1069 if (x < x1) /* left half */ 1197 if (x < x1) /* left half */
1073 if (y < y1) /* top half */ 1201 if (y < y1) /* top half */
1074 dy = 0; 1202 dy = 0;
1075 else if (y == y1) /* exact center */ 1203 else if (y == y1) /* exact center */
1076 dy /= 2; 1204 dy /= 2;
1077 1205
1078 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1206 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1079 szHint.width, szHint.height); 1207 szHint.width, szHint.height);
1080#else 1208#else
1081 XResizeWindow (display->display, TermWin.parent[0], szHint.width, 1209 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1082 szHint.height);
1083#endif 1210#endif
1084
1085 } 1211 }
1086 1212
1087 fix_screen = (TermWin.ncol != prev_ncol 1213 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1088 || TermWin.nrow != prev_nrow);
1089 1214
1090 if (fix_screen || width != old_width || height != old_height) 1215 if (fix_screen || newwidth != old_width || newheight != old_height)
1091 { 1216 {
1092 if (scrollbar_visible ()) 1217 if (scrollbar_visible ())
1093 { 1218 {
1094 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x, 1219 XMoveResizeWindow (disp, scrollBar.win,
1220 window_sb_x, 0,
1095 0, scrollbar_TotalWidth (), szHint.height); 1221 scrollbar_TotalWidth (), szHint.height);
1096 resize_scrollbar (); 1222 resize_scrollbar ();
1097 } 1223 }
1098 1224
1099 if (menubar_visible ()) 1225 if (menubar_visible ())
1100 XMoveResizeWindow (display->display, menuBar.win, window_vt_x, 1226 XMoveResizeWindow (disp, menuBar.win,
1227 window_vt_x, 0,
1101 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1228 width, menuBar_TotalHeight ());
1102 1229
1103 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1230 XMoveResizeWindow (disp, vt,
1104 window_vt_y, TermWin_TotalWidth (), 1231 window_vt_x, window_vt_y,
1105 TermWin_TotalHeight ()); 1232 width, height);
1106 scr_clear (height != old_height); 1233
1234 scr_clear ();
1107#ifdef XPM_BACKGROUND 1235#ifdef XPM_BACKGROUND
1108 resize_pixmap (); 1236 resize_pixmap ();
1109#endif 1237#endif
1110
1111 } 1238 }
1112 1239
1113 if (fix_screen || old_height == 0) 1240 if (fix_screen || old_height == 0)
1114 { 1241 {
1115 int curr_screen = -1; 1242 int curr_screen = -1;
1116 int old_ncol = prev_ncol; 1243 int old_ncol = prev_ncol;
1117 1244
1118 /* scr_reset only works on the primary screen */ 1245 /* scr_reset only works on the primary screen */
1119 if (old_height) /* this is not the first time through */ 1246 if (old_height) /* this is not the first time through */
1120 { 1247 {
1121 unsigned int ncol = TermWin.ncol; 1248 unsigned int ocol = ncol;
1122 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1249 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1123 curr_screen = scr_change_screen (PRIMARY); 1250 curr_screen = scr_change_screen (PRIMARY);
1124 TermWin.ncol = ncol; 1251 ncol = ocol;
1125 } 1252 }
1126 1253
1127 scr_reset (); 1254 scr_reset ();
1128 1255
1129 if (curr_screen >= 0) /* this is not the first time through */ 1256 if (curr_screen >= 0) /* this is not the first time through */
1130 { 1257 {
1131 scr_change_screen (curr_screen); 1258 scr_change_screen (curr_screen);
1132 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1259 selection_check (old_ncol != ncol ? 4 : 0);
1133 } 1260 }
1134 } 1261 }
1135 1262
1136 old_width = szHint.width; 1263 old_width = szHint.width;
1137 old_height = szHint.height; 1264 old_height = szHint.height;
1265
1266#ifdef XPM_BACKGROUND
1267 if (pixmap)
1268 scr_touch (false);
1269#endif
1138 1270
1139#ifdef USE_XIM 1271#ifdef USE_XIM
1140 IMSetStatusPosition (); 1272 IMSetStatusPosition ();
1141#endif 1273#endif
1142} 1274}
1144/* 1276/*
1145 * Set the width/height of the vt window in characters. Units are pixels. 1277 * Set the width/height of the vt window in characters. Units are pixels.
1146 * good for toggling 80/132 columns 1278 * good for toggling 80/132 columns
1147 */ 1279 */
1148void 1280void
1149rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1281rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1150{ 1282{
1151 XWindowAttributes wattr; 1283 XWindowAttributes wattr;
1152 1284
1153 if (width == 0 || height == 0) 1285 if (newwidth == 0 || newheight == 0)
1154 { 1286 {
1155 XGetWindowAttributes (display->display, display->root, &wattr); 1287 XGetWindowAttributes (display->display, display->root, &wattr);
1288
1156 if (width == 0) 1289 if (newwidth == 0)
1157 width = wattr.width - szHint.base_width; 1290 newwidth = wattr.width - szHint.base_width;
1158 if (height == 0) 1291 if (newheight == 0)
1159 height = wattr.height - szHint.base_height; 1292 newheight = wattr.height - szHint.base_height;
1160 }
1161 if (width != TermWin.width || height != TermWin.height)
1162 { 1293 }
1294
1295 if (newwidth != width || newheight != height)
1296 {
1163 width += szHint.base_width; 1297 newwidth += szHint.base_width;
1164 height += szHint.base_height; 1298 newheight += szHint.base_height;
1165 resize_all_windows (width, height, 0); 1299 resize_all_windows (newwidth, newheight, 0);
1166 } 1300 }
1167} 1301}
1168 1302
1169/* -------------------------------------------------------------------- * 1303/* -------------------------------------------------------------------- *
1170 * - X INPUT METHOD ROUTINES - * 1304 * - X INPUT METHOD ROUTINES - *
1171 * -------------------------------------------------------------------- */ 1305 * -------------------------------------------------------------------- */
1172#ifdef USE_XIM 1306#ifdef USE_XIM
1173 1307
1174void 1308void
1309rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1310{
1311 fg = pix_colors[Color_fg];
1312 bg = pix_colors[Color_bg];
1313}
1314
1315void
1175rxvt_term::im_set_size (XRectangle *size) 1316rxvt_term::im_set_size (XRectangle &size)
1176{ 1317{
1177 size->x = TermWin.int_bwidth; 1318 // the int_bwidth terms make no sense to me
1178 size->y = TermWin.int_bwidth; 1319 size.x = int_bwidth;
1179 size->width = Width2Pixel (TermWin.ncol); 1320 size.y = int_bwidth;
1180 size->height = Height2Pixel (TermWin.nrow); 1321 size.width = Width2Pixel (ncol) + int_bwidth;
1322 size.height = Height2Pixel (nrow) + int_bwidth;
1181} 1323}
1182 1324
1183void 1325void
1184rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg) 1326rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1327 XRectangle &status_rect,
1328 const XRectangle &needed_rect)
1185{ 1329{
1186 *fg = PixColors[Color_fg]; 1330 preedit_rect.x = needed_rect.width;
1187 *bg = PixColors[Color_bg]; 1331 preedit_rect.y = 0;
1332 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1333 preedit_rect.height = fheight;
1334
1335 status_rect.x = 0;
1336 status_rect.y = 0;
1337 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1338 status_rect.height = fheight;
1188} 1339}
1189 1340
1190/* Checking whether input method is running. */ 1341/* Checking whether input method is running. */
1191bool 1342bool
1192rxvt_term::IMisRunning () 1343rxvt_term::IMisRunning ()
1193{ 1344{
1194 char *p; 1345 char *p;
1195 Atom atom; 1346 Atom atom;
1196 Window win; 1347 Window win;
1197 char server[IMBUFSIZ]; 1348 char server[IMBUFSIZ];
1198 1349
1199 /* get current locale modifier */ 1350 /* get current locale modifier */
1200 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1351 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1201 { 1352 {
1202 STRCPY (server, "@server="); 1353 strcpy (server, "@server=");
1203 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1354 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1355
1204 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */ 1356 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1205 *p = '\0'; 1357 *p = '\0';
1206 1358
1207 atom = XInternAtom (display->display, server, False); 1359 atom = XInternAtom (display->display, server, False);
1208 win = XGetSelectionOwner (display->display, atom); 1360 win = XGetSelectionOwner (display->display, atom);
1361
1209 if (win != None) 1362 if (win != None)
1210 return True; 1363 return True;
1211 } 1364 }
1365
1212 return False; 1366 return False;
1213} 1367}
1214 1368
1215void 1369void
1216rxvt_term::IMSendSpot () 1370rxvt_term::IMSendSpot ()
1217{ 1371{
1218 XPoint spot; 1372 XPoint nspot;
1219 XVaNestedList preedit_attr; 1373 XVaNestedList preedit_attr;
1220 1374
1221 if (Input_Context == NULL 1375 if (!Input_Context
1376 || !focus
1222 || !TermWin.focus || ! (input_style & XIMPreeditPosition) 1377 || !(input_style & XIMPreeditPosition))
1223 || ! (event_type == KeyPress
1224 || event_type == Expose
1225 || event_type == NoExpose
1226 || event_type == SelectionNotify
1227 || event_type == ButtonRelease || event_type == FocusIn)
1228 || !IMisRunning ())
1229 return; 1378 return;
1230 1379
1231 im_set_position (&spot); 1380 im_set_position (nspot);
1381
1382 if (nspot.x == spot.x && nspot.y == spot.y)
1383 return;
1384
1385 spot = nspot;
1232 1386
1233 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); 1387 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1234 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1388 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1235 XFree (preedit_attr); 1389 XFree (preedit_attr);
1236} 1390}
1237 1391
1238void 1392void
1239rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1240 XRectangle * needed_rect)
1241{
1242 int mbh, vtx = 0;
1243
1244 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1245 vtx = scrollbar_TotalWidth ();
1246
1247 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1248 mbh -= TermWin.lineSpace;
1249
1250 preedit_rect->x = needed_rect->width + vtx;
1251 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1252
1253 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1254 preedit_rect->height = Height2Pixel (1);
1255
1256 status_rect->x = vtx;
1257 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1258
1259 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1260 status_rect->height = Height2Pixel (1);
1261}
1262
1263void
1264rxvt_term::im_destroy () 1393rxvt_term::im_destroy ()
1265{ 1394{
1266 if (Input_Context)
1267 {
1268 XDestroyIC (Input_Context);
1269 Input_Context = NULL;
1270 }
1271
1272 if (input_method) 1395 if (input_method)
1273 { 1396 {
1397 if (Input_Context && input_method->xim)
1398 XDestroyIC (Input_Context);
1399
1274 display->put_xim (input_method); 1400 display->put_xim (input_method);
1275 input_method = 0; 1401 input_method = 0;
1276 } 1402 }
1403
1404 Input_Context = 0;
1277} 1405}
1278 1406
1279/* 1407/*
1280 * Try to open a XIM with the current modifiers, then see if we can 1408 * Try to open a XIM with the current modifiers, then see if we can
1281 * open a suitable preedit type 1409 * open a suitable preedit type
1282 */ 1410 */
1283bool 1411bool
1284rxvt_term::IM_get_IC (const char *modifiers) 1412rxvt_term::IM_get_IC (const char *modifiers)
1285{ 1413{
1286 int i, j, found; 1414 int i, j, found;
1287 XIM xim; 1415 XIM xim;
1288 XPoint spot; 1416 XPoint spot;
1289 XRectangle rect, status_rect, needed_rect; 1417 XRectangle rect, status_rect, needed_rect;
1290 unsigned long fg, bg; 1418 unsigned long fg, bg;
1291 const char *p; 1419 const char *p;
1292 char **s; 1420 char **s;
1293 XIMStyles *xim_styles; 1421 XIMStyles *xim_styles;
1294 XVaNestedList preedit_attr, status_attr;
1295 1422
1296 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1423 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1297 return false; 1424 return false;
1298 1425
1299 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1426 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1300 input_method = display->get_xim (locale, modifiers); 1427 input_method = display->get_xim (locale, modifiers);
1301 if (input_method == NULL) 1428 if (input_method == NULL)
1302 return false; 1429 return false;
1303 1430
1304 xim = input_method->xim; 1431 xim = input_method->xim;
1432 spot.x = spot.y = -1;
1305 1433
1306 xim_styles = NULL; 1434 xim_styles = NULL;
1307 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1435 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1308 || !xim_styles || !xim_styles->count_styles) 1436 || !xim_styles || !xim_styles->count_styles)
1309 { 1437 {
1310 display->put_xim (input_method); 1438 im_destroy ();
1311 return false; 1439 return false;
1312 } 1440 }
1313 1441
1314 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1442 const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
1443
1444 for (int pi = 0; pi < 2; pi++)
1445 {
1446 p = pet[pi];
1447
1448 if (!p)
1449 continue;
1450
1315 s = rxvt_splitcommastring (p); 1451 s = rxvt_splitcommastring (p);
1452
1316 for (i = found = 0; !found && s[i]; i++) 1453 for (i = found = 0; !found && s[i]; i++)
1317 { 1454 {
1318 if (!STRCMP (s[i], "OverTheSpot")) 1455 if (!strcmp (s[i], "OverTheSpot"))
1319 input_style = (XIMPreeditPosition | XIMStatusNothing); 1456 input_style = (XIMPreeditPosition | XIMStatusNothing);
1320 else if (!STRCMP (s[i], "OffTheSpot")) 1457 else if (!strcmp (s[i], "OffTheSpot"))
1321 input_style = (XIMPreeditArea | XIMStatusArea); 1458 input_style = (XIMPreeditArea | XIMStatusArea);
1322 else if (!STRCMP (s[i], "Root")) 1459 else if (!strcmp (s[i], "Root"))
1323 input_style = (XIMPreeditNothing | XIMStatusNothing); 1460 input_style = (XIMPreeditNothing | XIMStatusNothing);
1461 else if (!strcmp (s[i], "None"))
1462 input_style = (XIMPreeditNone | XIMStatusNone);
1324 1463
1325 for (j = 0; j < xim_styles->count_styles; j++) 1464 for (j = 0; j < xim_styles->count_styles; j++)
1326 if (input_style == xim_styles->supported_styles[j]) 1465 if (input_style == xim_styles->supported_styles[j])
1327 { 1466 {
1467 rxvt_freecommastring (s);
1468
1328 found = 1; 1469 found = 1;
1329 break; 1470 goto foundpet;
1471 }
1472
1330 } 1473 }
1331 }
1332 1474
1333 for (i = 0; s[i]; i++) 1475 rxvt_freecommastring (s);
1334 free (s[i]); 1476 }
1335 1477
1336 free (s); 1478foundpet:
1479
1337 XFree (xim_styles); 1480 XFree (xim_styles);
1338 1481
1339 if (!found) 1482 if (!found)
1340 { 1483 {
1341 display->put_xim (input_method); 1484 im_destroy ();
1342 return false; 1485 return false;
1343 } 1486 }
1344 1487
1345 preedit_attr = status_attr = NULL; 1488 XFontSet fs = 0;
1489 XVaNestedList preedit_attr = 0, status_attr = 0;
1490
1491 if (input_style & (XIMPreeditPosition | XIMPreeditArea))
1492 {
1493 // fake us a font-set, please
1494 char **missing_charset_list;
1495 int missing_charset_count;
1496 char *def_string;
1497 char pat[512];
1498
1499 sprintf (pat,
1500 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1501 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1502 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1503 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1504 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1505 "*",
1506 fheight,
1507 fheight + 1, fheight - 1,
1508 fheight - 2, fheight + 2);
1509
1510 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1511 &missing_charset_list, &missing_charset_count, &def_string);
1512
1513 if (missing_charset_list)
1514 XFreeStringList (missing_charset_list);
1515
1516 if (!fs)
1517 {
1518 input_style &= ~(XIMPreeditPosition | XIMPreeditArea);
1519 rxvt_warn ("unable to create fontset for input method, try \"-pt Root\". Continuing.\n");
1520 }
1521 }
1346 1522
1347 if (input_style & XIMPreeditPosition) 1523 if (input_style & XIMPreeditPosition)
1348 { 1524 {
1349 im_set_size (&rect); 1525 im_set_size (rect);
1350 im_set_position (&spot); 1526 im_set_position (spot);
1351 im_set_color (&fg, &bg); 1527 im_set_color (fg, bg);
1352 1528
1353 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1529 preedit_attr = XVaCreateNestedList (0,
1530 XNForeground, fg,
1531 XNBackground, bg,
1532 XNArea, &rect,
1354 XNSpotLocation, &spot, 1533 XNSpotLocation, &spot,
1355 XNForeground, fg, XNBackground, bg,
1356 //XNFontSet, TermWin.fontset, 1534 XNFontSet, fs,
1357 NULL); 1535 NULL);
1358 } 1536 }
1359 else if (input_style & XIMPreeditArea) 1537 else if (input_style & XIMPreeditArea)
1360 { 1538 {
1361 im_set_color (&fg, &bg); 1539 im_set_color (fg, bg);
1362 1540
1363 /* 1541 /*
1364 * The necessary width of preedit area is unknown 1542 * The necessary width of preedit area is unknown
1365 * until create input context. 1543 * until create input context.
1366 */ 1544 */
1367 needed_rect.width = 0; 1545 needed_rect.width = 0;
1368
1369 im_set_preedit_area (&rect, &status_rect, &needed_rect); 1546 im_set_preedit_area (rect, status_rect, needed_rect);
1370 1547
1371 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1548 preedit_attr = XVaCreateNestedList (0,
1549 XNForeground, fg,
1372 XNForeground, fg, XNBackground, bg, 1550 XNBackground, bg,
1551 XNArea, &rect,
1552 XNFontSet, fs,
1553 NULL);
1554 status_attr = XVaCreateNestedList (0,
1555 XNForeground, fg,
1556 XNBackground, bg,
1557 XNArea, &status_rect,
1373 //XNFontSet, TermWin.fontset, 1558 XNFontSet, fs,
1374 NULL); 1559 NULL);
1375 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1376 XNForeground, fg, XNBackground, bg,
1377 //XNFontSet, TermWin.fontset,
1378 NULL);
1379 } 1560 }
1380 1561
1381 Input_Context = XCreateIC (xim, XNInputStyle, input_style, 1562 Input_Context = XCreateIC (xim,
1563 XNInputStyle, input_style,
1382 XNClientWindow, TermWin.parent[0], 1564 XNClientWindow, vt,
1383 XNFocusWindow, TermWin.parent[0], 1565 XNFocusWindow, parent[0],
1384 preedit_attr ? XNPreeditAttributes : NULL, 1566 preedit_attr ? XNPreeditAttributes : NULL,
1385 preedit_attr, 1567 preedit_attr,
1386 status_attr ? XNStatusAttributes : NULL, 1568 status_attr ? XNStatusAttributes : NULL,
1387 status_attr, NULL); 1569 status_attr, NULL);
1570
1388 if (preedit_attr) XFree (preedit_attr); 1571 if (preedit_attr) XFree (preedit_attr);
1389 if (status_attr) XFree (status_attr); 1572 if (status_attr) XFree (status_attr);
1573 if (fs) XFreeFontSet (display->display, fs);
1390 1574
1391 if (Input_Context == NULL) 1575 if (Input_Context == NULL)
1392 { 1576 {
1393 rxvt_print_error ("failed to create input context"); 1577 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1394 display->put_xim (input_method); 1578 im_destroy ();
1395 return false; 1579 return false;
1396 } 1580 }
1397 1581
1398 if (input_style & XIMPreeditArea) 1582 if (input_style & XIMPreeditArea)
1399 IMSetStatusPosition (); 1583 IMSetStatusPosition ();
1403} 1587}
1404 1588
1405void 1589void
1406rxvt_term::im_cb () 1590rxvt_term::im_cb ()
1407{ 1591{
1408 int i, found, had_im; 1592 int i;
1409 const char *p; 1593 const char *p;
1410 char **s; 1594 char **s;
1411 char buf[IMBUFSIZ]; 1595 char buf[IMBUFSIZ];
1412 1596
1597 SET_R (this);
1598
1413 im_destroy (); 1599 im_destroy ();
1414 1600
1415 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1601 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1416 if (Input_Context) 1602 if (Input_Context)
1417 return; 1603 return;
1425 if (p && *p) 1611 if (p && *p)
1426 { 1612 {
1427 bool found = false; 1613 bool found = false;
1428 1614
1429 s = rxvt_splitcommastring (p); 1615 s = rxvt_splitcommastring (p);
1616
1430 for (i = 0; s[i]; i++) 1617 for (i = 0; s[i]; i++)
1431 { 1618 {
1432 if (*s[i]) 1619 if (*s[i])
1433 { 1620 {
1434 STRCPY (buf, "@im="); 1621 strcpy (buf, "@im=");
1435 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1622 strncat (buf, s[i], IMBUFSIZ - 5);
1436 if (IM_get_IC (buf)) 1623 if (IM_get_IC (buf))
1437 { 1624 {
1438 found = true; 1625 found = true;
1439 break; 1626 break;
1440 } 1627 }
1441 } 1628 }
1442 } 1629 }
1443 for (i = 0; s[i]; i++) 1630
1444 free (s[i]); 1631 rxvt_freecommastring (s);
1445 free (s);
1446 1632
1447 if (found) 1633 if (found)
1448 goto done; 1634 goto done;
1449 } 1635 }
1450 1636
1464} 1650}
1465 1651
1466void 1652void
1467rxvt_term::IMSetStatusPosition () 1653rxvt_term::IMSetStatusPosition ()
1468{ 1654{
1469 XRectangle preedit_rect, status_rect, *needed_rect; 1655 XRectangle preedit_rect, status_rect, *needed_rect;
1470 XVaNestedList preedit_attr, status_attr; 1656 XVaNestedList preedit_attr, status_attr;
1471 1657
1472 if (Input_Context == NULL 1658 if (!Input_Context
1659 || !focus
1473 || !TermWin.focus || ! (input_style & XIMPreeditArea) 1660 || !(input_style & XIMPreeditArea)
1474 || !IMisRunning ()) 1661 || !IMisRunning ())
1475 return; 1662 return;
1476 1663
1477 /* Getting the necessary width of preedit area */ 1664 /* Getting the necessary width of preedit area */
1478 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1665 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1479 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1666 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1480 XFree (status_attr); 1667 XFree (status_attr);
1481 1668
1482 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect); 1669 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1670 XFree (needed_rect);
1483 1671
1484 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1672 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1485 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1673 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1486 1674
1487 XSetICValues (Input_Context, 1675 XSetICValues (Input_Context,
1488 XNPreeditAttributes, preedit_attr, 1676 XNPreeditAttributes, preedit_attr,
1489 XNStatusAttributes, status_attr, NULL); 1677 XNStatusAttributes, status_attr, NULL);
1490 1678
1491 XFree (preedit_attr); 1679 XFree (preedit_attr);
1492 XFree (status_attr); 1680 XFree (status_attr);
1493} 1681}
1494#endif /* USE_XIM */ 1682#endif /* USE_XIM */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines