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.9 by pcg, Tue Dec 2 21:49:46 2003 UTC vs.
Revision 1.146 by root, Mon Nov 28 18:37:42 2005 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines