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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines