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.121 by root, Wed Dec 15 00:12:58 2004 UTC vs.
Revision 1.205 by root, Wed Jan 25 13:24:45 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);
260 free (env_display); 276 free (env_display);
261 free (env_term); 277 free (env_term);
262 free (env_colorfgbg);
263 free (locale); 278 free (locale);
264 free (v_buffer); 279 free (v_buffer);
265 free (incr_buf); 280 free (incr_buf);
266 281
267 delete envv; 282 delete envv;
268 delete argv; 283 delete argv;
284
285#ifdef KEYSYM_RESOURCE
286 delete keyboard;
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 ();
269} 300}
270 301
271void 302void
272rxvt_term::destroy () 303rxvt_term::destroy ()
273{ 304{
274 if (destroy_ev.active) 305 if (destroy_ev.active)
275 return; 306 return;
276 307
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
309
277#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
278 scr_overlay_off (); 311 scr_overlay_off ();
279#endif 312#endif
280 313
281 if (display) 314 if (display)
… …
283#if USE_XIM 316#if USE_XIM
284 im_ev.stop (display); 317 im_ev.stop (display);
285#endif 318#endif
286#if HAVE_SCROLLBARS 319#if HAVE_SCROLLBARS
287 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
288#endif
289#if MENUBAR
290 menubar_ev.stop (display);
291#endif 321#endif
292#if TRANSPARENT 322#if TRANSPARENT
293 rootwin_ev.stop (display); 323 rootwin_ev.stop (display);
294#endif 324#endif
295 incr_ev.stop (); 325 incr_ev.stop ();
… …
319} 349}
320 350
321void 351void
322rxvt_term::destroy_cb (time_watcher &w) 352rxvt_term::destroy_cb (time_watcher &w)
323{ 353{
324 SET_R (this); 354 make_current ();
325 355
326 delete this; 356 delete this;
327}
328
329/*----------------------------------------------------------------------*/
330/* rxvt_init () */
331bool
332rxvt_term::init (int argc, const char *const *argv)
333{
334 SET_R (this);
335
336 if (!init_vars ())
337 return false;
338
339 init_secondary ();
340
341 const char **cmd_argv = init_resources (argc, argv);
342
343 set_locale ("");
344
345#if MENUBAR_MAX
346 menubar_read (rs[Rs_menu]);
347#endif
348#ifdef HAVE_SCROLLBARS
349 if (options & Opt_scrollBar)
350 scrollBar.setIdle (); /* set existence for size calculations */
351#endif
352
353 create_windows (argc, argv);
354
355 init_xlocale ();
356
357 scr_reset (); /* initialize screen */
358
359#if 0
360 XSynchronize (display->display, True);
361#endif
362
363#ifdef HAVE_SCROLLBARS
364 if (options & Opt_scrollBar)
365 resize_scrollbar (); /* create and map scrollbar */
366#endif
367#if (MENUBAR_MAX)
368 if (menubar_visible ())
369 XMapWindow (display->display, menuBar.win);
370#endif
371#ifdef TRANSPARENT
372 if (options & Opt_transparent)
373 {
374 XSelectInput (display->display, display->root, PropertyChangeMask);
375 check_our_parents ();
376 rootwin_ev.start (display, display->root);
377 }
378#endif
379
380 XMapWindow (display->display, TermWin.vt);
381 XMapWindow (display->display, TermWin.parent[0]);
382
383 set_colorfgbg ();
384
385 init_command (cmd_argv);
386
387 pty_ev.start (pty.pty, EVENT_READ);
388
389 check_ev.start ();
390
391 return true;
392}
393
394static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
395
396void
397rxvt_init ()
398{
399 /*
400 * Save and then give up any super-user privileges
401 * If we need privileges in any area then we must specifically request it.
402 * We should only need to be root in these cases:
403 * 1. write utmp entries on some systems
404 * 2. chown tty on some systems
405 */
406 rxvt_privileges (SAVE);
407 rxvt_privileges (IGNORE);
408
409 signal (SIGHUP, SIG_IGN);
410 signal (SIGPIPE, SIG_IGN);
411
412 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
413 /* signal (SIGURG, SIG_DFL); */
414
415 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
416 // TODO: handle this with exceptions and tolerate the memory loss
417 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
418}
419
420/* ------------------------------------------------------------------------- *
421 * SIGNAL HANDLING & EXIT HANDLER *
422 * ------------------------------------------------------------------------- */
423/*
424 * Catch a SIGCHLD signal and exit if the direct child has died
425 */
426
427void
428rxvt_term::sig_chld (sig_watcher &w)
429{
430 // we are being called for every SIGCHLD, not just ours
431 int pid;
432
433 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
434 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
435 if (pid == (*t)->cmd_pid)
436 {
437 (*t)->destroy ();
438 break;
439 }
440} 357}
441 358
442/*----------------------------------------------------------------------*/ 359/*----------------------------------------------------------------------*/
443/* 360/*
444 * Exit gracefully, clearing the utmp entry and restoring tty attributes 361 * Exit gracefully, clearing the utmp entry and restoring tty attributes
445 * 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
446 */ 363 */
447void 364static XErrorHandler old_xerror_handler;
448rxvt_destroy_all () 365
366static void
367rxvt_emergency_cleanup ()
449{ 368{
450 // TODO: rxvtd should clean up all ressources
451 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++)
452 (*t)->destroy (); 370 (*t)->emergency_cleanup ();
453} 371}
454 372
455/* 373#if ENABLE_FRILLS
456 * Catch a fatal signal and tidy up before quitting 374static void
457 */ 375print_x_error (Display *dpy, XErrorEvent *event)
458void
459rxvt_term::sig_term (sig_watcher &w)
460{ 376{
461#ifdef DEBUG_CMD 377 char buffer[BUFSIZ];
462 rxvt_warn ("caught signal %d, exiting.\n", w.signum); 378 char mesg[BUFSIZ];
463#endif 379 char number[32];
464 rxvt_destroy_all (); 380 char *mtype = "XlibMessage";
465 signal (w.signum, SIG_DFL); 381 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
466 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);
467} 419}
420#endif
468 421
469/* INTPROTO */
470int 422int
471rxvt_xerror_handler (Display *display, XErrorEvent *event) 423rxvt_xerror_handler (Display *display, XErrorEvent *event)
472{ 424{
473 if (GET_R->allowedxerror == -1) 425 if (GET_R->allowedxerror == -1)
474 GET_R->allowedxerror = event->error_code; 426 GET_R->allowedxerror = event->error_code;
475 else 427 else
476 { 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
477 old_xerror_handler (display, event); 434 old_xerror_handler (display, event);
478 GET_R->destroy (); 435#endif
479 } 436 }
480 437
481 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 ();
482} 577}
483 578
484/* ------------------------------------------------------------------------- * 579/* ------------------------------------------------------------------------- *
485 * MEMORY ALLOCATION WRAPPERS * 580 * MEMORY ALLOCATION WRAPPERS *
486 * ------------------------------------------------------------------------- */ 581 * ------------------------------------------------------------------------- */
… …
493 rxvt_fatal ("memory allocation failure. aborting.\n"); 588 rxvt_fatal ("memory allocation failure. aborting.\n");
494 589
495 return p; 590 return p;
496} 591}
497 592
498/* INTPROTO */ 593void *
499void *
500rxvt_calloc (size_t number, size_t size) 594rxvt_calloc (size_t number, size_t size)
501{ 595{
502 void *p = calloc (number, size); 596 void *p = calloc (number, size);
503 597
504 if (!p) 598 if (!p)
505 rxvt_fatal ("memory allocation failure. aborting.\n"); 599 rxvt_fatal ("memory allocation failure. aborting.\n");
506 600
507 return p; 601 return p;
508} 602}
509 603
510/* INTPROTO */ 604void *
511void *
512rxvt_realloc (void *ptr, size_t size) 605rxvt_realloc (void *ptr, size_t size)
513{ 606{
514 void *p = realloc (ptr, size); 607 void *p = realloc (ptr, size);
515 608
516 if (!p) 609 if (!p)
517 rxvt_fatal ("memory allocation failure. aborting.\n"); 610 rxvt_fatal ("memory allocation failure. aborting.\n");
518 611
519 return p; 612 return p;
520} 613}
521
522/* ------------------------------------------------------------------------- *
523 * PRIVILEGED OPERATIONS *
524 * ------------------------------------------------------------------------- */
525/* take care of suid/sgid super-user (root) privileges */
526void
527rxvt_privileges (rxvt_privaction action)
528{
529#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
530 static uid_t euid;
531 static gid_t egid;
532#endif
533
534#if ! defined(__CYGWIN32__)
535# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
536 /* setreuid () is the poor man's setuid (), seteuid () */
537# define seteuid(a) setreuid(-1, (a))
538# define setegid(a) setregid(-1, (a))
539# define HAVE_SETEUID
540# endif
541# ifdef HAVE_SETEUID
542 switch (action)
543 {
544 case IGNORE:
545 /*
546 * change effective uid/gid - not real uid/gid - so we can switch
547 * back to root later, as required
548 */
549 seteuid (getuid ());
550 setegid (getgid ());
551 break;
552 case SAVE:
553 euid = geteuid ();
554 egid = getegid ();
555 break;
556 case RESTORE:
557 seteuid (euid);
558 setegid (egid);
559 break;
560 }
561# else
562 switch (action)
563 {
564 case IGNORE:
565 setuid (getuid ());
566 setgid (getgid ());
567 /* FALLTHROUGH */
568 case SAVE:
569 /* FALLTHROUGH */
570 case RESTORE:
571 break;
572 }
573# endif
574#endif
575}
576
577#ifdef UTMP_SUPPORT
578void
579rxvt_term::privileged_utmp (rxvt_privaction action)
580{
581 if ((options & Opt_utmpInhibit)
582 || !pty.name || !*pty.name)
583 return;
584
585 rxvt_privileges (RESTORE);
586
587 if (action == SAVE)
588 makeutent (pty.name, rs[Rs_display_name]);
589 else
590 cleanutent ();
591
592 rxvt_privileges (IGNORE);
593}
594#endif
595 614
596/*----------------------------------------------------------------------*/ 615/*----------------------------------------------------------------------*/
597/* 616/*
598 * window size/position calculcations for XSizeHint and other storage. 617 * window size/position calculcations for XSizeHint and other storage.
599 * if width/height are non-zero then override calculated width/height 618 * if width/height are non-zero then override calculated width/height
600 */ 619 */
601void 620void
602rxvt_term::window_calc (unsigned int width, unsigned int height) 621rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
603{ 622{
604 short recalc_x, recalc_y; 623 short recalc_x, recalc_y;
605 int x, y, sb_w, mb_h, flags; 624 int x, y, sb_w, flags;
606 unsigned int w, h; 625 unsigned int w, h;
607 unsigned int max_width, max_height; 626 unsigned int max_width, max_height;
627 dDisp;
608 628
609 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
610 TermWin.ncol, TermWin.nrow, szHint.width,
611 szHint.height));
612 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 629 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
613 szHint.win_gravity = NorthWestGravity; 630 szHint.win_gravity = NorthWestGravity;
614 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 631 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
615 632
616 recalc_x = recalc_y = 0; 633 recalc_x = recalc_y = 0;
617 flags = 0; 634 flags = 0;
635
618 if (!parsed_geometry) 636 if (!parsed_geometry)
619 { 637 {
620 parsed_geometry = 1; 638 parsed_geometry = 1;
639
621 if (rs[Rs_geometry]) 640 if (rs[Rs_geometry])
622 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 641 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
642
623 if (flags & WidthValue) 643 if (flags & WidthValue)
624 { 644 {
625 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 645 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
626 szHint.flags |= USSize; 646 szHint.flags |= USSize;
627 } 647 }
648
628 if (flags & HeightValue) 649 if (flags & HeightValue)
629 { 650 {
630 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 651 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
631 szHint.flags |= USSize; 652 szHint.flags |= USSize;
632 } 653 }
654
633 if (flags & XValue) 655 if (flags & XValue)
634 { 656 {
635 szHint.x = x; 657 szHint.x = x;
636 szHint.flags |= USPosition; 658 szHint.flags |= USPosition;
659
637 if (flags & XNegative) 660 if (flags & XNegative)
638 { 661 {
639 recalc_x = 1; 662 recalc_x = 1;
640 szHint.win_gravity = NorthEastGravity; 663 szHint.win_gravity = NorthEastGravity;
641 } 664 }
642 } 665 }
666
643 if (flags & YValue) 667 if (flags & YValue)
644 { 668 {
645 szHint.y = y; 669 szHint.y = y;
646 szHint.flags |= USPosition; 670 szHint.flags |= USPosition;
671
647 if (flags & YNegative) 672 if (flags & YNegative)
648 { 673 {
649 recalc_y = 1; 674 recalc_y = 1;
675
650 if (szHint.win_gravity == NorthEastGravity) 676 if (szHint.win_gravity == NorthEastGravity)
651 szHint.win_gravity = SouthEastGravity; 677 szHint.win_gravity = SouthEastGravity;
652 else 678 else
653 szHint.win_gravity = SouthWestGravity; 679 szHint.win_gravity = SouthWestGravity;
654 } 680 }
655 } 681 }
656 } 682 }
657 683
658 /* TODO: BOUNDS */ 684 /* TODO: BOUNDS */
659 TermWin.width = TermWin.ncol * TermWin.fwidth; 685 width = ncol * fwidth;
660 TermWin.height = TermWin.nrow * TermWin.fheight; 686 height = nrow * fheight;
661 max_width = MAX_COLS * TermWin.fwidth; 687 max_width = MAX_COLS * fwidth;
662 max_height = MAX_ROWS * TermWin.fheight; 688 max_height = MAX_ROWS * fheight;
663 689
664 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 690 szHint.base_width = szHint.base_height = 2 * int_bwidth;
665 691
666 sb_w = mb_h = 0; 692 sb_w = 0;
667 window_vt_x = window_vt_y = TermWin.int_bwidth; 693 window_vt_x = window_vt_y = int_bwidth;
668 694
669 if (scrollbar_visible ()) 695 if (scrollBar.state)
670 { 696 {
671 sb_w = scrollbar_TotalWidth (); 697 sb_w = scrollbar_TotalWidth ();
672 szHint.base_width += sb_w; 698 szHint.base_width += sb_w;
673 if (!(options & Opt_scrollBar_right)) 699 if (!OPTION (Opt_scrollBar_right))
674 window_vt_x += sb_w; 700 window_vt_x += sb_w;
675 } 701 }
676 702
677 if (menubar_visible ())
678 {
679 mb_h = menuBar_TotalHeight ();
680 szHint.base_height += mb_h;
681 window_vt_y += mb_h;
682 }
683
684 szHint.width_inc = TermWin.fwidth; 703 szHint.width_inc = fwidth;
685 szHint.height_inc = TermWin.fheight; 704 szHint.height_inc = fheight;
686 szHint.min_width = szHint.base_width + szHint.width_inc; 705 szHint.min_width = szHint.base_width + szHint.width_inc;
687 szHint.min_height = szHint.base_height + szHint.height_inc; 706 szHint.min_height = szHint.base_height + szHint.height_inc;
688 707
689 if (width && width - szHint.base_width < max_width) 708 if (newwidth && newwidth - szHint.base_width < max_width)
690 { 709 {
691 szHint.width = width; 710 szHint.width = newwidth;
692 TermWin.width = width - szHint.base_width; 711 width = newwidth - szHint.base_width;
693 } 712 }
694 else 713 else
695 { 714 {
696 MIN_IT (TermWin.width, max_width); 715 min_it (width, max_width);
697 szHint.width = szHint.base_width + TermWin.width; 716 szHint.width = szHint.base_width + width;
698 } 717 }
699 718
700 if (height && height - szHint.base_height < max_height) 719 if (newheight && newheight - szHint.base_height < max_height)
701 { 720 {
702 szHint.height = height; 721 szHint.height = newheight;
703 TermWin.height = height - szHint.base_height; 722 height = newheight - szHint.base_height;
704 } 723 }
705 else 724 else
706 { 725 {
707 MIN_IT (TermWin.height, max_height); 726 min_it (height, max_height);
708 szHint.height = szHint.base_height + TermWin.height; 727 szHint.height = szHint.base_height + height;
709 } 728 }
710 729
711 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 730 if (scrollBar.state && OPTION (Opt_scrollBar_right))
712 window_sb_x = szHint.width - sb_w; 731 window_sb_x = szHint.width - sb_w;
713 732
714 if (recalc_x) 733 if (recalc_x)
715 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 734 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
716 - szHint.width - 2 * TermWin.ext_bwidth);
717 if (recalc_y) 735 if (recalc_y)
718 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 736 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
719 - szHint.height - 2 * TermWin.ext_bwidth);
720 737
721 TermWin.ncol = TermWin.width / TermWin.fwidth; 738 ncol = width / fwidth;
722 TermWin.nrow = TermWin.height / TermWin.fheight; 739 nrow = height / fheight;
723 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
724 TermWin.ncol, TermWin.nrow, szHint.width,
725 szHint.height));
726 return;
727} 740}
728 741
729/*----------------------------------------------------------------------*/ 742/*----------------------------------------------------------------------*/
730/* 743/*
731 * Tell the teletype handler what size the window is. 744 * Tell the teletype handler what size the window is.
732 * Called after a window size change. 745 * Called after a window size change.
733 */ 746 */
734void 747void
735rxvt_term::tt_winch () 748rxvt_term::tt_winch ()
736{ 749{
737 if (pty.pty < 0) 750 if (pty->pty < 0)
738 return; 751 return;
739 752
740 struct winsize ws; 753 struct winsize ws;
741 754
742 ws.ws_col = TermWin.ncol; 755 ws.ws_col = ncol;
743 ws.ws_row = TermWin.nrow; 756 ws.ws_row = nrow;
744 ws.ws_xpixel = TermWin.width; 757 ws.ws_xpixel = width;
745 ws.ws_ypixel = TermWin.height; 758 ws.ws_ypixel = height;
746 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 759 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
747 760
748#if 0 761#if 0
749 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 762 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
750 if (cmd_pid) /* force through to the command */ 763 if (cmd_pid) /* force through to the command */
751 kill (cmd_pid, SIGWINCH); 764 kill (-cmd_pid, SIGWINCH);
752#endif 765#endif
753} 766}
754 767
755/*----------------------------------------------------------------------*/ 768/*----------------------------------------------------------------------*/
756/* set_fonts () - load and set the various fonts 769/* set_fonts () - load and set the various fonts
757/* 770 *
758 * init = 1 - initialize 771 * init = 1 - initialize
759 * 772 *
760 * fontname == FONT_UP - switch to bigger font 773 * fontname == FONT_UP - switch to bigger font
761 * fontname == FONT_DN - switch to smaller font 774 * fontname == FONT_DN - switch to smaller font
762 */ 775 */
… …
774 return false; 787 return false;
775 } 788 }
776 789
777#if ENABLE_STYLES 790#if ENABLE_STYLES
778 for (int i = RS_styleCount; --i; ) 791 for (int i = RS_styleCount; --i; )
779 if (TermWin.fontset[i] != TermWin.fontset[0]) 792 if (fontset[i] != fontset[0])
780 delete TermWin.fontset[i]; 793 delete fontset[i];
781#endif 794#endif
782 795
783 delete TermWin.fontset[0]; 796 delete fontset[0];
784 TermWin.fontset[0] = fs; 797 fontset[0] = fs;
785 798
786 prop = (*fs)[1]->properties (); 799 prop = (*fs)[1]->properties ();
800 prop.height += lineSpace;
787 fs->set_prop (prop); 801 fs->set_prop (prop);
788 802
789 TermWin.fwidth = prop.width; 803 fwidth = prop.width;
790 TermWin.fheight = prop.height; 804 fheight = prop.height;
791 TermWin.fweight = prop.weight; 805 fbase = prop.ascent;
792 TermWin.fslant = prop.slant;
793 TermWin.fbase = (*fs)[1]->ascent;
794 806
795 for (int style = 1; style < 4; style++) 807 for (int style = 1; style < 4; style++)
796 { 808 {
797#if ENABLE_STYLES 809#if ENABLE_STYLES
798 const char *res = rs[Rs_font + style]; 810 const char *res = rs[Rs_font + style];
799 811
800 if (res && !*res) 812 if (res && !*res)
801 TermWin.fontset[style] = TermWin.fontset[0]; 813 fontset[style] = fontset[0];
802 else 814 else
803 { 815 {
804 TermWin.fontset[style] = fs = new rxvt_fontset (this); 816 fontset[style] = fs = new rxvt_fontset (this);
805 rxvt_fontprop prop2 = prop; 817 rxvt_fontprop prop2 = prop;
806 818
807 if (res) 819 if (res)
808 prop2.weight = prop2.slant = rxvt_fontprop::unset; 820 prop2.weight = prop2.slant = rxvt_fontprop::unset;
809 else 821 else
810 { 822 {
811 res = TermWin.fontset[0]->fontdesc; 823 res = fontset[0]->fontdesc;
812 824
813 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;
814 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;
815 } 827 }
816 828
817 fs->populate (res); 829 fs->populate (res);
818 fs->set_prop (prop2); 830 fs->set_prop (prop2);
819 } 831 }
820#else 832#else
821 TermWin.fontset[style] = TermWin.fontset[0]; 833 fontset[style] = fontset[0];
822#endif 834#endif
823 } 835 }
824 836
825 if (TermWin.parent[0]) 837 if (parent[0])
826 { 838 {
827 resize_all_windows (0, 0, 0); 839 resize_all_windows (0, 0, 0);
828 scr_remap_chars (); 840 scr_remap_chars ();
829 scr_touch (true); 841 scr_touch (true);
830 } 842 }
… …
832 return true; 844 return true;
833} 845}
834 846
835void 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)
836{ 848{
837 // TODO: SMART_WINDOW_TITLE
838 XChangeProperty (display->display, TermWin.parent[0], 849 XChangeProperty (display->display, parent[0],
839 prop, XA_STRING, 8, PropModeReplace, 850 prop, XA_STRING, 8, PropModeReplace,
840 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 851 (const unsigned char *)str, len >= 0 ? len : strlen (str));
841} 852}
842 853
843void 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)
844{ 855{
845 // TODO: SMART_WINDOW_TITLE
846 wchar_t *ws = rxvt_mbstowcs (str, len); 856 wchar_t *ws = rxvt_mbstowcs (str, len);
847 char *s = rxvt_wcstoutf8 (ws); 857 char *s = rxvt_wcstoutf8 (ws);
848 858
849 XChangeProperty (display->display, TermWin.parent[0], 859 XChangeProperty (display->display, parent[0],
850 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 860 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
851 (const unsigned char *)s, strlen (s)); 861 (const unsigned char *)s, strlen (s));
852 862
853 free (s); 863 free (s);
854 free (ws); 864 free (ws);
… …
859/* xterm sequences - title, iconName, color (exptl) */ 869/* xterm sequences - title, iconName, color (exptl) */
860void 870void
861rxvt_term::set_title (const char *str) 871rxvt_term::set_title (const char *str)
862{ 872{
863 set_string_property (XA_WM_NAME, str); 873 set_string_property (XA_WM_NAME, str);
864#if ENABLE_FRILLS 874#if ENABLE_EWMH
865 set_utf8_property (xa[XA_NET_WM_NAME], str); 875 set_utf8_property (xa[XA_NET_WM_NAME], str);
866#endif 876#endif
867} 877}
868 878
869void 879void
870rxvt_term::set_icon_name (const char *str) 880rxvt_term::set_icon_name (const char *str)
871{ 881{
872 set_string_property (XA_WM_ICON_NAME, str); 882 set_string_property (XA_WM_ICON_NAME, str);
873#if ENABLE_FRILLS 883#if ENABLE_EWMH
874 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 884 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
875#endif 885#endif
876} 886}
877 887
878#ifdef XTERM_COLOR_CHANGE 888#ifdef XTERM_COLOR_CHANGE
… …
887 897
888 /* handle color aliases */ 898 /* handle color aliases */
889 if (isdigit (*color)) 899 if (isdigit (*color))
890 { 900 {
891 i = atoi (color); 901 i = atoi (color);
902
892 if (i >= 8 && i <= 15) 903 if (i >= 8 && i <= 15)
893 { /* bright colors */ 904 { /* bright colors */
894 i -= 8; 905 i -= 8;
895# ifndef NO_BRIGHTCOLOR
896 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 906 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
897 SET_PIXCOLOR (idx); 907 SET_PIXCOLOR (idx);
898 goto Done; 908 goto done;
899# endif
900
901 } 909 }
910
902 if (i >= 0 && i <= 7) 911 if (i >= 0 && i <= 7)
903 { /* normal colors */ 912 { /* normal colors */
904 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 913 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
905 SET_PIXCOLOR (idx); 914 SET_PIXCOLOR (idx);
906 goto Done; 915 goto done;
907 } 916 }
908 } 917 }
909 918
910 if (!rXParseAllocColor (& xcol, color)) 919 if (!rXParseAllocColor (&xcol, color))
911 return; 920 return;
912 921
913 /* XStoreColor (display->display, display->cmap, XColor*); */ 922 /* XStoreColor (display->display, display->cmap, XColor*); */
914 923
915 /* 924 /*
… …
931 pix_colors_focused[idx] = xcol; 940 pix_colors_focused[idx] = xcol;
932 SET_PIXCOLOR (idx); 941 SET_PIXCOLOR (idx);
933 942
934 /* XSetWindowAttributes attr; */ 943 /* XSetWindowAttributes attr; */
935 /* Cursor cursor; */ 944 /* Cursor cursor; */
936Done: 945done:
946
937#ifdef OFF_FOCUS_FADING 947#if OFF_FOCUS_FADING
938 if (rs[Rs_fade]) 948 if (rs[Rs_fade])
939 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]);
940#endif 950#endif
941 951
942 /*TODO: handle Color_BD, scrollbar background, etc. */ 952 /*TODO: handle Color_BD, scrollbar background, etc. */
943 953
944 recolour_cursor (); 954 recolour_cursor ();
… …
974{ 984{
975 unsigned int i; 985 unsigned int i;
976 const char *xpmb = "\0"; 986 const char *xpmb = "\0";
977 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 987 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
978 988
979 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
980 strcpy (fstr, "default"); 989 strcpy (fstr, "default");
981 strcpy (bstr, "default"); 990 strcpy (bstr, "default");
982 for (i = Color_Black; i <= Color_White; i++) 991 for (i = Color_Black; i <= Color_White; i++)
983 if (pix_colors[Color_fg] == pix_colors[i]) 992 if (pix_colors[Color_fg] == pix_colors[i])
984 { 993 {
… …
998 1007
999 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1008 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1000} 1009}
1001 1010
1002/*----------------------------------------------------------------------*/ 1011/*----------------------------------------------------------------------*/
1003/*
1004 * Colour determination for low colour displays, routine from
1005 * Hans de Goede <hans@highrise.nl>
1006 */
1007 1012
1008int 1013int
1009rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1014rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1010{ 1015{
1011 if (!screen_in_out->set (display, colour)) 1016 if (!screen_in_out->set (display, colour))
… …
1019 1024
1020/* -------------------------------------------------------------------- * 1025/* -------------------------------------------------------------------- *
1021 * - WINDOW RESIZING - * 1026 * - WINDOW RESIZING - *
1022 * -------------------------------------------------------------------- */ 1027 * -------------------------------------------------------------------- */
1023void 1028void
1024rxvt_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)
1025{ 1030{
1026 int fix_screen; 1031 int fix_screen;
1032 int old_width = szHint.width;
1033 int old_height = szHint.height;
1034 dDisp;
1027 1035
1028#ifdef SMART_RESIZE
1029 int old_width = szHint.width, old_height = szHint.height;
1030#endif
1031
1032 window_calc (width, height); 1036 window_calc (newwidth, newheight);
1033 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1037 XSetWMNormalHints (disp, parent[0], &szHint);
1034 1038
1035 if (!ignoreparent) 1039 if (!ignoreparent)
1036 { 1040 {
1037#ifdef SMART_RESIZE 1041#ifdef SMART_RESIZE
1038 /* 1042 /*
… …
1042 int x, y, x1, y1; 1046 int x, y, x1, y1;
1043 int dx, dy; 1047 int dx, dy;
1044 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1048 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1045 Window unused_cr; 1049 Window unused_cr;
1046 1050
1047 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1051 XTranslateCoordinates (disp, parent[0], display->root,
1048 0, 0, &x, &y, &unused_cr); 1052 0, 0, &x, &y, &unused_cr);
1049 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1053 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1050 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1054 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1051 /* 1055 /*
1052 * 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
1053 * our position for handles and decorations. Counter it 1057 * our position for handles and decorations. Counter it
1054 */ 1058 */
… …
1056 { 1060 {
1057 x -= x1; 1061 x -= x1;
1058 y -= y1; 1062 y -= y1;
1059 } 1063 }
1060 1064
1061 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1065 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1062 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1066 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1063 dx = old_width - szHint.width; 1067 dx = old_width - szHint.width;
1064 dy = old_height - szHint.height; 1068 dy = old_height - szHint.height;
1065 1069
1066 /* Check position of the center of the window */ 1070 /* Check position of the center of the window */
1067 if (x < x1) /* left half */ 1071 if (x < x1) /* left half */
1068 dx = 0; 1072 dx = 0;
… …
1071 if (y < y1) /* top half */ 1075 if (y < y1) /* top half */
1072 dy = 0; 1076 dy = 0;
1073 else if (y == y1) /* exact center */ 1077 else if (y == y1) /* exact center */
1074 dy /= 2; 1078 dy /= 2;
1075 1079
1076 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1080 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1077 szHint.width, szHint.height); 1081 szHint.width, szHint.height);
1078#else 1082#else
1079 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1083 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1080#endif 1084#endif
1081 } 1085 }
1082 1086
1083 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1087 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1084 1088
1085 if (fix_screen || width != old_width || height != old_height) 1089 if (fix_screen || newwidth != old_width || newheight != old_height)
1086 { 1090 {
1087 if (scrollbar_visible ()) 1091 if (scrollBar.state)
1088 { 1092 {
1089 XMoveResizeWindow (display->display, scrollBar.win, 1093 XMoveResizeWindow (disp, scrollBar.win,
1090 window_sb_x, 0, 1094 window_sb_x, 0,
1091 scrollbar_TotalWidth (), szHint.height); 1095 scrollbar_TotalWidth (), szHint.height);
1092 resize_scrollbar (); 1096 resize_scrollbar ();
1093 } 1097 }
1094 1098
1095 if (menubar_visible ())
1096 XMoveResizeWindow (display->display, menuBar.win,
1097 window_vt_x, 0,
1098 TermWin_TotalWidth (), menuBar_TotalHeight ());
1099
1100 XMoveResizeWindow (display->display, TermWin.vt, 1099 XMoveResizeWindow (disp, vt,
1101 window_vt_x, window_vt_y, 1100 window_vt_x, window_vt_y,
1102 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1101 width, height);
1102
1103 scr_clear (); 1103 scr_clear ();
1104#ifdef XPM_BACKGROUND 1104#ifdef XPM_BACKGROUND
1105 resize_pixmap (); 1105 resize_pixmap ();
1106#endif 1106#endif
1107 } 1107 }
1108 1108
1109 if (fix_screen || old_height == 0) 1109 if (fix_screen || old_height == 0)
1110 {
1111 int curr_screen = -1;
1112 int old_ncol = prev_ncol;
1113
1114 /* scr_reset only works on the primary screen */
1115 if (old_height) /* this is not the first time through */
1116 {
1117 unsigned int ncol = TermWin.ncol;
1118 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1119 curr_screen = scr_change_screen (PRIMARY);
1120 TermWin.ncol = ncol;
1121 }
1122
1123 scr_reset (); 1110 scr_reset ();
1124 1111
1125 if (curr_screen >= 0) /* this is not the first time through */ 1112#ifdef XPM_BACKGROUND
1126 { 1113 if (pixmap)
1127 scr_change_screen (curr_screen); 1114 scr_touch (false);
1128 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1115#endif
1129 }
1130 }
1131
1132 old_width = szHint.width;
1133 old_height = szHint.height;
1134 1116
1135#ifdef USE_XIM 1117#ifdef USE_XIM
1136 IMSetStatusPosition (); 1118 IMSetStatusPosition ();
1137#endif 1119#endif
1138} 1120}
… …
1140/* 1122/*
1141 * 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.
1142 * good for toggling 80/132 columns 1124 * good for toggling 80/132 columns
1143 */ 1125 */
1144void 1126void
1145rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1127rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1146{ 1128{
1147 XWindowAttributes wattr; 1129 XWindowAttributes wattr;
1148 1130
1149 if (width == 0 || height == 0) 1131 if (newwidth == 0 || newheight == 0)
1150 { 1132 {
1151 XGetWindowAttributes (display->display, display->root, &wattr); 1133 XGetWindowAttributes (display->display, display->root, &wattr);
1134
1152 if (width == 0) 1135 if (newwidth == 0)
1153 width = wattr.width - szHint.base_width; 1136 newwidth = wattr.width - szHint.base_width;
1154 if (height == 0) 1137 if (newheight == 0)
1155 height = wattr.height - szHint.base_height; 1138 newheight = wattr.height - szHint.base_height;
1156 }
1157
1158 if (width != TermWin.width || height != TermWin.height)
1159 { 1139 }
1140
1141 if (newwidth != width || newheight != height)
1142 {
1160 width += szHint.base_width; 1143 newwidth += szHint.base_width;
1161 height += szHint.base_height; 1144 newheight += szHint.base_height;
1162 resize_all_windows (width, height, 0); 1145 resize_all_windows (newwidth, newheight, 0);
1163 } 1146 }
1164} 1147}
1165 1148
1166/* -------------------------------------------------------------------- * 1149/* -------------------------------------------------------------------- *
1167 * - X INPUT METHOD ROUTINES - * 1150 * - X INPUT METHOD ROUTINES - *
… …
1177 1160
1178void 1161void
1179rxvt_term::im_set_size (XRectangle &size) 1162rxvt_term::im_set_size (XRectangle &size)
1180{ 1163{
1181 // the int_bwidth terms make no sense to me 1164 // the int_bwidth terms make no sense to me
1182 size.x = TermWin.int_bwidth; 1165 size.x = int_bwidth;
1183 size.y = TermWin.int_bwidth; 1166 size.y = int_bwidth;
1184 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1167 size.width = Width2Pixel (ncol) + int_bwidth;
1185 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1168 size.height = Height2Pixel (nrow) + int_bwidth;
1186} 1169}
1187 1170
1188void 1171void
1189rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1172rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1190 XRectangle &status_rect, 1173 XRectangle &status_rect,
1191 const XRectangle &needed_rect) 1174 const XRectangle &needed_rect)
1192{ 1175{
1193 preedit_rect.x = needed_rect.width; 1176 preedit_rect.x = needed_rect.width;
1194 preedit_rect.y = 0; 1177 preedit_rect.y = 0;
1195 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1178 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1196 preedit_rect.height = TermWin.fheight; 1179 preedit_rect.height = fheight;
1197 1180
1198 status_rect.x = 0; 1181 status_rect.x = 0;
1199 status_rect.y = 0; 1182 status_rect.y = 0;
1200 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;
1201 status_rect.height = TermWin.fheight; 1184 status_rect.height = fheight;
1202} 1185}
1203 1186
1204/* Checking whether input method is running. */ 1187/* Checking whether input method is running. */
1205bool 1188bool
1206rxvt_term::IMisRunning () 1189rxvt_term::IMisRunning ()
… …
1234{ 1217{
1235 XPoint nspot; 1218 XPoint nspot;
1236 XVaNestedList preedit_attr; 1219 XVaNestedList preedit_attr;
1237 1220
1238 if (!Input_Context 1221 if (!Input_Context
1239 || !TermWin.focus 1222 || !focus
1240 || !(input_style & XIMPreeditPosition)) 1223 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1241 return; 1224 return;
1242 1225
1243 im_set_position (nspot); 1226 im_set_position (nspot);
1244 1227
1245 if (nspot.x == spot.x && nspot.y == spot.y) 1228 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1264 input_method = 0; 1247 input_method = 0;
1265 } 1248 }
1266 1249
1267 Input_Context = 0; 1250 Input_Context = 0;
1268} 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
1269 1326
1270/* 1327/*
1271 * 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
1272 * open a suitable preedit type 1329 * open a suitable preedit type
1273 */ 1330 */
… …
1280 XRectangle rect, status_rect, needed_rect; 1337 XRectangle rect, status_rect, needed_rect;
1281 unsigned long fg, bg; 1338 unsigned long fg, bg;
1282 const char *p; 1339 const char *p;
1283 char **s; 1340 char **s;
1284 XIMStyles *xim_styles; 1341 XIMStyles *xim_styles;
1342#ifdef ENABLE_XIM_ONTHESPOT
1343 XIMCallback xcb[4];
1344#endif
1345
1346 set_environ (envv);
1285 1347
1286 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1348 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1287 return false; 1349 return false;
1288 1350
1289 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1290 input_method = display->get_xim (locale, modifiers); 1351 input_method = display->get_xim (locale, modifiers);
1291 if (input_method == NULL) 1352 if (input_method == NULL)
1292 return false; 1353 return false;
1293 1354
1294 xim = input_method->xim; 1355 xim = input_method->xim;
… …
1314 s = rxvt_splitcommastring (p); 1375 s = rxvt_splitcommastring (p);
1315 1376
1316 for (i = found = 0; !found && s[i]; i++) 1377 for (i = found = 0; !found && s[i]; i++)
1317 { 1378 {
1318 if (!strcmp (s[i], "OverTheSpot")) 1379 if (!strcmp (s[i], "OverTheSpot"))
1319 input_style = (XIMPreeditPosition | XIMStatusNothing); 1380 input_style = XIMPreeditPosition | XIMStatusNothing;
1320 else if (!strcmp (s[i], "OffTheSpot")) 1381 else if (!strcmp (s[i], "OffTheSpot"))
1321 input_style = (XIMPreeditArea | XIMStatusArea); 1382 input_style = XIMPreeditArea | XIMStatusArea;
1322 else if (!strcmp (s[i], "Root")) 1383 else if (!strcmp (s[i], "Root"))
1323 input_style = (XIMPreeditNothing | XIMStatusNothing); 1384 input_style = XIMPreeditNothing | XIMStatusNothing;
1324 else if (!strcmp (s[i], "None")) 1385 else if (!strcmp (s[i], "None"))
1325 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;
1326 1393
1327 for (j = 0; j < xim_styles->count_styles; j++) 1394 for (j = 0; j < xim_styles->count_styles; j++)
1328 if (input_style == xim_styles->supported_styles[j]) 1395 if (input_style == xim_styles->supported_styles[j])
1329 { 1396 {
1330 rxvt_freecommastring (s); 1397 rxvt_freecommastring (s);
… …
1364 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1431 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1365 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1432 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1366 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1433 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1367 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1434 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1368 "*", 1435 "*",
1369 TermWin.fheight, 1436 fheight,
1370 TermWin.fheight + 1, TermWin.fheight - 1, 1437 fheight + 1, fheight - 1,
1371 TermWin.fheight - 2, TermWin.fheight + 2); 1438 fheight - 2, fheight + 2);
1372 1439
1373 fs = XCreateFontSet (display->display, pat, 1440 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1374 &missing_charset_list, &missing_charset_count, &def_string); 1441 &missing_charset_list, &missing_charset_count, &def_string);
1375 1442
1376 if (missing_charset_list) 1443 if (missing_charset_list)
1377 XFreeStringList (missing_charset_list); 1444 XFreeStringList (missing_charset_list);
1378 1445
… …
1419 XNBackground, bg, 1486 XNBackground, bg,
1420 XNArea, &status_rect, 1487 XNArea, &status_rect,
1421 XNFontSet, fs, 1488 XNFontSet, fs,
1422 NULL); 1489 NULL);
1423 } 1490 }
1491#if ENABLE_XIM_ONTHESPOT
1492 else if (input_style & XIMPreeditCallbacks)
1493 {
1494 im_set_position (spot);
1495
1496 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1497 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1498 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1499# if 0
1500 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1501# endif
1502
1503 preedit_attr = XVaCreateNestedList (0,
1504 XNSpotLocation, &spot,
1505 XNPreeditStartCallback, &xcb[0],
1506 XNPreeditDoneCallback , &xcb[1],
1507 XNPreeditDrawCallback , &xcb[2],
1508# if 0
1509 XNPreeditCaretCallback, &xcb[3],
1510# endif
1511 NULL);
1512 }
1513#endif
1424 1514
1425 Input_Context = XCreateIC (xim, 1515 Input_Context = XCreateIC (xim,
1426 XNInputStyle, input_style, 1516 XNInputStyle, input_style,
1427 XNClientWindow, TermWin.vt, 1517 XNClientWindow, vt,
1428 XNFocusWindow, TermWin.parent[0], 1518 XNFocusWindow, parent[0],
1429 preedit_attr ? XNPreeditAttributes : NULL, 1519 preedit_attr ? XNPreeditAttributes : NULL,
1430 preedit_attr, 1520 preedit_attr,
1431 status_attr ? XNStatusAttributes : NULL, 1521 status_attr ? XNStatusAttributes : NULL,
1432 status_attr, NULL); 1522 status_attr, NULL);
1433 1523
… …
1440 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1530 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1441 im_destroy (); 1531 im_destroy ();
1442 return false; 1532 return false;
1443 } 1533 }
1444 1534
1535#if 0
1536 // unfortunately, only the focus window is used by XIM, hard to fix
1537 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1538 vt_select_input ();
1539#endif
1540
1445 if (input_style & XIMPreeditArea) 1541 if (input_style & XIMPreeditArea)
1446 IMSetStatusPosition (); 1542 IMSetStatusPosition ();
1447 1543
1448 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1449 return true; 1544 return true;
1450} 1545}
1451 1546
1452void 1547void
1453rxvt_term::im_cb () 1548rxvt_term::im_cb ()
1454{ 1549{
1455 int i, found, had_im; 1550 int i;
1456 const char *p; 1551 const char *p;
1457 char **s; 1552 char **s;
1458 char buf[IMBUFSIZ]; 1553 char buf[IMBUFSIZ];
1459 1554
1555 make_current ();
1556
1460 im_destroy (); 1557 im_destroy ();
1461 1558
1462 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1463 if (Input_Context) 1559 if (Input_Context)
1464 return; 1560 return;
1465 1561
1466#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1562#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1467 if (rs[Rs_imLocale]) 1563 if (rs[Rs_imLocale])
… …
1515{ 1611{
1516 XRectangle preedit_rect, status_rect, *needed_rect; 1612 XRectangle preedit_rect, status_rect, *needed_rect;
1517 XVaNestedList preedit_attr, status_attr; 1613 XVaNestedList preedit_attr, status_attr;
1518 1614
1519 if (!Input_Context 1615 if (!Input_Context
1520 || !TermWin.focus 1616 || !focus
1521 || !(input_style & XIMPreeditArea) 1617 || !(input_style & XIMPreeditArea)
1522 || !IMisRunning ()) 1618 || !IMisRunning ())
1523 return; 1619 return;
1524 1620
1525 /* Getting the necessary width of preedit area */ 1621 /* Getting the necessary width of preedit area */
… …
1540 XFree (preedit_attr); 1636 XFree (preedit_attr);
1541 XFree (status_attr); 1637 XFree (status_attr);
1542} 1638}
1543#endif /* USE_XIM */ 1639#endif /* USE_XIM */
1544 1640
1545/*----------------------------------------------------------------------*/
1546rxvt_t rxvt_current_term;
1547
1548/*----------------------- end-of-file (C source) -----------------------*/ 1641/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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