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

Diff Legend

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