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

Diff Legend

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