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

Diff Legend

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