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

Diff Legend

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