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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines