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.139 by root, Wed Feb 16 21:37:10 2005 UTC vs.
Revision 1.212 by root, Tue Jan 31 18:36:35 2006 UTC

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

Diff Legend

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