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.21 by pcg, Thu Jan 29 23:26:01 2004 UTC vs.
Revision 1.139 by root, Wed Feb 16 21:37:10 2005 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines