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

Diff Legend

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