ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.148 by root, Wed Nov 30 21:05:39 2005 UTC vs.
Revision 1.226 by root, Thu Jul 6 23:48:11 2006 UTC

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

Diff Legend

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