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

Diff Legend

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