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.156 by root, Mon Jan 2 18:20:23 2006 UTC vs.
Revision 1.216 by root, Wed Feb 1 21:15:33 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.
… …
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 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], savelocale[128]; 56static char curlocale[128], savelocale[128];
54 57
55bool 58bool
56rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
57{ 60{
58 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
59 return false; 62 return false;
60 63
61 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
63 return true; 66 return true;
64} 67}
65 68
66bool 69void
67rxvt_push_locale (const char *locale) 70rxvt_push_locale (const char *locale) NOTHROW
68{ 71{
69 strcpy (savelocale, curlocale); 72 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale); 73 rxvt_set_locale (locale);
71} 74}
72 75
73void 76void
74rxvt_pop_locale () 77rxvt_pop_locale () NOTHROW
75{ 78{
76 rxvt_set_locale (savelocale); 79 rxvt_set_locale (savelocale);
77} 80}
78 81
79#if ENABLE_COMBINING 82#if ENABLE_COMBINING
… …
146 rootwin_ev (this, &rxvt_term::rootwin_cb), 149 rootwin_ev (this, &rxvt_term::rootwin_cb),
147#endif 150#endif
148#ifdef HAVE_SCROLLBARS 151#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb), 152 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif 153#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif
154#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif 156#endif
157#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
170 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif 171#endif
172#ifdef USE_XIM 172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
174#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
175 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
176 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
177 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
178 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
179 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
180 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
181 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
184 188
185 termlist.push_back (this); 189 termlist.push_back (this);
186 190
187#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
188 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
189
190 if (!keyboard)
191 rxvt_fatal ("out of memory, aborting.\n");
192#endif 193#endif
193} 194}
194 195
195// 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.
196// for use before an emergency exit 197// for use before an emergency exit
197void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
198{ 199{
199 if (cmd_pid) 200 if (cmd_pid)
200 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
201 202
202#ifdef UTMP_SUPPORT 203 delete pty; pty = 0;
203 privileged_utmp (RESTORE);
204#endif
205
206 pty.put ();
207} 204}
208 205
209rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
210{ 207{
211 PERL_INVOKE ((this, HOOK_DESTROY, DT_END));
212
213 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
214 209
215 emergency_cleanup (); 210 emergency_cleanup ();
216 211
217#if ENABLE_STYLES 212#if ENABLE_STYLES
… …
221#endif 216#endif
222 delete fontset[0]; 217 delete fontset[0];
223 218
224 if (display) 219 if (display)
225 { 220 {
226 dDisp;
227
228 selection_clear (); 221 selection_clear ();
229 222
230#ifdef USE_XIM 223#ifdef USE_XIM
231 im_destroy (); 224 im_destroy ();
232#endif 225#endif
233#ifdef MENUBAR
234 if (menubarGC) XFreeGC (disp, menubarGC);
235#endif
236#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
237 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
238 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (xdisp, ShadowGC);
239#endif 229#endif
240#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
241 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
242#endif 232#endif
243#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
244 if (blackGC) XFreeGC (disp, blackGC); 234 if (blackGC) XFreeGC (xdisp, blackGC);
245 if (whiteGC) XFreeGC (disp, whiteGC); 235 if (whiteGC) XFreeGC (xdisp, whiteGC);
246 if (grayGC) XFreeGC (disp, grayGC); 236 if (grayGC) XFreeGC (xdisp, grayGC);
247 if (darkGC) XFreeGC (disp, darkGC); 237 if (darkGC) XFreeGC (xdisp, darkGC);
248 if (stippleGC) XFreeGC (disp, stippleGC); 238 if (stippleGC) XFreeGC (xdisp, stippleGC);
249 if (dimple) XFreePixmap (disp, dimple); 239 if (dimple) XFreePixmap (xdisp, dimple);
250 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (xdisp, upArrow);
251 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (xdisp, downArrow);
252 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
253 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
254#endif 244#endif
255#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 245#ifdef RXVT_SCROLLBAR
256 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (xdisp, topShadowGC);
257 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (xdisp, botShadowGC);
258 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
259#endif 249#endif
260 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (xdisp, gc);
261 251
262#if defined(MENUBAR) && (MENUBAR_MAX > 1)
263 delete menuBar.drawable;
264 //if (menuBar.win)
265 // XDestroyWindow (disp, menuBar.win);
266#endif
267 delete drawable; 252 delete drawable;
268 // destroy all windows 253 // destroy all windows
269 if (parent[0]) 254 if (parent[0])
270 XDestroyWindow (disp, parent[0]); 255 XDestroyWindow (xdisp, parent[0]);
271 }
272 256
273 // TODO: free pixcolours, colours should become part of rxvt_display 257 for (int i = 0; i < TOTAL_COLORS; i++)
258 if (ISSET_PIXCOLOR (i))
259 {
260 pix_colors_focused [i].free (this);
261#if OFF_FOCUS_FADING
262 pix_colors_unfocused [i].free (this);
263#endif
264 }
265
266 clear ();
267 }
274 268
275 delete pix_colors_focused; 269 delete pix_colors_focused;
276#if OFF_FOCUS_FADING 270#if OFF_FOCUS_FADING
277 delete pix_colors_unfocused; 271 delete pix_colors_unfocused;
278#endif 272#endif
… …
285 for (int i = 0; i < allocated.size (); i++) 279 for (int i = 0; i < allocated.size (); i++)
286 free (allocated [i]); 280 free (allocated [i]);
287 281
288 free (selection.text); 282 free (selection.text);
289 // TODO: manage env vars in child only(!) 283 // TODO: manage env vars in child only(!)
290 free (env_windowid);
291 free (env_display); 284 free (env_display);
292 free (env_term); 285 free (env_term);
293 free (env_colorfgbg);
294 free (locale); 286 free (locale);
295 free (v_buffer); 287 free (v_buffer);
296 free (incr_buf); 288 free (incr_buf);
297 289
298 delete envv; 290 delete envv;
… …
301#ifdef KEYSYM_RESOURCE 293#ifdef KEYSYM_RESOURCE
302 delete keyboard; 294 delete keyboard;
303#endif 295#endif
304} 296}
305 297
298// child has exited, usually destroys
306void 299void
307rxvt_term::child_exit () 300rxvt_term::child_cb (child_watcher &w, int status)
308{ 301{
302 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
303
309 cmd_pid = 0; 304 cmd_pid = 0;
310 305
311 if (!OPTION (Opt_hold)) 306 if (!OPTION (Opt_hold))
312 destroy (); 307 destroy ();
313} 308}
… …
316rxvt_term::destroy () 311rxvt_term::destroy ()
317{ 312{
318 if (destroy_ev.active) 313 if (destroy_ev.active)
319 return; 314 return;
320 315
316 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
317
321#if ENABLE_OVERLAY 318#if ENABLE_OVERLAY
322 scr_overlay_off (); 319 scr_overlay_off ();
323#endif 320#endif
324 321
325 if (display) 322 if (display)
… …
327#if USE_XIM 324#if USE_XIM
328 im_ev.stop (display); 325 im_ev.stop (display);
329#endif 326#endif
330#if HAVE_SCROLLBARS 327#if HAVE_SCROLLBARS
331 scrollbar_ev.stop (display); 328 scrollbar_ev.stop (display);
332#endif
333#if MENUBAR
334 menubar_ev.stop (display);
335#endif 329#endif
336#if TRANSPARENT 330#if TRANSPARENT
337 rootwin_ev.stop (display); 331 rootwin_ev.stop (display);
338#endif 332#endif
339 incr_ev.stop (); 333 incr_ev.stop ();
… …
363} 357}
364 358
365void 359void
366rxvt_term::destroy_cb (time_watcher &w) 360rxvt_term::destroy_cb (time_watcher &w)
367{ 361{
368 SET_R (this); 362 make_current ();
369 363
370 delete this; 364 delete this;
371} 365}
372 366
373/*----------------------------------------------------------------------*/ 367/*----------------------------------------------------------------------*/
… …
382{ 376{
383 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 377 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
384 (*t)->emergency_cleanup (); 378 (*t)->emergency_cleanup ();
385} 379}
386 380
387#if ENABLE_FRILLS 381#if !ENABLE_MINIMAL
388static void 382static void
389print_x_error (Display *dpy, XErrorEvent *event) 383print_x_error (Display *dpy, XErrorEvent *event)
390{ 384{
391 char buffer[BUFSIZ]; 385 char buffer[BUFSIZ];
392 char mesg[BUFSIZ]; 386 char mesg[BUFSIZ];
… …
440 GET_R->allowedxerror = event->error_code; 434 GET_R->allowedxerror = event->error_code;
441 else 435 else
442 { 436 {
443 // GET_R is most likely not the terminal which caused the error, 437 // GET_R is most likely not the terminal which caused the error,
444 // so just output the error and continue 438 // so just output the error and continue
445#if ENABLE_FRILLS 439#if ENABLE_MINIMAL
440 old_xerror_handler (display, event);
441#else
446 print_x_error (display, event); 442 print_x_error (display, event);
447#else
448 old_xerror_handler (display, event);
449#endif 443#endif
450 } 444 }
451 445
452 return 0; 446 return 0;
453} 447}
… …
461 _exit (EXIT_FAILURE); 455 _exit (EXIT_FAILURE);
462} 456}
463 457
464/*----------------------------------------------------------------------*/ 458/*----------------------------------------------------------------------*/
465bool 459bool
466rxvt_term::init (int argc, const char *const *argv) 460rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
467{ 461{
462 this->envv = envv;
463
468 SET_R (this); 464 SET_R (this);
469
470 set_locale (""); 465 set_locale ("");
466 set_environ (envv); // few things in X do not call setlocale :(
471 467
472 if (!init_vars ()) 468 if (!init_vars ())
473 return false; 469 return false;
474 470
475 init_secondary (); 471 init_secondary ();
… …
478 474
479#ifdef KEYSYM_RESOURCE 475#ifdef KEYSYM_RESOURCE
480 keyboard->register_done (); 476 keyboard->register_done ();
481#endif 477#endif
482 478
483#if MENUBAR_MAX
484 menubar_read (rs[Rs_menu]);
485#endif
486#ifdef HAVE_SCROLLBARS 479#ifdef HAVE_SCROLLBARS
487 if (OPTION (Opt_scrollBar)) 480 if (OPTION (Opt_scrollBar))
488 scrollBar.setIdle (); /* set existence for size calculations */ 481 scrollBar.setIdle (); /* set existence for size calculations */
489#endif 482#endif
490 483
491#if ENABLE_PERL 484 pty = ptytty::create ();
492 rxvt_perl.init ();
493#endif
494
495 PERL_INVOKE ((this, HOOK_INIT, DT_END));
496 485
497 create_windows (argc, argv); 486 create_windows (argc, argv);
498 487
499 dDisp;
500
501 init_xlocale (); 488 init_xlocale ();
502 489
503 scr_reset (); /* initialize screen */ 490 scr_reset (); // initialize screen
504 491
505#if 0 492#if 0
506 XSynchronize (disp, True); 493 XSynchronize (xdisp, True);
507#endif 494#endif
508 495
509#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
510 if (OPTION (Opt_scrollBar)) 497 if (OPTION (Opt_scrollBar))
511 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
512#endif 499#endif
513#if (MENUBAR_MAX)
514 if (menubar_visible ())
515 XMapWindow (disp, menuBar.win);
516#endif
517#ifdef TRANSPARENT 500#ifdef TRANSPARENT
518 if (OPTION (Opt_transparent)) 501 if (OPTION (Opt_transparent))
519 { 502 {
520 XSelectInput (disp, display->root, PropertyChangeMask); 503 XSelectInput (xdisp, display->root, PropertyChangeMask);
521 check_our_parents (); 504 check_our_parents ();
522 rootwin_ev.start (display, display->root); 505 rootwin_ev.start (display, display->root);
523 } 506 }
524#endif 507#endif
525 508
526 XMapWindow (disp, vt);
527 XMapWindow (disp, parent[0]);
528
529 set_colorfgbg (); 509 set_colorfgbg ();
530 510
531 init_command (cmd_argv); 511 init_command (cmd_argv);
532 512
533 free (cmd_argv); 513 free (cmd_argv);
534 514
515 if (pty->pty >= 0)
535 pty_ev.start (pty.pty, EVENT_READ); 516 pty_ev.start (pty->pty, EVENT_READ);
536 517
537 check_ev.start (); 518 check_ev.start ();
538 519
539 PERL_INVOKE ((this, HOOK_START, DT_END)); 520 HOOK_INVOKE ((this, HOOK_START, DT_END));
521
522#if ENABLE_XEMBED
523 if (rs[Rs_embed])
524 {
525 long info[2] = { 0, XEMBED_MAPPED };
526
527 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
528 32, PropModeReplace, (unsigned char *)&info, 2);
529 }
530#endif
531
532 XMapWindow (xdisp, vt);
533 XMapWindow (xdisp, parent[0]);
540 534
541 return true; 535 return true;
542} 536}
543 537
544static struct sig_handlers 538static struct sig_handlers
545{ 539{
546 sig_watcher sw_chld, sw_term, sw_int; 540 sig_watcher sw_term, sw_int;
547 541
548 void sig_chld (sig_watcher &w)
549 {
550 // we are being called for every SIGCHLD, find the corresponding term
551 int pid;
552
553 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
554 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
555 if (pid == (*t)->cmd_pid)
556 {
557 (*t)->child_exit ();
558 break;
559 }
560 }
561
562 /* 542 /*
563 * Catch a fatal signal and tidy up before quitting 543 * Catch a fatal signal and tidy up before quitting
564 */ 544 */
565 void 545 void
566 sig_term (sig_watcher &w) 546 sig_term (sig_watcher &w)
567 { 547 {
568#ifdef DEBUG_CMD
569 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
570#endif
571 rxvt_emergency_cleanup (); 548 rxvt_emergency_cleanup ();
572 signal (w.signum, SIG_DFL); 549 signal (w.signum, SIG_DFL);
573 kill (getpid (), w.signum); 550 kill (getpid (), w.signum);
574 } 551 }
575 552
576 sig_handlers () 553 sig_handlers ()
577 : sw_chld (this, &sig_handlers::sig_chld),
578 sw_term (this, &sig_handlers::sig_term), 554 : sw_term (this, &sig_handlers::sig_term),
579 sw_int (this, &sig_handlers::sig_term) 555 sw_int (this, &sig_handlers::sig_term)
580 { 556 {
581 } 557 }
582} sig_handlers; 558} sig_handlers;
583 559
560char **rxvt_environ; // startup environment
561
584void 562void
585rxvt_init () 563rxvt_init ()
586{ 564{
587 /* 565 ptytty::init ();
588 * Save and then give up any super-user privileges 566
589 * If we need privileges in any area then we must specifically request it. 567 rxvt_environ = environ;
590 * We should only need to be root in these cases:
591 * 1. write utmp entries on some systems
592 * 2. chown tty on some systems
593 */
594 rxvt_privileges (SAVE);
595 rxvt_privileges (IGNORE);
596 568
597 signal (SIGHUP, SIG_IGN); 569 signal (SIGHUP, SIG_IGN);
598 signal (SIGPIPE, SIG_IGN); 570 signal (SIGPIPE, SIG_IGN);
599 571
600 sig_handlers.sw_chld.start (SIGCHLD);
601 sig_handlers.sw_term.start (SIGTERM); 572 sig_handlers.sw_term.start (SIGTERM);
602 sig_handlers.sw_int.start (SIGINT); 573 sig_handlers.sw_int.start (SIGINT);
603 574
604 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 575 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
605 /* signal (SIGURG, SIG_DFL); */ 576 /* signal (SIGURG, SIG_DFL); */
606 577
607 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 578 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
608 // TODO: handle this with exceptions and tolerate the memory loss 579 // TODO: handle this with exceptions and tolerate the memory loss
609 XSetIOErrorHandler (rxvt_xioerror_handler); 580 XSetIOErrorHandler (rxvt_xioerror_handler);
581
582 XrmInitialize ();
610} 583}
611 584
612/* ------------------------------------------------------------------------- * 585/* ------------------------------------------------------------------------- *
613 * MEMORY ALLOCATION WRAPPERS * 586 * MEMORY ALLOCATION WRAPPERS *
614 * ------------------------------------------------------------------------- */ 587 * ------------------------------------------------------------------------- */
… …
632 rxvt_fatal ("memory allocation failure. aborting.\n"); 605 rxvt_fatal ("memory allocation failure. aborting.\n");
633 606
634 return p; 607 return p;
635} 608}
636 609
637void * 610void *
638rxvt_realloc (void *ptr, size_t size) 611rxvt_realloc (void *ptr, size_t size)
639{ 612{
640 void *p = realloc (ptr, size); 613 void *p = realloc (ptr, size);
641 614
642 if (!p) 615 if (!p)
643 rxvt_fatal ("memory allocation failure. aborting.\n"); 616 rxvt_fatal ("memory allocation failure. aborting.\n");
644 617
645 return p; 618 return p;
646} 619}
647
648/* ------------------------------------------------------------------------- *
649 * PRIVILEGED OPERATIONS *
650 * ------------------------------------------------------------------------- */
651/* take care of suid/sgid super-user (root) privileges */
652void
653rxvt_privileges (rxvt_privaction action)
654{
655#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
656 static uid_t euid;
657 static gid_t egid;
658#endif
659
660#if ! defined(__CYGWIN32__)
661# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
662 /* setreuid () is the poor man's setuid (), seteuid () */
663# define seteuid(a) setreuid(-1, (a))
664# define setegid(a) setregid(-1, (a))
665# define HAVE_SETEUID
666# endif
667# ifdef HAVE_SETEUID
668 switch (action)
669 {
670 case IGNORE:
671 /*
672 * change effective uid/gid - not real uid/gid - so we can switch
673 * back to root later, as required
674 */
675 seteuid (getuid ());
676 setegid (getgid ());
677 break;
678 case SAVE:
679 euid = geteuid ();
680 egid = getegid ();
681 break;
682 case RESTORE:
683 seteuid (euid);
684 setegid (egid);
685 break;
686 }
687# else
688 switch (action)
689 {
690 case IGNORE:
691 setuid (getuid ());
692 setgid (getgid ());
693 /* FALLTHROUGH */
694 case SAVE:
695 /* FALLTHROUGH */
696 case RESTORE:
697 break;
698 }
699# endif
700#endif
701}
702
703#ifdef UTMP_SUPPORT
704void
705rxvt_term::privileged_utmp (rxvt_privaction action)
706{
707 if (OPTION (Opt_utmpInhibit)
708 || !pty.name || !*pty.name)
709 return;
710
711 rxvt_privileges (RESTORE);
712
713 if (action == SAVE)
714 makeutent (pty.name, rs[Rs_display_name]);
715 else
716 cleanutent ();
717
718 rxvt_privileges (IGNORE);
719}
720#endif
721 620
722/*----------------------------------------------------------------------*/ 621/*----------------------------------------------------------------------*/
723/* 622/*
724 * window size/position calculcations for XSizeHint and other storage. 623 * window size/position calculcations for XSizeHint and other storage.
725 * if width/height are non-zero then override calculated width/height 624 * if width/height are non-zero then override calculated width/height
726 */ 625 */
727void 626void
728rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 627rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
729{ 628{
730 short recalc_x, recalc_y; 629 short recalc_x, recalc_y;
731 int x, y, sb_w, mb_h, flags; 630 int x, y, sb_w, flags;
732 unsigned int w, h; 631 unsigned int w, h;
733 unsigned int max_width, max_height; 632 unsigned int max_width, max_height;
734 dDisp;
735
736 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
737 ncol, nrow, szHint.width, szHint.height));
738 633
739 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 634 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
740 szHint.win_gravity = NorthWestGravity; 635 szHint.win_gravity = NorthWestGravity;
741 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 636 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
742 637
… …
797 max_width = MAX_COLS * fwidth; 692 max_width = MAX_COLS * fwidth;
798 max_height = MAX_ROWS * fheight; 693 max_height = MAX_ROWS * fheight;
799 694
800 szHint.base_width = szHint.base_height = 2 * int_bwidth; 695 szHint.base_width = szHint.base_height = 2 * int_bwidth;
801 696
802 sb_w = mb_h = 0; 697 sb_w = 0;
803 window_vt_x = window_vt_y = int_bwidth; 698 window_vt_x = window_vt_y = int_bwidth;
804 699
805 if (scrollbar_visible ()) 700 if (scrollBar.state)
806 { 701 {
807 sb_w = scrollbar_TotalWidth (); 702 sb_w = scrollbar_TotalWidth ();
808 szHint.base_width += sb_w; 703 szHint.base_width += sb_w;
704
809 if (!OPTION (Opt_scrollBar_right)) 705 if (!OPTION (Opt_scrollBar_right))
810 window_vt_x += sb_w; 706 window_vt_x += sb_w;
811 }
812
813 if (menubar_visible ())
814 {
815 mb_h = menuBar_TotalHeight ();
816 szHint.base_height += mb_h;
817 window_vt_y += mb_h;
818 } 707 }
819 708
820 szHint.width_inc = fwidth; 709 szHint.width_inc = fwidth;
821 szHint.height_inc = fheight; 710 szHint.height_inc = fheight;
822 szHint.min_width = szHint.base_width + szHint.width_inc; 711 szHint.min_width = szHint.base_width + szHint.width_inc;
… …
842 { 731 {
843 min_it (height, max_height); 732 min_it (height, max_height);
844 szHint.height = szHint.base_height + height; 733 szHint.height = szHint.base_height + height;
845 } 734 }
846 735
847 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 736 if (scrollBar.state && OPTION (Opt_scrollBar_right))
848 window_sb_x = szHint.width - sb_w; 737 window_sb_x = szHint.width - sb_w;
849 738
850 if (recalc_x) 739 if (recalc_x)
851 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 740 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
741
852 if (recalc_y) 742 if (recalc_y)
853 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 743 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
854 744
855 ncol = width / fwidth; 745 ncol = width / fwidth;
856 nrow = height / fheight; 746 nrow = height / fheight;
857 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
858 ncol, nrow, szHint.width,
859 szHint.height));
860 return;
861} 747}
862 748
863/*----------------------------------------------------------------------*/ 749/*----------------------------------------------------------------------*/
864/* 750/*
865 * Tell the teletype handler what size the window is. 751 * Tell the teletype handler what size the window is.
866 * Called after a window size change. 752 * Called after a window size change.
867 */ 753 */
868void 754void
869rxvt_term::tt_winch () 755rxvt_term::tt_winch ()
870{ 756{
871 if (pty.pty < 0) 757 if (pty->pty < 0)
872 return; 758 return;
873 759
874 struct winsize ws; 760 struct winsize ws;
875 761
876 ws.ws_col = ncol; 762 ws.ws_col = ncol;
877 ws.ws_row = nrow; 763 ws.ws_row = nrow;
878 ws.ws_xpixel = width; 764 ws.ws_xpixel = width;
879 ws.ws_ypixel = height; 765 ws.ws_ypixel = height;
880 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 766 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
881 767
882#if 0 768#if 0
883 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 769 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
884 if (cmd_pid) /* force through to the command */ 770 if (cmd_pid) /* force through to the command */
885 kill (-cmd_pid, SIGWINCH); 771 kill (-cmd_pid, SIGWINCH);
… …
921 prop.height += lineSpace; 807 prop.height += lineSpace;
922 fs->set_prop (prop); 808 fs->set_prop (prop);
923 809
924 fwidth = prop.width; 810 fwidth = prop.width;
925 fheight = prop.height; 811 fheight = prop.height;
926 fbase = (*fs)[1]->ascent; 812 fbase = prop.ascent;
927 813
928 for (int style = 1; style < 4; style++) 814 for (int style = 1; style < 4; style++)
929 { 815 {
930#if ENABLE_STYLES 816#if ENABLE_STYLES
931 const char *res = rs[Rs_font + style]; 817 const char *res = rs[Rs_font + style];
… …
965 return true; 851 return true;
966} 852}
967 853
968void rxvt_term::set_string_property (Atom prop, const char *str, int len) 854void rxvt_term::set_string_property (Atom prop, const char *str, int len)
969{ 855{
970 XChangeProperty (display->display, parent[0], 856 XChangeProperty (xdisp, parent[0],
971 prop, XA_STRING, 8, PropModeReplace, 857 prop, XA_STRING, 8, PropModeReplace,
972 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 858 (const unsigned char *)str, len >= 0 ? len : strlen (str));
973} 859}
974 860
975void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 861void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
976{ 862{
977 wchar_t *ws = rxvt_mbstowcs (str, len); 863 wchar_t *ws = rxvt_mbstowcs (str, len);
978 char *s = rxvt_wcstoutf8 (ws); 864 char *s = rxvt_wcstoutf8 (ws);
979 865
980 XChangeProperty (display->display, parent[0], 866 XChangeProperty (xdisp, parent[0],
981 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
982 (const unsigned char *)s, strlen (s)); 868 (const unsigned char *)s, strlen (s));
983 869
984 free (s); 870 free (s);
985 free (ws); 871 free (ws);
… …
1010void 896void
1011rxvt_term::set_window_color (int idx, const char *color) 897rxvt_term::set_window_color (int idx, const char *color)
1012{ 898{
1013 rxvt_color xcol; 899 rxvt_color xcol;
1014 int i; 900 int i;
1015 901
1016 if (color == NULL || *color == '\0') 902 if (color == NULL || *color == '\0')
1017 return; 903 return;
904
905 color = strdup (color);
906 allocated.push_back ((void *)color);
907 rs[Rs_color + idx] = color;
1018 908
1019 /* handle color aliases */ 909 /* handle color aliases */
1020 if (isdigit (*color)) 910 if (isdigit (*color))
1021 { 911 {
1022 i = atoi (color); 912 i = atoi (color);
1023 913
1024 if (i >= 8 && i <= 15) 914 if (i >= 8 && i <= 15)
1025 { /* bright colors */ 915 { /* bright colors */
1026 i -= 8; 916 i -= 8;
1027# ifndef NO_BRIGHTCOLOR
1028 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 917 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1029 SET_PIXCOLOR (idx);
1030 goto done; 918 goto done;
1031# endif
1032 } 919 }
1033 920
1034 if (i >= 0 && i <= 7) 921 if (i >= 0 && i <= 7)
1035 { /* normal colors */ 922 { /* normal colors */
1036 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 923 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1037 SET_PIXCOLOR (idx);
1038 goto done; 924 goto done;
1039 } 925 }
1040 } 926 }
1041 927
1042 if (!rXParseAllocColor (&xcol, color)) 928 set_color (xcol, color);
1043 return;
1044
1045 /* XStoreColor (display->display, display->cmap, XColor*); */
1046 929
1047 /* 930 /*
1048 * FIXME: should free colors here, but no idea how to do it so instead, 931 * FIXME: should free colors here, but no idea how to do it so instead,
1049 * so just keep gobbling up the colormap 932 * so just keep gobbling up the colormap
1050 */ 933 */
1051# if 0
1052 for (i = Color_Black; i <= Color_White; i++)
1053 if (pix_colors[idx] == pix_colors[i])
1054 break;
1055 if (i > Color_White)
1056 {
1057 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1058 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1059 DisplayPlanes (display->display, display->screen));
1060 }
1061# endif
1062 934
1063 pix_colors_focused[idx] = xcol; 935 pix_colors_focused[idx] = xcol;
1064 SET_PIXCOLOR (idx);
1065 936
1066 /* XSetWindowAttributes attr; */ 937 /* XSetWindowAttributes attr; */
1067 /* Cursor cursor; */ 938 /* Cursor cursor; */
1068done: 939done:
1069 940
1070#if OFF_FOCUS_FADING 941#if OFF_FOCUS_FADING
1071 if (rs[Rs_fade]) 942 if (rs[Rs_fade])
1072 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 943 {
944 rgba c;
945 pix_colors [Color_fade].get (c);
946 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
947 }
1073#endif 948#endif
1074 949
1075 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
1076 951
1077 recolour_cursor (); 952 recolour_cursor ();
… …
1083#endif /* XTERM_COLOR_CHANGE */ 958#endif /* XTERM_COLOR_CHANGE */
1084 959
1085void 960void
1086rxvt_term::recolour_cursor () 961rxvt_term::recolour_cursor ()
1087{ 962{
1088 XColor xcol[2]; 963 XColor fg, bg;
1089 964
1090 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 965 (ISSET_PIXCOLOR (Color_pointer_fg)
1091 ? pix_colors_focused[Color_pointer_fg] 966 ? pix_colors_focused[Color_pointer_fg]
1092 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg]).get (fg);
968
1093 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 969 (ISSET_PIXCOLOR (Color_pointer_bg)
1094 ? pix_colors_focused[Color_pointer_bg] 970 ? pix_colors_focused[Color_pointer_bg]
1095 : pix_colors_focused[Color_bg]; 971 : pix_colors_focused[Color_bg]).get (bg);
1096 972
1097 XQueryColors (display->display, display->cmap, xcol, 2); 973 XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg);
1098 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1099} 974}
1100 975
1101/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1102/* 977/*
1103 * find if fg/bg matches any of the normal (low-intensity) colors 978 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1107{ 982{
1108 unsigned int i; 983 unsigned int i;
1109 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1110 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1111 986
1112 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1113 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1114 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1115 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1116 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1117 { 991 {
… …
1132 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1133} 1007}
1134 1008
1135/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1136 1010
1137int 1011bool
1138rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::set_color (rxvt_color &color, const char *name)
1139{ 1013{
1140 if (!screen_in_out->set (display, colour)) 1014 if (color.set (this, name))
1141 {
1142 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1143 return false;
1144 }
1145
1146 return true; 1015 return true;
1016
1017 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1018 return false;
1019}
1020
1021void
1022rxvt_term::alias_color (int dst, int src)
1023{
1024 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1147} 1025}
1148 1026
1149/* -------------------------------------------------------------------- * 1027/* -------------------------------------------------------------------- *
1150 * - WINDOW RESIZING - * 1028 * - WINDOW RESIZING - *
1151 * -------------------------------------------------------------------- */ 1029 * -------------------------------------------------------------------- */
1152void 1030void
1153rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1031rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1154{ 1032{
1155 int fix_screen; 1033 int fix_screen;
1156 int old_width = szHint.width, old_height = szHint.height; 1034 int old_width = szHint.width;
1157 dDisp; 1035 int old_height = szHint.height;
1158 1036
1159 window_calc (newwidth, newheight); 1037 window_calc (newwidth, newheight);
1160 XSetWMNormalHints (disp, parent[0], &szHint); 1038 XSetWMNormalHints (xdisp, parent[0], &szHint);
1161 1039
1162 if (!ignoreparent) 1040 if (!ignoreparent)
1163 { 1041 {
1164#ifdef SMART_RESIZE 1042#ifdef SMART_RESIZE
1165 /* 1043 /*
… …
1169 int x, y, x1, y1; 1047 int x, y, x1, y1;
1170 int dx, dy; 1048 int dx, dy;
1171 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1049 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1172 Window unused_cr; 1050 Window unused_cr;
1173 1051
1174 XTranslateCoordinates (disp, parent[0], display->root, 1052 XTranslateCoordinates (xdisp, parent[0], display->root,
1175 0, 0, &x, &y, &unused_cr); 1053 0, 0, &x, &y, &unused_cr);
1176 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1054 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1177 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1055 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1178 /* 1056 /*
1179 * if display->root isn't the parent window, a WM will probably have offset 1057 * if display->root isn't the parent window, a WM will probably have offset
1180 * our position for handles and decorations. Counter it 1058 * our position for handles and decorations. Counter it
1181 */ 1059 */
… …
1183 { 1061 {
1184 x -= x1; 1062 x -= x1;
1185 y -= y1; 1063 y -= y1;
1186 } 1064 }
1187 1065
1188 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1066 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1189 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1067 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1190 dx = old_width - szHint.width; 1068 dx = old_width - szHint.width;
1191 dy = old_height - szHint.height; 1069 dy = old_height - szHint.height;
1192 1070
1193 /* Check position of the center of the window */ 1071 /* Check position of the center of the window */
1194 if (x < x1) /* left half */ 1072 if (x < x1) /* left half */
1195 dx = 0; 1073 dx = 0;
… …
1198 if (y < y1) /* top half */ 1076 if (y < y1) /* top half */
1199 dy = 0; 1077 dy = 0;
1200 else if (y == y1) /* exact center */ 1078 else if (y == y1) /* exact center */
1201 dy /= 2; 1079 dy /= 2;
1202 1080
1203 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1081 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1204 szHint.width, szHint.height); 1082 szHint.width, szHint.height);
1205#else 1083#else
1206 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1084 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1207#endif 1085#endif
1208 } 1086 }
1209 1087
1210 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1088 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1211 1089
1212 if (fix_screen || newwidth != old_width || newheight != old_height) 1090 if (fix_screen || newwidth != old_width || newheight != old_height)
1213 { 1091 {
1214 if (scrollbar_visible ()) 1092 if (scrollBar.state)
1215 { 1093 {
1216 XMoveResizeWindow (disp, scrollBar.win, 1094 XMoveResizeWindow (xdisp, scrollBar.win,
1217 window_sb_x, 0, 1095 window_sb_x, 0,
1218 scrollbar_TotalWidth (), szHint.height); 1096 scrollbar_TotalWidth (), szHint.height);
1219 resize_scrollbar (); 1097 resize_scrollbar ();
1220 } 1098 }
1221 1099
1222 if (menubar_visible ())
1223 XMoveResizeWindow (disp, menuBar.win,
1224 window_vt_x, 0,
1225 TermWin_TotalWidth (), menuBar_TotalHeight ());
1226
1227 XMoveResizeWindow (disp, vt, 1100 XMoveResizeWindow (xdisp, vt,
1228 window_vt_x, window_vt_y, 1101 window_vt_x, window_vt_y,
1229 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1102 width, height);
1230 1103
1231 scr_clear (); 1104 scr_clear ();
1232#ifdef XPM_BACKGROUND 1105#ifdef XPM_BACKGROUND
1233 resize_pixmap (); 1106 resize_pixmap ();
1234#endif 1107#endif
1235 } 1108 }
1236 1109
1237 if (fix_screen || old_height == 0) 1110 if (fix_screen || old_height == 0)
1238 {
1239 int curr_screen = -1;
1240 int old_ncol = prev_ncol;
1241
1242 /* scr_reset only works on the primary screen */
1243 if (old_height) /* this is not the first time through */
1244 {
1245 unsigned int ocol = ncol;
1246 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1247 curr_screen = scr_change_screen (PRIMARY);
1248 ncol = ocol;
1249 }
1250
1251 scr_reset (); 1111 scr_reset ();
1252
1253 if (curr_screen >= 0) /* this is not the first time through */
1254 {
1255 scr_change_screen (curr_screen);
1256 selection_check (old_ncol != ncol ? 4 : 0);
1257 }
1258 }
1259
1260 old_width = szHint.width;
1261 old_height = szHint.height;
1262 1112
1263#ifdef XPM_BACKGROUND 1113#ifdef XPM_BACKGROUND
1264 if (pixmap) 1114 if (pixmap)
1265 scr_touch (false); 1115 scr_touch (false);
1266#endif 1116#endif
… …
1279{ 1129{
1280 XWindowAttributes wattr; 1130 XWindowAttributes wattr;
1281 1131
1282 if (newwidth == 0 || newheight == 0) 1132 if (newwidth == 0 || newheight == 0)
1283 { 1133 {
1284 XGetWindowAttributes (display->display, display->root, &wattr); 1134 XGetWindowAttributes (xdisp, display->root, &wattr);
1285 1135
1286 if (newwidth == 0) 1136 if (newwidth == 0)
1287 newwidth = wattr.width - szHint.base_width; 1137 newwidth = wattr.width - szHint.base_width;
1288 if (newheight == 0) 1138 if (newheight == 0)
1289 newheight = wattr.height - szHint.base_height; 1139 newheight = wattr.height - szHint.base_height;
… …
1303#ifdef USE_XIM 1153#ifdef USE_XIM
1304 1154
1305void 1155void
1306rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1156rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1307{ 1157{
1308 fg = pix_colors[Color_fg]; 1158 fg = pix_colors [Color_fg];
1309 bg = pix_colors[Color_bg]; 1159 bg = pix_colors [Color_bg];
1310} 1160}
1311 1161
1312void 1162void
1313rxvt_term::im_set_size (XRectangle &size) 1163rxvt_term::im_set_size (XRectangle &size)
1314{ 1164{
… …
1351 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1201 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1352 1202
1353 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1203 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1354 *p = '\0'; 1204 *p = '\0';
1355 1205
1356 atom = XInternAtom (display->display, server, False); 1206 atom = XInternAtom (xdisp, server, False);
1357 win = XGetSelectionOwner (display->display, atom); 1207 win = XGetSelectionOwner (xdisp, atom);
1358 1208
1359 if (win != None) 1209 if (win != None)
1360 return True; 1210 return True;
1361 } 1211 }
1362 1212
… …
1369 XPoint nspot; 1219 XPoint nspot;
1370 XVaNestedList preedit_attr; 1220 XVaNestedList preedit_attr;
1371 1221
1372 if (!Input_Context 1222 if (!Input_Context
1373 || !focus 1223 || !focus
1374 || !(input_style & XIMPreeditPosition)) 1224 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1375 return; 1225 return;
1376 1226
1377 im_set_position (nspot); 1227 im_set_position (nspot);
1378 1228
1379 if (nspot.x == spot.x && nspot.y == spot.y) 1229 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1398 input_method = 0; 1248 input_method = 0;
1399 } 1249 }
1400 1250
1401 Input_Context = 0; 1251 Input_Context = 0;
1402} 1252}
1253
1254#ifdef ENABLE_XIM_ONTHESPOT
1255
1256static void
1257xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1258{
1259 ((rxvt_term *)client_data)->make_current ();
1260 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1261}
1262
1263static void
1264xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1265{
1266 ((rxvt_term *)client_data)->make_current ();
1267 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1268}
1269
1270static void
1271xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1272{
1273 rxvt_term *term = (rxvt_term *)client_data;
1274 XIMText *text = call_data->text;
1275
1276 term->make_current ();
1277
1278 if (text)
1279 {
1280 void *str;
1281
1282 if (!text->encoding_is_wchar && text->string.multi_byte)
1283 {
1284 // of course, X makes it ugly again
1285 if (term->rs[Rs_imLocale])
1286 SET_LOCALE (term->rs[Rs_imLocale]);
1287
1288 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1289 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1290
1291 if (term->rs[Rs_imLocale])
1292 SET_LOCALE (term->locale);
1293 }
1294 else
1295 str = (void *)text->string.wide_char;
1296
1297 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1298 DT_INT, call_data->caret,
1299 DT_INT, call_data->chg_first,
1300 DT_INT, call_data->chg_length,
1301 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1302 DT_WCS_LEN, str, str ? (int)text->length : 0,
1303 DT_END));
1304 }
1305 else
1306 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1307 DT_INT, call_data->caret,
1308 DT_INT, call_data->chg_first,
1309 DT_INT, call_data->chg_length,
1310 DT_END));
1311}
1312
1313#if 0
1314static void
1315xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1316{
1317 ((rxvt_term *)client_data)->make_current ();
1318 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1319 DT_INT, call_data->position,
1320 DT_INT, call_data->direction,
1321 DT_INT, call_data->style,
1322 DT_END));
1323}
1324#endif
1325
1326#endif
1403 1327
1404/* 1328/*
1405 * Try to open a XIM with the current modifiers, then see if we can 1329 * Try to open a XIM with the current modifiers, then see if we can
1406 * open a suitable preedit type 1330 * open a suitable preedit type
1407 */ 1331 */
… …
1414 XRectangle rect, status_rect, needed_rect; 1338 XRectangle rect, status_rect, needed_rect;
1415 unsigned long fg, bg; 1339 unsigned long fg, bg;
1416 const char *p; 1340 const char *p;
1417 char **s; 1341 char **s;
1418 XIMStyles *xim_styles; 1342 XIMStyles *xim_styles;
1343#ifdef ENABLE_XIM_ONTHESPOT
1344 XIMCallback xcb[4];
1345#endif
1346
1347 set_environ (envv);
1419 1348
1420 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1349 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1421 return false; 1350 return false;
1422 1351
1423 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1424 input_method = display->get_xim (locale, modifiers); 1352 input_method = display->get_xim (locale, modifiers);
1425 if (input_method == NULL) 1353 if (input_method == NULL)
1426 return false; 1354 return false;
1427 1355
1428 xim = input_method->xim; 1356 xim = input_method->xim;
… …
1448 s = rxvt_splitcommastring (p); 1376 s = rxvt_splitcommastring (p);
1449 1377
1450 for (i = found = 0; !found && s[i]; i++) 1378 for (i = found = 0; !found && s[i]; i++)
1451 { 1379 {
1452 if (!strcmp (s[i], "OverTheSpot")) 1380 if (!strcmp (s[i], "OverTheSpot"))
1453 input_style = (XIMPreeditPosition | XIMStatusNothing); 1381 input_style = XIMPreeditPosition | XIMStatusNothing;
1454 else if (!strcmp (s[i], "OffTheSpot")) 1382 else if (!strcmp (s[i], "OffTheSpot"))
1455 input_style = (XIMPreeditArea | XIMStatusArea); 1383 input_style = XIMPreeditArea | XIMStatusArea;
1456 else if (!strcmp (s[i], "Root")) 1384 else if (!strcmp (s[i], "Root"))
1457 input_style = (XIMPreeditNothing | XIMStatusNothing); 1385 input_style = XIMPreeditNothing | XIMStatusNothing;
1458 else if (!strcmp (s[i], "None")) 1386 else if (!strcmp (s[i], "None"))
1459 input_style = (XIMPreeditNone | XIMStatusNone); 1387 input_style = XIMPreeditNone | XIMStatusNone;
1388#ifdef ENABLE_XIM_ONTHESPOT
1389 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1390 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1391#endif
1392 else
1393 input_style = XIMPreeditNothing | XIMStatusNothing;
1460 1394
1461 for (j = 0; j < xim_styles->count_styles; j++) 1395 for (j = 0; j < xim_styles->count_styles; j++)
1462 if (input_style == xim_styles->supported_styles[j]) 1396 if (input_style == xim_styles->supported_styles[j])
1463 { 1397 {
1464 rxvt_freecommastring (s); 1398 rxvt_freecommastring (s);
… …
1502 "*", 1436 "*",
1503 fheight, 1437 fheight,
1504 fheight + 1, fheight - 1, 1438 fheight + 1, fheight - 1,
1505 fheight - 2, fheight + 2); 1439 fheight - 2, fheight + 2);
1506 1440
1507 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1441 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1508 &missing_charset_list, &missing_charset_count, &def_string); 1442 &missing_charset_list, &missing_charset_count, &def_string);
1509 1443
1510 if (missing_charset_list) 1444 if (missing_charset_list)
1511 XFreeStringList (missing_charset_list); 1445 XFreeStringList (missing_charset_list);
1512 1446
… …
1553 XNBackground, bg, 1487 XNBackground, bg,
1554 XNArea, &status_rect, 1488 XNArea, &status_rect,
1555 XNFontSet, fs, 1489 XNFontSet, fs,
1556 NULL); 1490 NULL);
1557 } 1491 }
1492#if ENABLE_XIM_ONTHESPOT
1493 else if (input_style & XIMPreeditCallbacks)
1494 {
1495 im_set_position (spot);
1496
1497 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1498 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1499 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1500# if 0
1501 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1502# endif
1503
1504 preedit_attr = XVaCreateNestedList (0,
1505 XNSpotLocation, &spot,
1506 XNPreeditStartCallback, &xcb[0],
1507 XNPreeditDoneCallback , &xcb[1],
1508 XNPreeditDrawCallback , &xcb[2],
1509# if 0
1510 XNPreeditCaretCallback, &xcb[3],
1511# endif
1512 NULL);
1513 }
1514#endif
1558 1515
1559 Input_Context = XCreateIC (xim, 1516 Input_Context = XCreateIC (xim,
1560 XNInputStyle, input_style, 1517 XNInputStyle, input_style,
1561 XNClientWindow, vt, 1518 XNClientWindow, vt,
1562 XNFocusWindow, parent[0], 1519 XNFocusWindow, parent[0],
… …
1565 status_attr ? XNStatusAttributes : NULL, 1522 status_attr ? XNStatusAttributes : NULL,
1566 status_attr, NULL); 1523 status_attr, NULL);
1567 1524
1568 if (preedit_attr) XFree (preedit_attr); 1525 if (preedit_attr) XFree (preedit_attr);
1569 if (status_attr) XFree (status_attr); 1526 if (status_attr) XFree (status_attr);
1570 if (fs) XFreeFontSet (display->display, fs); 1527 if (fs) XFreeFontSet (xdisp, fs);
1571 1528
1572 if (Input_Context == NULL) 1529 if (Input_Context == NULL)
1573 { 1530 {
1574 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1531 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1575 im_destroy (); 1532 im_destroy ();
1576 return false; 1533 return false;
1577 } 1534 }
1578 1535
1536#if 0
1537 // unfortunately, only the focus window is used by XIM, hard to fix
1538 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1539 vt_select_input ();
1540#endif
1541
1579 if (input_style & XIMPreeditArea) 1542 if (input_style & XIMPreeditArea)
1580 IMSetStatusPosition (); 1543 IMSetStatusPosition ();
1581 1544
1582 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1583 return true; 1545 return true;
1584} 1546}
1585 1547
1586void 1548void
1587rxvt_term::im_cb () 1549rxvt_term::im_cb ()
… …
1589 int i; 1551 int i;
1590 const char *p; 1552 const char *p;
1591 char **s; 1553 char **s;
1592 char buf[IMBUFSIZ]; 1554 char buf[IMBUFSIZ];
1593 1555
1594 SET_R (this); 1556 make_current ();
1595 1557
1596 im_destroy (); 1558 im_destroy ();
1597 1559
1598 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1599 if (Input_Context) 1560 if (Input_Context)
1600 return; 1561 return;
1601 1562
1602#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1563#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1603 if (rs[Rs_imLocale]) 1564 if (rs[Rs_imLocale])
… …
1676 XFree (preedit_attr); 1637 XFree (preedit_attr);
1677 XFree (status_attr); 1638 XFree (status_attr);
1678} 1639}
1679#endif /* USE_XIM */ 1640#endif /* USE_XIM */
1680 1641
1681/*----------------------------------------------------------------------*/
1682rxvt_t rxvt_current_term;
1683
1684/*----------------------- end-of-file (C source) -----------------------*/ 1642/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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