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.119 by root, Mon Dec 13 01:29:03 2004 UTC vs.
Revision 1.201 by root, Wed Jan 25 00:57:57 2006 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2006 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 */ 35#include "keyboard.h"
36#include "rxvtperl.h"
36 37
38#include <limits>
39
37#include <signal.h> 40#include <csignal>
41#include <cstring>
38 42
39#ifdef TTY_GID_SUPPORT 43#ifdef TTY_GID_SUPPORT
40# include <grp.h> 44# include <grp.h>
41#endif 45#endif
42 46
43#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
44# include <termios.h> 48# include <termios.h>
45#endif 49#endif
46 50
47#include <cstring>
48
49vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
50 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
51static char curlocale[128]; 56static char curlocale[128], savelocale[128];
52 57
53bool 58bool
54rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
55{ 60{
56 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
57 return false; 62 return false;
58 63
59 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
60 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
61 return true; 66 return true;
67}
68
69void
70rxvt_push_locale (const char *locale) NOTHROW
71{
72 strcpy (savelocale, curlocale);
73 rxvt_set_locale (locale);
74}
75
76void
77rxvt_pop_locale () NOTHROW
78{
79 rxvt_set_locale (savelocale);
62} 80}
63 81
64#if ENABLE_COMBINING 82#if ENABLE_COMBINING
65class rxvt_composite_vec rxvt_composite; 83class rxvt_composite_vec rxvt_composite;
66 84
… …
131 rootwin_ev (this, &rxvt_term::rootwin_cb), 149 rootwin_ev (this, &rxvt_term::rootwin_cb),
132#endif 150#endif
133#ifdef HAVE_SCROLLBARS 151#ifdef HAVE_SCROLLBARS
134 scrollbar_ev (this, &rxvt_term::x_cb), 152 scrollbar_ev (this, &rxvt_term::x_cb),
135#endif 153#endif
136#ifdef MENUBAR
137 menubar_ev (this, &rxvt_term::x_cb),
138#endif
139#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
140 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
141#endif 156#endif
142#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
143 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
155 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
156#endif 171#endif
157#ifdef USE_XIM 172#ifdef USE_XIM
158 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
159#endif 174#endif
160 sw_term (this, &rxvt_term::sig_term), 175#ifndef NO_BELL
161 sw_chld (this, &rxvt_term::sig_chld), 176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
162 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
163 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
164 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
165 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
166 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
167 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
168 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
169{ 186{
170 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
171 188
172 termlist.push_back (this); 189 termlist.push_back (this);
173}
174 190
175rxvt_term::~rxvt_term () 191#ifdef KEYSYM_RESOURCE
176{ 192 keyboard = new keyboard_manager;
177 termlist.erase (find (termlist.begin (), termlist.end(), this)); 193#endif
194}
178 195
196// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit
198void rxvt_term::emergency_cleanup ()
199{
179 if (cmd_pid) 200 if (cmd_pid)
180 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
181 202
182 pty.put (); 203 delete pty; pty = 0;
204}
183 205
184#ifdef UTMP_SUPPORT 206rxvt_term::~rxvt_term ()
185 privileged_utmp (RESTORE); 207{
186#endif 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
209
210 emergency_cleanup ();
187 211
188#if ENABLE_STYLES 212#if ENABLE_STYLES
189 for (int i = RS_styleCount; --i; ) 213 for (int i = RS_styleCount; --i; )
190 if (TermWin.fontset[i] != TermWin.fontset[0]) 214 if (fontset[i] != fontset[0])
191 delete TermWin.fontset[i]; 215 delete fontset[i];
192#endif 216#endif
193 delete TermWin.fontset[0]; 217 delete fontset[0];
194 218
195 if (display) 219 if (display)
196 { 220 {
221 dDisp;
222
197 selection_clear (); 223 selection_clear ();
198 224
199#ifdef USE_XIM 225#ifdef USE_XIM
200 im_destroy (); 226 im_destroy ();
201#endif 227#endif
202#ifdef MENUBAR
203 if (menubarGC) XFreeGC (display->display, menubarGC);
204#endif
205#ifdef XTERM_SCROLLBAR 228#ifdef XTERM_SCROLLBAR
206 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); 229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
207 if (ShadowGC) XFreeGC (display->display, ShadowGC); 230 if (ShadowGC) XFreeGC (disp, ShadowGC);
208#endif 231#endif
209#ifdef PLAIN_SCROLLBAR 232#ifdef PLAIN_SCROLLBAR
210 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC); 233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
211#endif 234#endif
212#ifdef NEXT_SCROLLBAR 235#ifdef NEXT_SCROLLBAR
213 if (blackGC) XFreeGC (display->display, blackGC); 236 if (blackGC) XFreeGC (disp, blackGC);
214 if (whiteGC) XFreeGC (display->display, whiteGC); 237 if (whiteGC) XFreeGC (disp, whiteGC);
215 if (grayGC) XFreeGC (display->display, grayGC); 238 if (grayGC) XFreeGC (disp, grayGC);
216 if (darkGC) XFreeGC (display->display, darkGC); 239 if (darkGC) XFreeGC (disp, darkGC);
217 if (stippleGC) XFreeGC (display->display, stippleGC); 240 if (stippleGC) XFreeGC (disp, stippleGC);
218 if (dimple) XFreePixmap (display->display, dimple); 241 if (dimple) XFreePixmap (disp, dimple);
219 if (upArrow) XFreePixmap (display->display, upArrow); 242 if (upArrow) XFreePixmap (disp, upArrow);
220 if (downArrow) XFreePixmap (display->display, downArrow); 243 if (downArrow) XFreePixmap (disp, downArrow);
221 if (upArrowHi) XFreePixmap (display->display, upArrowHi); 244 if (upArrowHi) XFreePixmap (disp, upArrowHi);
222 if (downArrowHi) XFreePixmap (display->display, downArrowHi); 245 if (downArrowHi) XFreePixmap (disp, downArrowHi);
223#endif 246#endif
224#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 247#ifdef RXVT_SCROLLBAR
225 if (topShadowGC) XFreeGC (display->display, topShadowGC); 248 if (topShadowGC) XFreeGC (disp, topShadowGC);
226 if (botShadowGC) XFreeGC (display->display, botShadowGC); 249 if (botShadowGC) XFreeGC (disp, botShadowGC);
227 if (scrollbarGC) XFreeGC (display->display, scrollbarGC); 250 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
228#endif 251#endif
229 if (TermWin.gc) XFreeGC (display->display, TermWin.gc); 252 if (gc) XFreeGC (disp, gc);
230 253
231#if defined(MENUBAR) && (MENUBAR_MAX > 1)
232 delete menuBar.drawable; 254 delete drawable;
233 //if (menuBar.win)
234 // XDestroyWindow (display->display, menuBar.win);
235#endif
236 delete TermWin.drawable;
237 // destroy all windows 255 // destroy all windows
238 if (TermWin.parent[0]) 256 if (parent[0])
239 XDestroyWindow (display->display, TermWin.parent[0]); 257 XDestroyWindow (disp, parent[0]);
240 } 258 }
241 259
242 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
243
244 delete pix_colors_focused; 261 delete pix_colors_focused;
245#ifdef OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
246 delete pix_colors_unfocused; 263 delete pix_colors_unfocused;
247#endif 264#endif
248 265
249 displays.put (display); 266 displays.put (display);
250 267
251 scr_release (); 268 scr_release ();
252 269
253 /* clear all resources */ 270 /* clear all resources */
254 for (int i = 0; i < allocated.size (); i++) 271 for (int i = 0; i < allocated.size (); i++)
255 free (allocated[i]); 272 free (allocated [i]);
256 273
257 free (selection.text); 274 free (selection.text);
258 // TODO: manage env vars in child only(!) 275 // TODO: manage env vars in child only(!)
259 free (env_windowid); 276 free (env_windowid);
260 free (env_display); 277 free (env_display);
261 free (env_term); 278 free (env_term);
262 free (env_colorfgbg); 279 free (env_colorfgbg);
263 free (locale); 280 free (locale);
281 free (v_buffer);
264 free (incr_buf); 282 free (incr_buf);
265 283
266 delete envv; 284 delete envv;
267 delete argv; 285 delete argv;
286
287#ifdef KEYSYM_RESOURCE
288 delete keyboard;
289#endif
290}
291
292// child has exited, usually destroys
293void
294rxvt_term::child_cb (child_watcher &w, int status)
295{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297
298 cmd_pid = 0;
299
300 if (!OPTION (Opt_hold))
301 destroy ();
268} 302}
269 303
270void 304void
271rxvt_term::destroy () 305rxvt_term::destroy ()
272{ 306{
273 if (destroy_ev.active) 307 if (destroy_ev.active)
274 return; 308 return;
275 309
310 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311
276#if ENABLE_OVERLAY 312#if ENABLE_OVERLAY
277 scr_overlay_off (); 313 scr_overlay_off ();
278#endif 314#endif
279 315
280 if (display) 316 if (display)
… …
282#if USE_XIM 318#if USE_XIM
283 im_ev.stop (display); 319 im_ev.stop (display);
284#endif 320#endif
285#if HAVE_SCROLLBARS 321#if HAVE_SCROLLBARS
286 scrollbar_ev.stop (display); 322 scrollbar_ev.stop (display);
287#endif
288#if MENUBAR
289 menubar_ev.stop (display);
290#endif 323#endif
291#if TRANSPARENT 324#if TRANSPARENT
292 rootwin_ev.stop (display); 325 rootwin_ev.stop (display);
293#endif 326#endif
294 incr_ev.stop (); 327 incr_ev.stop ();
… …
318} 351}
319 352
320void 353void
321rxvt_term::destroy_cb (time_watcher &w) 354rxvt_term::destroy_cb (time_watcher &w)
322{ 355{
323 SET_R (this); 356 make_current ();
324 357
325 delete this; 358 delete this;
326}
327
328/*----------------------------------------------------------------------*/
329/* rxvt_init () */
330bool
331rxvt_term::init (int argc, const char *const *argv)
332{
333 SET_R (this);
334
335 if (!init_vars ())
336 return false;
337
338 init_secondary ();
339
340 const char **cmd_argv = init_resources (argc, argv);
341
342 set_locale ("");
343
344#if MENUBAR_MAX
345 menubar_read (rs[Rs_menu]);
346#endif
347#ifdef HAVE_SCROLLBARS
348 if (options & Opt_scrollBar)
349 scrollBar.setIdle (); /* set existence for size calculations */
350#endif
351
352 create_windows (argc, argv);
353
354 init_xlocale ();
355
356 scr_reset (); /* initialize screen */
357
358#if 0
359 XSynchronize (display->display, True);
360#endif
361
362#ifdef HAVE_SCROLLBARS
363 if (options & Opt_scrollBar)
364 resize_scrollbar (); /* create and map scrollbar */
365#endif
366#if (MENUBAR_MAX)
367 if (menubar_visible ())
368 XMapWindow (display->display, menuBar.win);
369#endif
370#ifdef TRANSPARENT
371 if (options & Opt_transparent)
372 {
373 XSelectInput (display->display, display->root, PropertyChangeMask);
374 check_our_parents ();
375 rootwin_ev.start (display, display->root);
376 }
377#endif
378
379 XMapWindow (display->display, TermWin.vt);
380 XMapWindow (display->display, TermWin.parent[0]);
381
382 set_colorfgbg ();
383
384 init_command (cmd_argv);
385
386 pty_ev.start (pty.pty, EVENT_READ);
387
388 check_ev.start ();
389
390 return true;
391}
392
393static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
394
395void
396rxvt_init ()
397{
398 /*
399 * Save and then give up any super-user privileges
400 * If we need privileges in any area then we must specifically request it.
401 * We should only need to be root in these cases:
402 * 1. write utmp entries on some systems
403 * 2. chown tty on some systems
404 */
405 rxvt_privileges (SAVE);
406 rxvt_privileges (IGNORE);
407
408 signal (SIGHUP, SIG_IGN);
409 signal (SIGPIPE, SIG_IGN);
410
411 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
412 /* signal (SIGURG, SIG_DFL); */
413
414 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
415 // TODO: handle this with exceptions and tolerate the memory loss
416 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
417}
418
419/* ------------------------------------------------------------------------- *
420 * SIGNAL HANDLING & EXIT HANDLER *
421 * ------------------------------------------------------------------------- */
422/*
423 * Catch a SIGCHLD signal and exit if the direct child has died
424 */
425
426void
427rxvt_term::sig_chld (sig_watcher &w)
428{
429 // we are being called for every SIGCHLD, not just ours
430 int pid;
431
432 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
433 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
434 if (pid == (*t)->cmd_pid)
435 {
436 (*t)->destroy ();
437 break;
438 }
439} 359}
440 360
441/*----------------------------------------------------------------------*/ 361/*----------------------------------------------------------------------*/
442/* 362/*
443 * Exit gracefully, clearing the utmp entry and restoring tty attributes 363 * Exit gracefully, clearing the utmp entry and restoring tty attributes
444 * TODO: if debugging, this should free up any known resources if we can 364 * TODO: if debugging, this should free up any known resources if we can
445 */ 365 */
446void 366static XErrorHandler old_xerror_handler;
447rxvt_destroy_all () 367
368static void
369rxvt_emergency_cleanup ()
448{ 370{
449 // TODO: rxvtd should clean up all ressources
450 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 371 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
451 (*t)->destroy (); 372 (*t)->emergency_cleanup ();
452} 373}
453 374
454/* 375#if ENABLE_FRILLS
455 * Catch a fatal signal and tidy up before quitting 376static void
456 */ 377print_x_error (Display *dpy, XErrorEvent *event)
457void
458rxvt_term::sig_term (sig_watcher &w)
459{ 378{
460#ifdef DEBUG_CMD 379 char buffer[BUFSIZ];
461 rxvt_warn ("caught signal %d, exiting.\n", w.signum); 380 char mesg[BUFSIZ];
462#endif 381 char number[32];
463 rxvt_destroy_all (); 382 char *mtype = "XlibMessage";
464 signal (w.signum, SIG_DFL); 383 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
465 kill (getpid (), w.signum); 384 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
385 rxvt_warn ("An X Error occured, trying to continue after report.\n");
386 rxvt_warn ("%s: %s\n", mesg, buffer);
387 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
388 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
389 sprintf(number, "%d", event->request_code);
390 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
391 rxvt_warn ("(which is %s)\n", buffer);
392 if (event->request_code >= 128) {
393 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
394 mesg, BUFSIZ);
395 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
396 }
397 if ((event->error_code == BadWindow) ||
398 (event->error_code == BadPixmap) ||
399 (event->error_code == BadCursor) ||
400 (event->error_code == BadFont) ||
401 (event->error_code == BadDrawable) ||
402 (event->error_code == BadColor) ||
403 (event->error_code == BadGC) ||
404 (event->error_code == BadIDChoice) ||
405 (event->error_code == BadValue) ||
406 (event->error_code == BadAtom)) {
407 if (event->error_code == BadValue)
408 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
409 mesg, BUFSIZ);
410 else if (event->error_code == BadAtom)
411 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
412 mesg, BUFSIZ);
413 else
414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
415 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
417 }
418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
419 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
466} 421}
422#endif
467 423
468/* INTPROTO */
469int 424int
470rxvt_xerror_handler (Display *display, XErrorEvent *event) 425rxvt_xerror_handler (Display *display, XErrorEvent *event)
471{ 426{
472 if (GET_R->allowedxerror == -1) 427 if (GET_R->allowedxerror == -1)
473 GET_R->allowedxerror = event->error_code; 428 GET_R->allowedxerror = event->error_code;
474 else 429 else
475 { 430 {
431 // GET_R is most likely not the terminal which caused the error,
432 // so just output the error and continue
433#if ENABLE_FRILLS
434 print_x_error (display, event);
435#else
476 old_xerror_handler (display, event); 436 old_xerror_handler (display, event);
477 GET_R->destroy (); 437#endif
478 } 438 }
479 439
480 return 0; 440 return 0;
441}
442
443int
444rxvt_xioerror_handler (Display *display)
445{
446 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
447 DisplayString (display));
448 rxvt_emergency_cleanup ();
449 _exit (EXIT_FAILURE);
450}
451
452/*----------------------------------------------------------------------*/
453bool
454rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
455{
456 this->envv = envv;
457
458 SET_R (this);
459 set_locale ("");
460 set_environ (envv); // few things in X do not call setlocale :(
461
462 if (!init_vars ())
463 return false;
464
465 init_secondary ();
466
467 const char **cmd_argv = init_resources (argc, argv);
468
469#ifdef KEYSYM_RESOURCE
470 keyboard->register_done ();
471#endif
472
473#ifdef HAVE_SCROLLBARS
474 if (OPTION (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */
476#endif
477
478 pty = ptytty::create ();
479
480 create_windows (argc, argv);
481
482 dDisp;
483
484 init_xlocale ();
485
486 scr_reset (); // initialize screen
487
488#if 0
489 XSynchronize (disp, True);
490#endif
491
492#ifdef HAVE_SCROLLBARS
493 if (OPTION (Opt_scrollBar))
494 resize_scrollbar (); /* create and map scrollbar */
495#endif
496#ifdef TRANSPARENT
497 if (OPTION (Opt_transparent))
498 {
499 XSelectInput (disp, display->root, PropertyChangeMask);
500 check_our_parents ();
501 rootwin_ev.start (display, display->root);
502 }
503#endif
504
505 set_colorfgbg ();
506
507 init_command (cmd_argv);
508
509 free (cmd_argv);
510
511 if (pty->pty >= 0)
512 pty_ev.start (pty->pty, EVENT_READ);
513
514 check_ev.start ();
515
516 HOOK_INVOKE ((this, HOOK_START, DT_END));
517
518 XMapWindow (disp, vt);
519 XMapWindow (disp, parent[0]);
520
521 return true;
522}
523
524static struct sig_handlers
525{
526 sig_watcher sw_term, sw_int;
527
528 /*
529 * Catch a fatal signal and tidy up before quitting
530 */
531 void
532 sig_term (sig_watcher &w)
533 {
534 rxvt_emergency_cleanup ();
535 signal (w.signum, SIG_DFL);
536 kill (getpid (), w.signum);
537 }
538
539 sig_handlers ()
540 : sw_term (this, &sig_handlers::sig_term),
541 sw_int (this, &sig_handlers::sig_term)
542 {
543 }
544} sig_handlers;
545
546char **rxvt_environ; // startup environment
547
548void
549rxvt_init ()
550{
551 ptytty::init ();
552
553 rxvt_environ = environ;
554
555 signal (SIGHUP, SIG_IGN);
556 signal (SIGPIPE, SIG_IGN);
557
558 sig_handlers.sw_term.start (SIGTERM);
559 sig_handlers.sw_int.start (SIGINT);
560
561 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
562 /* signal (SIGURG, SIG_DFL); */
563
564 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
565 // TODO: handle this with exceptions and tolerate the memory loss
566 XSetIOErrorHandler (rxvt_xioerror_handler);
567
568 XrmInitialize ();
481} 569}
482 570
483/* ------------------------------------------------------------------------- * 571/* ------------------------------------------------------------------------- *
484 * MEMORY ALLOCATION WRAPPERS * 572 * MEMORY ALLOCATION WRAPPERS *
485 * ------------------------------------------------------------------------- */ 573 * ------------------------------------------------------------------------- */
… …
492 rxvt_fatal ("memory allocation failure. aborting.\n"); 580 rxvt_fatal ("memory allocation failure. aborting.\n");
493 581
494 return p; 582 return p;
495} 583}
496 584
497/* INTPROTO */ 585void *
498void *
499rxvt_calloc (size_t number, size_t size) 586rxvt_calloc (size_t number, size_t size)
500{ 587{
501 void *p = calloc (number, size); 588 void *p = calloc (number, size);
502 589
503 if (!p) 590 if (!p)
504 rxvt_fatal ("memory allocation failure. aborting.\n"); 591 rxvt_fatal ("memory allocation failure. aborting.\n");
505 592
506 return p; 593 return p;
507} 594}
508 595
509/* INTPROTO */ 596void *
510void *
511rxvt_realloc (void *ptr, size_t size) 597rxvt_realloc (void *ptr, size_t size)
512{ 598{
513 void *p = realloc (ptr, size); 599 void *p = realloc (ptr, size);
514 600
515 if (!p) 601 if (!p)
516 rxvt_fatal ("memory allocation failure. aborting.\n"); 602 rxvt_fatal ("memory allocation failure. aborting.\n");
517 603
518 return p; 604 return p;
519} 605}
520
521/* ------------------------------------------------------------------------- *
522 * PRIVILEGED OPERATIONS *
523 * ------------------------------------------------------------------------- */
524/* take care of suid/sgid super-user (root) privileges */
525void
526rxvt_privileges (rxvt_privaction action)
527{
528#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
529 static uid_t euid;
530 static gid_t egid;
531#endif
532
533#if ! defined(__CYGWIN32__)
534# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
535 /* setreuid () is the poor man's setuid (), seteuid () */
536# define seteuid(a) setreuid(-1, (a))
537# define setegid(a) setregid(-1, (a))
538# define HAVE_SETEUID
539# endif
540# ifdef HAVE_SETEUID
541 switch (action)
542 {
543 case IGNORE:
544 /*
545 * change effective uid/gid - not real uid/gid - so we can switch
546 * back to root later, as required
547 */
548 seteuid (getuid ());
549 setegid (getgid ());
550 break;
551 case SAVE:
552 euid = geteuid ();
553 egid = getegid ();
554 break;
555 case RESTORE:
556 seteuid (euid);
557 setegid (egid);
558 break;
559 }
560# else
561 switch (action)
562 {
563 case IGNORE:
564 setuid (getuid ());
565 setgid (getgid ());
566 /* FALLTHROUGH */
567 case SAVE:
568 /* FALLTHROUGH */
569 case RESTORE:
570 break;
571 }
572# endif
573#endif
574}
575
576#ifdef UTMP_SUPPORT
577void
578rxvt_term::privileged_utmp (rxvt_privaction action)
579{
580 if ((options & Opt_utmpInhibit)
581 || !pty.name || !*pty.name)
582 return;
583
584 rxvt_privileges (RESTORE);
585
586 if (action == SAVE)
587 makeutent (pty.name, rs[Rs_display_name]);
588 else
589 cleanutent ();
590
591 rxvt_privileges (IGNORE);
592}
593#endif
594 606
595/*----------------------------------------------------------------------*/ 607/*----------------------------------------------------------------------*/
596/* 608/*
597 * window size/position calculcations for XSizeHint and other storage. 609 * window size/position calculcations for XSizeHint and other storage.
598 * if width/height are non-zero then override calculated width/height 610 * if width/height are non-zero then override calculated width/height
599 */ 611 */
600void 612void
601rxvt_term::window_calc (unsigned int width, unsigned int height) 613rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
602{ 614{
603 short recalc_x, recalc_y; 615 short recalc_x, recalc_y;
604 int x, y, sb_w, mb_h, flags; 616 int x, y, sb_w, flags;
605 unsigned int w, h; 617 unsigned int w, h;
606 unsigned int max_width, max_height; 618 unsigned int max_width, max_height;
619 dDisp;
607 620
608 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
609 TermWin.ncol, TermWin.nrow, szHint.width,
610 szHint.height));
611 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 621 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
612 szHint.win_gravity = NorthWestGravity; 622 szHint.win_gravity = NorthWestGravity;
613 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 623 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
614 624
615 recalc_x = recalc_y = 0; 625 recalc_x = recalc_y = 0;
616 flags = 0; 626 flags = 0;
627
617 if (!parsed_geometry) 628 if (!parsed_geometry)
618 { 629 {
619 parsed_geometry = 1; 630 parsed_geometry = 1;
631
620 if (rs[Rs_geometry]) 632 if (rs[Rs_geometry])
621 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 633 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
634
622 if (flags & WidthValue) 635 if (flags & WidthValue)
623 { 636 {
624 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 637 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
625 szHint.flags |= USSize; 638 szHint.flags |= USSize;
626 } 639 }
640
627 if (flags & HeightValue) 641 if (flags & HeightValue)
628 { 642 {
629 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 643 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
630 szHint.flags |= USSize; 644 szHint.flags |= USSize;
631 } 645 }
646
632 if (flags & XValue) 647 if (flags & XValue)
633 { 648 {
634 szHint.x = x; 649 szHint.x = x;
635 szHint.flags |= USPosition; 650 szHint.flags |= USPosition;
651
636 if (flags & XNegative) 652 if (flags & XNegative)
637 { 653 {
638 recalc_x = 1; 654 recalc_x = 1;
639 szHint.win_gravity = NorthEastGravity; 655 szHint.win_gravity = NorthEastGravity;
640 } 656 }
641 } 657 }
658
642 if (flags & YValue) 659 if (flags & YValue)
643 { 660 {
644 szHint.y = y; 661 szHint.y = y;
645 szHint.flags |= USPosition; 662 szHint.flags |= USPosition;
663
646 if (flags & YNegative) 664 if (flags & YNegative)
647 { 665 {
648 recalc_y = 1; 666 recalc_y = 1;
667
649 if (szHint.win_gravity == NorthEastGravity) 668 if (szHint.win_gravity == NorthEastGravity)
650 szHint.win_gravity = SouthEastGravity; 669 szHint.win_gravity = SouthEastGravity;
651 else 670 else
652 szHint.win_gravity = SouthWestGravity; 671 szHint.win_gravity = SouthWestGravity;
653 } 672 }
654 } 673 }
655 } 674 }
656 675
657 /* TODO: BOUNDS */ 676 /* TODO: BOUNDS */
658 TermWin.width = TermWin.ncol * TermWin.fwidth; 677 width = ncol * fwidth;
659 TermWin.height = TermWin.nrow * TermWin.fheight; 678 height = nrow * fheight;
660 max_width = MAX_COLS * TermWin.fwidth; 679 max_width = MAX_COLS * fwidth;
661 max_height = MAX_ROWS * TermWin.fheight; 680 max_height = MAX_ROWS * fheight;
662 681
663 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 682 szHint.base_width = szHint.base_height = 2 * int_bwidth;
664 683
665 sb_w = mb_h = 0; 684 sb_w = 0;
666 window_vt_x = window_vt_y = TermWin.int_bwidth; 685 window_vt_x = window_vt_y = int_bwidth;
667 686
668 if (scrollbar_visible ()) 687 if (scrollBar.state)
669 { 688 {
670 sb_w = scrollbar_TotalWidth (); 689 sb_w = scrollbar_TotalWidth ();
671 szHint.base_width += sb_w; 690 szHint.base_width += sb_w;
672 if (!(options & Opt_scrollBar_right)) 691 if (!OPTION (Opt_scrollBar_right))
673 window_vt_x += sb_w; 692 window_vt_x += sb_w;
674 } 693 }
675 694
676 if (menubar_visible ())
677 {
678 mb_h = menuBar_TotalHeight ();
679 szHint.base_height += mb_h;
680 window_vt_y += mb_h;
681 }
682
683 szHint.width_inc = TermWin.fwidth; 695 szHint.width_inc = fwidth;
684 szHint.height_inc = TermWin.fheight; 696 szHint.height_inc = fheight;
685 szHint.min_width = szHint.base_width + szHint.width_inc; 697 szHint.min_width = szHint.base_width + szHint.width_inc;
686 szHint.min_height = szHint.base_height + szHint.height_inc; 698 szHint.min_height = szHint.base_height + szHint.height_inc;
687 699
688 if (width && width - szHint.base_width < max_width) 700 if (newwidth && newwidth - szHint.base_width < max_width)
689 { 701 {
690 szHint.width = width; 702 szHint.width = newwidth;
691 TermWin.width = width - szHint.base_width; 703 width = newwidth - szHint.base_width;
692 } 704 }
693 else 705 else
694 { 706 {
695 MIN_IT (TermWin.width, max_width); 707 min_it (width, max_width);
696 szHint.width = szHint.base_width + TermWin.width; 708 szHint.width = szHint.base_width + width;
697 } 709 }
698 710
699 if (height && height - szHint.base_height < max_height) 711 if (newheight && newheight - szHint.base_height < max_height)
700 { 712 {
701 szHint.height = height; 713 szHint.height = newheight;
702 TermWin.height = height - szHint.base_height; 714 height = newheight - szHint.base_height;
703 } 715 }
704 else 716 else
705 { 717 {
706 MIN_IT (TermWin.height, max_height); 718 min_it (height, max_height);
707 szHint.height = szHint.base_height + TermWin.height; 719 szHint.height = szHint.base_height + height;
708 } 720 }
709 721
710 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 722 if (scrollBar.state && OPTION (Opt_scrollBar_right))
711 window_sb_x = szHint.width - sb_w; 723 window_sb_x = szHint.width - sb_w;
712 724
713 if (recalc_x) 725 if (recalc_x)
714 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 726 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
715 - szHint.width - 2 * TermWin.ext_bwidth);
716 if (recalc_y) 727 if (recalc_y)
717 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 728 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
718 - szHint.height - 2 * TermWin.ext_bwidth);
719 729
720 TermWin.ncol = TermWin.width / TermWin.fwidth; 730 ncol = width / fwidth;
721 TermWin.nrow = TermWin.height / TermWin.fheight; 731 nrow = height / fheight;
722 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
723 TermWin.ncol, TermWin.nrow, szHint.width,
724 szHint.height));
725 return;
726} 732}
727 733
728/*----------------------------------------------------------------------*/ 734/*----------------------------------------------------------------------*/
729/* 735/*
730 * Tell the teletype handler what size the window is. 736 * Tell the teletype handler what size the window is.
731 * Called after a window size change. 737 * Called after a window size change.
732 */ 738 */
733void 739void
734rxvt_term::tt_winch () 740rxvt_term::tt_winch ()
735{ 741{
736 if (pty.pty < 0) 742 if (pty->pty < 0)
737 return; 743 return;
738 744
739 struct winsize ws; 745 struct winsize ws;
740 746
741 ws.ws_col = TermWin.ncol; 747 ws.ws_col = ncol;
742 ws.ws_row = TermWin.nrow; 748 ws.ws_row = nrow;
743 ws.ws_xpixel = TermWin.width; 749 ws.ws_xpixel = width;
744 ws.ws_ypixel = TermWin.height; 750 ws.ws_ypixel = height;
745 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 751 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
746 752
747#if 0 753#if 0
748 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 754 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
749 if (cmd_pid) /* force through to the command */ 755 if (cmd_pid) /* force through to the command */
750 kill (cmd_pid, SIGWINCH); 756 kill (-cmd_pid, SIGWINCH);
751#endif 757#endif
752} 758}
753 759
754/*----------------------------------------------------------------------*/ 760/*----------------------------------------------------------------------*/
755/* set_fonts () - load and set the various fonts 761/* set_fonts () - load and set the various fonts
756/* 762 *
757 * init = 1 - initialize 763 * init = 1 - initialize
758 * 764 *
759 * fontname == FONT_UP - switch to bigger font 765 * fontname == FONT_UP - switch to bigger font
760 * fontname == FONT_DN - switch to smaller font 766 * fontname == FONT_DN - switch to smaller font
761 */ 767 */
… …
773 return false; 779 return false;
774 } 780 }
775 781
776#if ENABLE_STYLES 782#if ENABLE_STYLES
777 for (int i = RS_styleCount; --i; ) 783 for (int i = RS_styleCount; --i; )
778 if (TermWin.fontset[i] != TermWin.fontset[0]) 784 if (fontset[i] != fontset[0])
779 delete TermWin.fontset[i]; 785 delete fontset[i];
780#endif 786#endif
781 787
782 delete TermWin.fontset[0]; 788 delete fontset[0];
783 TermWin.fontset[0] = fs; 789 fontset[0] = fs;
784 790
785 prop = (*fs)[1]->properties (); 791 prop = (*fs)[1]->properties ();
792 prop.height += lineSpace;
786 fs->set_prop (prop); 793 fs->set_prop (prop);
787 794
788 TermWin.fwidth = prop.width; 795 fwidth = prop.width;
789 TermWin.fheight = prop.height; 796 fheight = prop.height;
790 TermWin.fweight = prop.weight; 797 fbase = prop.ascent;
791 TermWin.fslant = prop.slant;
792 TermWin.fbase = (*fs)[1]->ascent;
793 798
794 for (int style = 1; style < 4; style++) 799 for (int style = 1; style < 4; style++)
795 { 800 {
796#if ENABLE_STYLES 801#if ENABLE_STYLES
797 const char *res = rs[Rs_font + style]; 802 const char *res = rs[Rs_font + style];
798 803
799 if (res && !*res) 804 if (res && !*res)
800 TermWin.fontset[style] = TermWin.fontset[0]; 805 fontset[style] = fontset[0];
801 else 806 else
802 { 807 {
803 TermWin.fontset[style] = fs = new rxvt_fontset (this); 808 fontset[style] = fs = new rxvt_fontset (this);
804 rxvt_fontprop prop2 = prop; 809 rxvt_fontprop prop2 = prop;
805 810
806 if (res) 811 if (res)
807 prop2.weight = prop2.slant = rxvt_fontprop::unset; 812 prop2.weight = prop2.slant = rxvt_fontprop::unset;
808 else 813 else
809 { 814 {
810 res = TermWin.fontset[0]->fontdesc; 815 res = fontset[0]->fontdesc;
811 816
812 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 817 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
813 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 818 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
814 } 819 }
815 820
816 fs->populate (res); 821 fs->populate (res);
817 fs->set_prop (prop2); 822 fs->set_prop (prop2);
818 } 823 }
819#else 824#else
820 TermWin.fontset[style] = TermWin.fontset[0]; 825 fontset[style] = fontset[0];
821#endif 826#endif
822 } 827 }
823 828
824 if (TermWin.parent[0]) 829 if (parent[0])
825 { 830 {
826 resize_all_windows (0, 0, 0); 831 resize_all_windows (0, 0, 0);
827 scr_remap_chars (); 832 scr_remap_chars ();
828 scr_touch (true); 833 scr_touch (true);
829 } 834 }
… …
831 return true; 836 return true;
832} 837}
833 838
834void rxvt_term::set_string_property (Atom prop, const char *str, int len) 839void rxvt_term::set_string_property (Atom prop, const char *str, int len)
835{ 840{
836 // TODO: SMART_WINDOW_TITLE
837 XChangeProperty (display->display, TermWin.parent[0], 841 XChangeProperty (display->display, parent[0],
838 prop, XA_STRING, 8, PropModeReplace, 842 prop, XA_STRING, 8, PropModeReplace,
839 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 843 (const unsigned char *)str, len >= 0 ? len : strlen (str));
840} 844}
841 845
842void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 846void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
843{ 847{
844 // TODO: SMART_WINDOW_TITLE
845 wchar_t *ws = rxvt_mbstowcs (str, len); 848 wchar_t *ws = rxvt_mbstowcs (str, len);
846 char *s = rxvt_wcstoutf8 (ws); 849 char *s = rxvt_wcstoutf8 (ws);
847 850
848 XChangeProperty (display->display, TermWin.parent[0], 851 XChangeProperty (display->display, parent[0],
849 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 852 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
850 (const unsigned char *)s, strlen (s)); 853 (const unsigned char *)s, strlen (s));
851 854
852 free (s); 855 free (s);
853 free (ws); 856 free (ws);
… …
858/* xterm sequences - title, iconName, color (exptl) */ 861/* xterm sequences - title, iconName, color (exptl) */
859void 862void
860rxvt_term::set_title (const char *str) 863rxvt_term::set_title (const char *str)
861{ 864{
862 set_string_property (XA_WM_NAME, str); 865 set_string_property (XA_WM_NAME, str);
863#if ENABLE_FRILLS 866#if ENABLE_EWMH
864 set_utf8_property (display->atom ("_NET_WM_NAME"), str); 867 set_utf8_property (xa[XA_NET_WM_NAME], str);
865#endif 868#endif
866} 869}
867 870
868void 871void
869rxvt_term::set_icon_name (const char *str) 872rxvt_term::set_icon_name (const char *str)
870{ 873{
871 set_string_property (XA_WM_ICON_NAME, str); 874 set_string_property (XA_WM_ICON_NAME, str);
872#if ENABLE_FRILLS 875#if ENABLE_EWMH
873 set_utf8_property (display->atom ("_NET_WM_ICON_NAME"), str); 876 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
874#endif 877#endif
875} 878}
876 879
877#ifdef XTERM_COLOR_CHANGE 880#ifdef XTERM_COLOR_CHANGE
878void 881void
… …
886 889
887 /* handle color aliases */ 890 /* handle color aliases */
888 if (isdigit (*color)) 891 if (isdigit (*color))
889 { 892 {
890 i = atoi (color); 893 i = atoi (color);
894
891 if (i >= 8 && i <= 15) 895 if (i >= 8 && i <= 15)
892 { /* bright colors */ 896 { /* bright colors */
893 i -= 8; 897 i -= 8;
894# ifndef NO_BRIGHTCOLOR
895 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 898 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
896 SET_PIXCOLOR (idx); 899 SET_PIXCOLOR (idx);
897 goto Done; 900 goto done;
898# endif
899
900 } 901 }
902
901 if (i >= 0 && i <= 7) 903 if (i >= 0 && i <= 7)
902 { /* normal colors */ 904 { /* normal colors */
903 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 905 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
904 SET_PIXCOLOR (idx); 906 SET_PIXCOLOR (idx);
905 goto Done; 907 goto done;
906 } 908 }
907 } 909 }
908 910
909 if (!rXParseAllocColor (& xcol, color)) 911 if (!rXParseAllocColor (&xcol, color))
910 return; 912 return;
911 913
912 /* XStoreColor (display->display, display->cmap, XColor*); */ 914 /* XStoreColor (display->display, display->cmap, XColor*); */
913 915
914 /* 916 /*
… …
930 pix_colors_focused[idx] = xcol; 932 pix_colors_focused[idx] = xcol;
931 SET_PIXCOLOR (idx); 933 SET_PIXCOLOR (idx);
932 934
933 /* XSetWindowAttributes attr; */ 935 /* XSetWindowAttributes attr; */
934 /* Cursor cursor; */ 936 /* Cursor cursor; */
935Done: 937done:
938
936#ifdef OFF_FOCUS_FADING 939#if OFF_FOCUS_FADING
937 if (rs[Rs_fade]) 940 if (rs[Rs_fade])
938 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 941 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
939#endif 942#endif
940 943
941 /*TODO: handle Color_BD, scrollbar background, etc. */ 944 /*TODO: handle Color_BD, scrollbar background, etc. */
942 945
943 recolour_cursor (); 946 recolour_cursor ();
… …
997 1000
998 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1001 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
999} 1002}
1000 1003
1001/*----------------------------------------------------------------------*/ 1004/*----------------------------------------------------------------------*/
1002/*
1003 * Colour determination for low colour displays, routine from
1004 * Hans de Goede <hans@highrise.nl>
1005 */
1006 1005
1007int 1006int
1008rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1007rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1009{ 1008{
1010 if (!screen_in_out->set (display, colour)) 1009 if (!screen_in_out->set (display, colour))
… …
1018 1017
1019/* -------------------------------------------------------------------- * 1018/* -------------------------------------------------------------------- *
1020 * - WINDOW RESIZING - * 1019 * - WINDOW RESIZING - *
1021 * -------------------------------------------------------------------- */ 1020 * -------------------------------------------------------------------- */
1022void 1021void
1023rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1022rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1024{ 1023{
1025 int fix_screen; 1024 int fix_screen;
1025 int old_width = szHint.width;
1026 int old_height = szHint.height;
1027 dDisp;
1026 1028
1027#ifdef SMART_RESIZE
1028 int old_width = szHint.width, old_height = szHint.height;
1029#endif
1030
1031 window_calc (width, height); 1029 window_calc (newwidth, newheight);
1032 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1030 XSetWMNormalHints (disp, parent[0], &szHint);
1033 1031
1034 if (!ignoreparent) 1032 if (!ignoreparent)
1035 { 1033 {
1036#ifdef SMART_RESIZE 1034#ifdef SMART_RESIZE
1037 /* 1035 /*
… …
1041 int x, y, x1, y1; 1039 int x, y, x1, y1;
1042 int dx, dy; 1040 int dx, dy;
1043 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1041 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1044 Window unused_cr; 1042 Window unused_cr;
1045 1043
1046 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1044 XTranslateCoordinates (disp, parent[0], display->root,
1047 0, 0, &x, &y, &unused_cr); 1045 0, 0, &x, &y, &unused_cr);
1048 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1046 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1049 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1047 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1050 /* 1048 /*
1051 * if display->root isn't the parent window, a WM will probably have offset 1049 * if display->root isn't the parent window, a WM will probably have offset
1052 * our position for handles and decorations. Counter it 1050 * our position for handles and decorations. Counter it
1053 */ 1051 */
… …
1055 { 1053 {
1056 x -= x1; 1054 x -= x1;
1057 y -= y1; 1055 y -= y1;
1058 } 1056 }
1059 1057
1060 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1058 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1061 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1059 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1062 dx = old_width - szHint.width; 1060 dx = old_width - szHint.width;
1063 dy = old_height - szHint.height; 1061 dy = old_height - szHint.height;
1064 1062
1065 /* Check position of the center of the window */ 1063 /* Check position of the center of the window */
1066 if (x < x1) /* left half */ 1064 if (x < x1) /* left half */
1067 dx = 0; 1065 dx = 0;
… …
1070 if (y < y1) /* top half */ 1068 if (y < y1) /* top half */
1071 dy = 0; 1069 dy = 0;
1072 else if (y == y1) /* exact center */ 1070 else if (y == y1) /* exact center */
1073 dy /= 2; 1071 dy /= 2;
1074 1072
1075 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1073 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1076 szHint.width, szHint.height); 1074 szHint.width, szHint.height);
1077#else 1075#else
1078 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1076 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1079#endif 1077#endif
1080 } 1078 }
1081 1079
1082 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1080 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1083 1081
1084 if (fix_screen || width != old_width || height != old_height) 1082 if (fix_screen || newwidth != old_width || newheight != old_height)
1085 { 1083 {
1086 if (scrollbar_visible ()) 1084 if (scrollBar.state)
1087 { 1085 {
1088 XMoveResizeWindow (display->display, scrollBar.win, 1086 XMoveResizeWindow (disp, scrollBar.win,
1089 window_sb_x, 0, 1087 window_sb_x, 0,
1090 scrollbar_TotalWidth (), szHint.height); 1088 scrollbar_TotalWidth (), szHint.height);
1091 resize_scrollbar (); 1089 resize_scrollbar ();
1092 } 1090 }
1093 1091
1094 if (menubar_visible ())
1095 XMoveResizeWindow (display->display, menuBar.win,
1096 window_vt_x, 0,
1097 TermWin_TotalWidth (), menuBar_TotalHeight ());
1098
1099 XMoveResizeWindow (display->display, TermWin.vt, 1092 XMoveResizeWindow (disp, vt,
1100 window_vt_x, window_vt_y, 1093 window_vt_x, window_vt_y,
1101 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1094 width, height);
1095
1102 scr_clear (); 1096 scr_clear ();
1103#ifdef XPM_BACKGROUND 1097#ifdef XPM_BACKGROUND
1104 resize_pixmap (); 1098 resize_pixmap ();
1105#endif 1099#endif
1106 } 1100 }
1107 1101
1108 if (fix_screen || old_height == 0) 1102 if (fix_screen || old_height == 0)
1109 {
1110 int curr_screen = -1;
1111 int old_ncol = prev_ncol;
1112
1113 /* scr_reset only works on the primary screen */
1114 if (old_height) /* this is not the first time through */
1115 {
1116 unsigned int ncol = TermWin.ncol;
1117 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1118 curr_screen = scr_change_screen (PRIMARY);
1119 TermWin.ncol = ncol;
1120 }
1121
1122 scr_reset (); 1103 scr_reset ();
1123 1104
1124 if (curr_screen >= 0) /* this is not the first time through */ 1105#ifdef XPM_BACKGROUND
1125 { 1106 if (pixmap)
1126 scr_change_screen (curr_screen); 1107 scr_touch (false);
1127 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1108#endif
1128 }
1129 }
1130
1131 old_width = szHint.width;
1132 old_height = szHint.height;
1133 1109
1134#ifdef USE_XIM 1110#ifdef USE_XIM
1135 IMSetStatusPosition (); 1111 IMSetStatusPosition ();
1136#endif 1112#endif
1137} 1113}
… …
1139/* 1115/*
1140 * Set the width/height of the vt window in characters. Units are pixels. 1116 * Set the width/height of the vt window in characters. Units are pixels.
1141 * good for toggling 80/132 columns 1117 * good for toggling 80/132 columns
1142 */ 1118 */
1143void 1119void
1144rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1120rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1145{ 1121{
1146 XWindowAttributes wattr; 1122 XWindowAttributes wattr;
1147 1123
1148 if (width == 0 || height == 0) 1124 if (newwidth == 0 || newheight == 0)
1149 { 1125 {
1150 XGetWindowAttributes (display->display, display->root, &wattr); 1126 XGetWindowAttributes (display->display, display->root, &wattr);
1127
1151 if (width == 0) 1128 if (newwidth == 0)
1152 width = wattr.width - szHint.base_width; 1129 newwidth = wattr.width - szHint.base_width;
1153 if (height == 0) 1130 if (newheight == 0)
1154 height = wattr.height - szHint.base_height; 1131 newheight = wattr.height - szHint.base_height;
1155 }
1156
1157 if (width != TermWin.width || height != TermWin.height)
1158 { 1132 }
1133
1134 if (newwidth != width || newheight != height)
1135 {
1159 width += szHint.base_width; 1136 newwidth += szHint.base_width;
1160 height += szHint.base_height; 1137 newheight += szHint.base_height;
1161 resize_all_windows (width, height, 0); 1138 resize_all_windows (newwidth, newheight, 0);
1162 } 1139 }
1163} 1140}
1164 1141
1165/* -------------------------------------------------------------------- * 1142/* -------------------------------------------------------------------- *
1166 * - X INPUT METHOD ROUTINES - * 1143 * - X INPUT METHOD ROUTINES - *
… …
1176 1153
1177void 1154void
1178rxvt_term::im_set_size (XRectangle &size) 1155rxvt_term::im_set_size (XRectangle &size)
1179{ 1156{
1180 // the int_bwidth terms make no sense to me 1157 // the int_bwidth terms make no sense to me
1181 size.x = TermWin.int_bwidth; 1158 size.x = int_bwidth;
1182 size.y = TermWin.int_bwidth; 1159 size.y = int_bwidth;
1183 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1160 size.width = Width2Pixel (ncol) + int_bwidth;
1184 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1161 size.height = Height2Pixel (nrow) + int_bwidth;
1185} 1162}
1186 1163
1187void 1164void
1188rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1165rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1189 XRectangle &status_rect, 1166 XRectangle &status_rect,
1190 const XRectangle &needed_rect) 1167 const XRectangle &needed_rect)
1191{ 1168{
1192 preedit_rect.x = needed_rect.width; 1169 preedit_rect.x = needed_rect.width;
1193 preedit_rect.y = 0; 1170 preedit_rect.y = 0;
1194 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1171 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1195 preedit_rect.height = TermWin.fheight; 1172 preedit_rect.height = fheight;
1196 1173
1197 status_rect.x = 0; 1174 status_rect.x = 0;
1198 status_rect.y = 0; 1175 status_rect.y = 0;
1199 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1176 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1200 status_rect.height = TermWin.fheight; 1177 status_rect.height = fheight;
1201} 1178}
1202 1179
1203/* Checking whether input method is running. */ 1180/* Checking whether input method is running. */
1204bool 1181bool
1205rxvt_term::IMisRunning () 1182rxvt_term::IMisRunning ()
… …
1233{ 1210{
1234 XPoint nspot; 1211 XPoint nspot;
1235 XVaNestedList preedit_attr; 1212 XVaNestedList preedit_attr;
1236 1213
1237 if (!Input_Context 1214 if (!Input_Context
1238 || !TermWin.focus 1215 || !focus
1239 || !(input_style & XIMPreeditPosition)) 1216 || !(input_style & XIMPreeditPosition))
1240 return; 1217 return;
1241 1218
1242 im_set_position (nspot); 1219 im_set_position (nspot);
1243 1220
… …
1263 input_method = 0; 1240 input_method = 0;
1264 } 1241 }
1265 1242
1266 Input_Context = 0; 1243 Input_Context = 0;
1267} 1244}
1245
1246#ifdef ENABLE_XIM_ONTHESPOT
1247
1248static void
1249xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1250{
1251 ((rxvt_term *)client_data)->make_current ();
1252 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1253}
1254
1255static void
1256xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1257{
1258 ((rxvt_term *)client_data)->make_current ();
1259 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1260}
1261
1262static void
1263xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1264{
1265 rxvt_term *term = (rxvt_term *)client_data;
1266 XIMText *text = call_data->text;
1267
1268 term->make_current ();
1269
1270 if (text)
1271 {
1272 void *str;
1273
1274 if (!text->encoding_is_wchar && text->string.multi_byte)
1275 {
1276 // of course, X makes it ugly again
1277 if (term->rs[Rs_imLocale])
1278 SET_LOCALE (term->rs[Rs_imLocale]);
1279
1280 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1281 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1282
1283 if (term->rs[Rs_imLocale])
1284 SET_LOCALE (term->locale);
1285 }
1286 else
1287 str = (void *)text->string.wide_char;
1288
1289 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1290 DT_INT, call_data->caret,
1291 DT_INT, call_data->chg_first,
1292 DT_INT, call_data->chg_length,
1293 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1294 DT_WCS_LEN, str, str ? (int)text->length : 0,
1295 DT_END));
1296 }
1297 else
1298 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1299 DT_INT, call_data->caret,
1300 DT_INT, call_data->chg_first,
1301 DT_INT, call_data->chg_length,
1302 DT_END));
1303}
1304
1305#if 0
1306static void
1307xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1308{
1309 ((rxvt_term *)client_data)->make_current ();
1310 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1311 DT_INT, call_data->position,
1312 DT_INT, call_data->direction,
1313 DT_INT, call_data->style,
1314 DT_END));
1315}
1316#endif
1317
1318#endif
1268 1319
1269/* 1320/*
1270 * Try to open a XIM with the current modifiers, then see if we can 1321 * Try to open a XIM with the current modifiers, then see if we can
1271 * open a suitable preedit type 1322 * open a suitable preedit type
1272 */ 1323 */
… …
1279 XRectangle rect, status_rect, needed_rect; 1330 XRectangle rect, status_rect, needed_rect;
1280 unsigned long fg, bg; 1331 unsigned long fg, bg;
1281 const char *p; 1332 const char *p;
1282 char **s; 1333 char **s;
1283 XIMStyles *xim_styles; 1334 XIMStyles *xim_styles;
1335#ifdef ENABLE_XIM_ONTHESPOT
1336 XIMCallback xcb[4];
1337#endif
1338
1339 set_environ (envv);
1284 1340
1285 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1341 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1286 return false; 1342 return false;
1287 1343
1288 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1289 input_method = display->get_xim (locale, modifiers); 1344 input_method = display->get_xim (locale, modifiers);
1290 if (input_method == NULL) 1345 if (input_method == NULL)
1291 return false; 1346 return false;
1292 1347
1293 xim = input_method->xim; 1348 xim = input_method->xim;
… …
1313 s = rxvt_splitcommastring (p); 1368 s = rxvt_splitcommastring (p);
1314 1369
1315 for (i = found = 0; !found && s[i]; i++) 1370 for (i = found = 0; !found && s[i]; i++)
1316 { 1371 {
1317 if (!strcmp (s[i], "OverTheSpot")) 1372 if (!strcmp (s[i], "OverTheSpot"))
1318 input_style = (XIMPreeditPosition | XIMStatusNothing); 1373 input_style = XIMPreeditPosition | XIMStatusNothing;
1319 else if (!strcmp (s[i], "OffTheSpot")) 1374 else if (!strcmp (s[i], "OffTheSpot"))
1320 input_style = (XIMPreeditArea | XIMStatusArea); 1375 input_style = XIMPreeditArea | XIMStatusArea;
1321 else if (!strcmp (s[i], "Root")) 1376 else if (!strcmp (s[i], "Root"))
1322 input_style = (XIMPreeditNothing | XIMStatusNothing); 1377 input_style = XIMPreeditNothing | XIMStatusNothing;
1323 else if (!strcmp (s[i], "None")) 1378 else if (!strcmp (s[i], "None"))
1324 input_style = (XIMPreeditNone | XIMStatusNone); 1379 input_style = XIMPreeditNone | XIMStatusNone;
1380#ifdef ENABLE_XIM_ONTHESPOT
1381 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1382 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1383#endif
1384 else
1385 input_style = XIMPreeditNothing | XIMStatusNothing;
1325 1386
1326 for (j = 0; j < xim_styles->count_styles; j++) 1387 for (j = 0; j < xim_styles->count_styles; j++)
1327 if (input_style == xim_styles->supported_styles[j]) 1388 if (input_style == xim_styles->supported_styles[j])
1328 { 1389 {
1329 rxvt_freecommastring (s); 1390 rxvt_freecommastring (s);
… …
1363 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1424 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1364 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1425 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1365 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1426 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1366 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1427 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1367 "*", 1428 "*",
1368 TermWin.fheight, 1429 fheight,
1369 TermWin.fheight + 1, TermWin.fheight - 1, 1430 fheight + 1, fheight - 1,
1370 TermWin.fheight - 2, TermWin.fheight + 2); 1431 fheight - 2, fheight + 2);
1371 1432
1372 fs = XCreateFontSet (display->display, pat, 1433 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1373 &missing_charset_list, &missing_charset_count, &def_string); 1434 &missing_charset_list, &missing_charset_count, &def_string);
1374 1435
1375 if (missing_charset_list) 1436 if (missing_charset_list)
1376 XFreeStringList (missing_charset_list); 1437 XFreeStringList (missing_charset_list);
1377 1438
… …
1418 XNBackground, bg, 1479 XNBackground, bg,
1419 XNArea, &status_rect, 1480 XNArea, &status_rect,
1420 XNFontSet, fs, 1481 XNFontSet, fs,
1421 NULL); 1482 NULL);
1422 } 1483 }
1484 else if (input_style & XIMPreeditCallbacks)
1485 {
1486 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1487 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1488 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1489#if 0
1490 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1491#endif
1492
1493 preedit_attr = XVaCreateNestedList (0,
1494 XNPreeditStartCallback, &xcb[0],
1495 XNPreeditDoneCallback , &xcb[1],
1496 XNPreeditDrawCallback , &xcb[2],
1497#if 0
1498 XNPreeditCaretCallback, &xcb[3],
1499#endif
1500 NULL);
1501 }
1423 1502
1424 Input_Context = XCreateIC (xim, 1503 Input_Context = XCreateIC (xim,
1425 XNInputStyle, input_style, 1504 XNInputStyle, input_style,
1426 XNClientWindow, TermWin.vt, 1505 XNClientWindow, vt,
1427 XNFocusWindow, TermWin.parent[0], 1506 XNFocusWindow, parent[0],
1428 preedit_attr ? XNPreeditAttributes : NULL, 1507 preedit_attr ? XNPreeditAttributes : NULL,
1429 preedit_attr, 1508 preedit_attr,
1430 status_attr ? XNStatusAttributes : NULL, 1509 status_attr ? XNStatusAttributes : NULL,
1431 status_attr, NULL); 1510 status_attr, NULL);
1432 1511
… …
1439 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1518 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1440 im_destroy (); 1519 im_destroy ();
1441 return false; 1520 return false;
1442 } 1521 }
1443 1522
1523#if 0
1524 // unfortunately, only the focus window is used by XIM, hard to fix
1525 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1526 vt_select_input ();
1527#endif
1528
1444 if (input_style & XIMPreeditArea) 1529 if (input_style & XIMPreeditArea)
1445 IMSetStatusPosition (); 1530 IMSetStatusPosition ();
1446 1531
1447 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1448 return true; 1532 return true;
1449} 1533}
1450 1534
1451void 1535void
1452rxvt_term::im_cb () 1536rxvt_term::im_cb ()
1453{ 1537{
1454 int i, found, had_im; 1538 int i;
1455 const char *p; 1539 const char *p;
1456 char **s; 1540 char **s;
1457 char buf[IMBUFSIZ]; 1541 char buf[IMBUFSIZ];
1458 1542
1543 make_current ();
1544
1459 im_destroy (); 1545 im_destroy ();
1460 1546
1461 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1462 if (Input_Context) 1547 if (Input_Context)
1463 return; 1548 return;
1464 1549
1465#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1550#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1466 if (rs[Rs_imLocale]) 1551 if (rs[Rs_imLocale])
… …
1514{ 1599{
1515 XRectangle preedit_rect, status_rect, *needed_rect; 1600 XRectangle preedit_rect, status_rect, *needed_rect;
1516 XVaNestedList preedit_attr, status_attr; 1601 XVaNestedList preedit_attr, status_attr;
1517 1602
1518 if (!Input_Context 1603 if (!Input_Context
1519 || !TermWin.focus 1604 || !focus
1520 || !(input_style & XIMPreeditArea) 1605 || !(input_style & XIMPreeditArea)
1521 || !IMisRunning ()) 1606 || !IMisRunning ())
1522 return; 1607 return;
1523 1608
1524 /* Getting the necessary width of preedit area */ 1609 /* Getting the necessary width of preedit area */
… …
1539 XFree (preedit_attr); 1624 XFree (preedit_attr);
1540 XFree (status_attr); 1625 XFree (status_attr);
1541} 1626}
1542#endif /* USE_XIM */ 1627#endif /* USE_XIM */
1543 1628
1544/*----------------------------------------------------------------------*/
1545rxvt_t rxvt_current_term;
1546
1547/*----------------------- end-of-file (C source) -----------------------*/ 1629/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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