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.10 by pcg, Wed Dec 3 23:19:44 2003 UTC vs.
Revision 1.136 by root, Mon Feb 14 18:47:54 2005 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines