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.14 by pcg, Thu Dec 18 00:29:29 2003 UTC vs.
Revision 1.154 by root, Sat Dec 31 17:16:17 2005 UTC

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

Diff Legend

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