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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines