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.134 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.211 by root, Tue Jan 31 16:57:35 2006 UTC

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

Diff Legend

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