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

Diff Legend

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