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.12 by pcg, Tue Dec 16 23:04:13 2003 UTC vs.
Revision 1.135 by root, Sun Feb 13 11:07:57 2005 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines