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.164 by root, Fri Jan 6 05:37:59 2006 UTC vs.
Revision 1.217 by root, Thu Feb 2 18:00:23 2006 UTC

… …
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 HOOK_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 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495 {
496 rxvt_perl.init ();
497 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
498 }
499#endif
500 485
501 create_windows (argc, argv); 486 create_windows (argc, argv);
502 487
503 dDisp;
504
505 init_xlocale (); 488 init_xlocale ();
506 489
507 scr_reset (); /* initialize screen */ 490 scr_reset (); // initialize screen
508 491
509#if 0 492#if 0
510 XSynchronize (disp, True); 493 XSynchronize (xdisp, True);
511#endif 494#endif
512 495
513#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
514 if (OPTION (Opt_scrollBar)) 497 if (OPTION (Opt_scrollBar))
515 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
516#endif 499#endif
517#if (MENUBAR_MAX)
518 if (menubar_visible ())
519 XMapWindow (disp, menuBar.win);
520#endif
521#ifdef TRANSPARENT 500#ifdef TRANSPARENT
522 if (OPTION (Opt_transparent)) 501 if (OPTION (Opt_transparent))
523 { 502 {
524 XSelectInput (disp, display->root, PropertyChangeMask); 503 XSelectInput (xdisp, display->root, PropertyChangeMask);
525 check_our_parents (); 504 check_our_parents ();
526 rootwin_ev.start (display, display->root); 505 rootwin_ev.start (display, display->root);
527 } 506 }
528#endif 507#endif
529 508
530 XMapWindow (disp, vt);
531 XMapWindow (disp, parent[0]);
532
533 set_colorfgbg (); 509 set_colorfgbg ();
534 510
535 init_command (cmd_argv); 511 init_command (cmd_argv);
536 512
537 free (cmd_argv); 513 free (cmd_argv);
538 514
539 if (pty.pty >= 0) 515 if (pty->pty >= 0)
540 pty_ev.start (pty.pty, EVENT_READ); 516 pty_ev.start (pty->pty, EVENT_READ);
541 517
542 check_ev.start (); 518 check_ev.start ();
543 519
544 HOOK_INVOKE ((this, HOOK_START, DT_END)); 520 HOOK_INVOKE ((this, HOOK_START, DT_END));
545 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]);
534
546 return true; 535 return true;
547} 536}
548 537
549static struct sig_handlers 538static struct sig_handlers
550{ 539{
551 sig_watcher sw_chld, sw_term, sw_int; 540 sig_watcher sw_term, sw_int;
552 541
553 void sig_chld (sig_watcher &w)
554 {
555 // we are being called for every SIGCHLD, find the corresponding term
556 int pid;
557
558 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
559 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
560 if (pid == (*t)->cmd_pid)
561 {
562 (*t)->child_exit ();
563 break;
564 }
565 }
566
567 /* 542 /*
568 * Catch a fatal signal and tidy up before quitting 543 * Catch a fatal signal and tidy up before quitting
569 */ 544 */
570 void 545 void
571 sig_term (sig_watcher &w) 546 sig_term (sig_watcher &w)
572 { 547 {
573#ifdef DEBUG_CMD
574 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
575#endif
576 rxvt_emergency_cleanup (); 548 rxvt_emergency_cleanup ();
577 signal (w.signum, SIG_DFL); 549 signal (w.signum, SIG_DFL);
578 kill (getpid (), w.signum); 550 kill (getpid (), w.signum);
579 } 551 }
580 552
581 sig_handlers () 553 sig_handlers ()
582 : sw_chld (this, &sig_handlers::sig_chld),
583 sw_term (this, &sig_handlers::sig_term), 554 : sw_term (this, &sig_handlers::sig_term),
584 sw_int (this, &sig_handlers::sig_term) 555 sw_int (this, &sig_handlers::sig_term)
585 { 556 {
586 } 557 }
587} sig_handlers; 558} sig_handlers;
588 559
560char **rxvt_environ; // startup environment
561
589void 562void
590rxvt_init () 563rxvt_init ()
591{ 564{
592 /* 565 ptytty::init ();
593 * Save and then give up any super-user privileges 566
594 * If we need privileges in any area then we must specifically request it. 567 rxvt_environ = environ;
595 * We should only need to be root in these cases:
596 * 1. write utmp entries on some systems
597 * 2. chown tty on some systems
598 */
599 rxvt_privileges (SAVE);
600 rxvt_privileges (IGNORE);
601 568
602 signal (SIGHUP, SIG_IGN); 569 signal (SIGHUP, SIG_IGN);
603 signal (SIGPIPE, SIG_IGN); 570 signal (SIGPIPE, SIG_IGN);
604 571
605 sig_handlers.sw_chld.start (SIGCHLD);
606 sig_handlers.sw_term.start (SIGTERM); 572 sig_handlers.sw_term.start (SIGTERM);
607 sig_handlers.sw_int.start (SIGINT); 573 sig_handlers.sw_int.start (SIGINT);
608 574
609 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 575 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
610 /* signal (SIGURG, SIG_DFL); */ 576 /* signal (SIGURG, SIG_DFL); */
611 577
612 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 578 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
613 // TODO: handle this with exceptions and tolerate the memory loss 579 // TODO: handle this with exceptions and tolerate the memory loss
614 XSetIOErrorHandler (rxvt_xioerror_handler); 580 XSetIOErrorHandler (rxvt_xioerror_handler);
581
582 XrmInitialize ();
615} 583}
616 584
617/* ------------------------------------------------------------------------- * 585/* ------------------------------------------------------------------------- *
618 * MEMORY ALLOCATION WRAPPERS * 586 * MEMORY ALLOCATION WRAPPERS *
619 * ------------------------------------------------------------------------- */ 587 * ------------------------------------------------------------------------- */
… …
637 rxvt_fatal ("memory allocation failure. aborting.\n"); 605 rxvt_fatal ("memory allocation failure. aborting.\n");
638 606
639 return p; 607 return p;
640} 608}
641 609
642void * 610void *
643rxvt_realloc (void *ptr, size_t size) 611rxvt_realloc (void *ptr, size_t size)
644{ 612{
645 void *p = realloc (ptr, size); 613 void *p = realloc (ptr, size);
646 614
647 if (!p) 615 if (!p)
648 rxvt_fatal ("memory allocation failure. aborting.\n"); 616 rxvt_fatal ("memory allocation failure. aborting.\n");
649 617
650 return p; 618 return p;
651} 619}
652
653/* ------------------------------------------------------------------------- *
654 * PRIVILEGED OPERATIONS *
655 * ------------------------------------------------------------------------- */
656/* take care of suid/sgid super-user (root) privileges */
657void
658rxvt_privileges (rxvt_privaction action)
659{
660#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
661 static uid_t euid;
662 static gid_t egid;
663#endif
664
665#if ! defined(__CYGWIN32__)
666# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
667 /* setreuid () is the poor man's setuid (), seteuid () */
668# define seteuid(a) setreuid(-1, (a))
669# define setegid(a) setregid(-1, (a))
670# define HAVE_SETEUID
671# endif
672# ifdef HAVE_SETEUID
673 switch (action)
674 {
675 case IGNORE:
676 /*
677 * change effective uid/gid - not real uid/gid - so we can switch
678 * back to root later, as required
679 */
680 seteuid (getuid ());
681 setegid (getgid ());
682 break;
683 case SAVE:
684 euid = geteuid ();
685 egid = getegid ();
686 break;
687 case RESTORE:
688 seteuid (euid);
689 setegid (egid);
690 break;
691 }
692# else
693 switch (action)
694 {
695 case IGNORE:
696 setuid (getuid ());
697 setgid (getgid ());
698 /* FALLTHROUGH */
699 case SAVE:
700 /* FALLTHROUGH */
701 case RESTORE:
702 break;
703 }
704# endif
705#endif
706}
707
708#ifdef UTMP_SUPPORT
709void
710rxvt_term::privileged_utmp (rxvt_privaction action)
711{
712 if (OPTION (Opt_utmpInhibit)
713 || !pty.name || !*pty.name)
714 return;
715
716 rxvt_privileges (RESTORE);
717
718 if (action == SAVE)
719 makeutent (pty.name, rs[Rs_display_name]);
720 else
721 cleanutent ();
722
723 rxvt_privileges (IGNORE);
724}
725#endif
726 620
727/*----------------------------------------------------------------------*/ 621/*----------------------------------------------------------------------*/
728/* 622/*
729 * window size/position calculcations for XSizeHint and other storage. 623 * window size/position calculcations for XSizeHint and other storage.
730 * if width/height are non-zero then override calculated width/height 624 * if width/height are non-zero then override calculated width/height
731 */ 625 */
732void 626void
733rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 627rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
734{ 628{
735 short recalc_x, recalc_y; 629 short recalc_x, recalc_y;
736 int x, y, sb_w, mb_h, flags; 630 int x, y, sb_w, flags;
737 unsigned int w, h; 631 unsigned int w, h;
738 unsigned int max_width, max_height; 632 unsigned int max_width, max_height;
739 dDisp;
740
741 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
742 ncol, nrow, szHint.width, szHint.height));
743 633
744 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 634 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
745 szHint.win_gravity = NorthWestGravity; 635 szHint.win_gravity = NorthWestGravity;
746 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 636 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
747 637
… …
802 max_width = MAX_COLS * fwidth; 692 max_width = MAX_COLS * fwidth;
803 max_height = MAX_ROWS * fheight; 693 max_height = MAX_ROWS * fheight;
804 694
805 szHint.base_width = szHint.base_height = 2 * int_bwidth; 695 szHint.base_width = szHint.base_height = 2 * int_bwidth;
806 696
807 sb_w = mb_h = 0; 697 sb_w = 0;
808 window_vt_x = window_vt_y = int_bwidth; 698 window_vt_x = window_vt_y = int_bwidth;
809 699
810 if (scrollbar_visible ()) 700 if (scrollBar.state)
811 { 701 {
812 sb_w = scrollbar_TotalWidth (); 702 sb_w = scrollbar_TotalWidth ();
813 szHint.base_width += sb_w; 703 szHint.base_width += sb_w;
704
814 if (!OPTION (Opt_scrollBar_right)) 705 if (!OPTION (Opt_scrollBar_right))
815 window_vt_x += sb_w; 706 window_vt_x += sb_w;
816 }
817
818 if (menubar_visible ())
819 {
820 mb_h = menuBar_TotalHeight ();
821 szHint.base_height += mb_h;
822 window_vt_y += mb_h;
823 } 707 }
824 708
825 szHint.width_inc = fwidth; 709 szHint.width_inc = fwidth;
826 szHint.height_inc = fheight; 710 szHint.height_inc = fheight;
827 szHint.min_width = szHint.base_width + szHint.width_inc; 711 szHint.min_width = szHint.base_width + szHint.width_inc;
… …
847 { 731 {
848 min_it (height, max_height); 732 min_it (height, max_height);
849 szHint.height = szHint.base_height + height; 733 szHint.height = szHint.base_height + height;
850 } 734 }
851 735
852 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 736 if (scrollBar.state && OPTION (Opt_scrollBar_right))
853 window_sb_x = szHint.width - sb_w; 737 window_sb_x = szHint.width - sb_w;
854 738
855 if (recalc_x) 739 if (recalc_x)
856 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 740 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
741
857 if (recalc_y) 742 if (recalc_y)
858 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 743 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
859 744
860 ncol = width / fwidth; 745 ncol = width / fwidth;
861 nrow = height / fheight; 746 nrow = height / fheight;
862 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
863 ncol, nrow, szHint.width,
864 szHint.height));
865 return;
866} 747}
867 748
868/*----------------------------------------------------------------------*/ 749/*----------------------------------------------------------------------*/
869/* 750/*
870 * Tell the teletype handler what size the window is. 751 * Tell the teletype handler what size the window is.
871 * Called after a window size change. 752 * Called after a window size change.
872 */ 753 */
873void 754void
874rxvt_term::tt_winch () 755rxvt_term::tt_winch ()
875{ 756{
876 if (pty.pty < 0) 757 if (pty->pty < 0)
877 return; 758 return;
878 759
879 struct winsize ws; 760 struct winsize ws;
880 761
881 ws.ws_col = ncol; 762 ws.ws_col = ncol;
882 ws.ws_row = nrow; 763 ws.ws_row = nrow;
883 ws.ws_xpixel = width; 764 ws.ws_xpixel = width;
884 ws.ws_ypixel = height; 765 ws.ws_ypixel = height;
885 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 766 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
886 767
887#if 0 768#if 0
888 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 769 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
889 if (cmd_pid) /* force through to the command */ 770 if (cmd_pid) /* force through to the command */
890 kill (-cmd_pid, SIGWINCH); 771 kill (-cmd_pid, SIGWINCH);
… …
970 return true; 851 return true;
971} 852}
972 853
973void 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)
974{ 855{
975 XChangeProperty (display->display, parent[0], 856 XChangeProperty (xdisp, parent[0],
976 prop, XA_STRING, 8, PropModeReplace, 857 prop, XA_STRING, 8, PropModeReplace,
977 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 858 (const unsigned char *)str, len >= 0 ? len : strlen (str));
978} 859}
979 860
980void 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)
981{ 862{
982 wchar_t *ws = rxvt_mbstowcs (str, len); 863 wchar_t *ws = rxvt_mbstowcs (str, len);
983 char *s = rxvt_wcstoutf8 (ws); 864 char *s = rxvt_wcstoutf8 (ws);
984 865
985 XChangeProperty (display->display, parent[0], 866 XChangeProperty (xdisp, parent[0],
986 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
987 (const unsigned char *)s, strlen (s)); 868 (const unsigned char *)s, strlen (s));
988 869
989 free (s); 870 free (s);
990 free (ws); 871 free (ws);
… …
1015void 896void
1016rxvt_term::set_window_color (int idx, const char *color) 897rxvt_term::set_window_color (int idx, const char *color)
1017{ 898{
1018 rxvt_color xcol; 899 rxvt_color xcol;
1019 int i; 900 int i;
1020 901
1021 if (color == NULL || *color == '\0') 902 if (color == NULL || *color == '\0')
1022 return; 903 return;
904
905 color = strdup (color);
906 allocated.push_back ((void *)color);
907 rs[Rs_color + idx] = color;
1023 908
1024 /* handle color aliases */ 909 /* handle color aliases */
1025 if (isdigit (*color)) 910 if (isdigit (*color))
1026 { 911 {
1027 i = atoi (color); 912 i = atoi (color);
1028 913
1029 if (i >= 8 && i <= 15) 914 if (i >= 8 && i <= 15)
1030 { /* bright colors */ 915 { /* bright colors */
1031 i -= 8; 916 i -= 8;
1032 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 917 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1033 SET_PIXCOLOR (idx);
1034 goto done; 918 goto done;
1035 } 919 }
1036 920
1037 if (i >= 0 && i <= 7) 921 if (i >= 0 && i <= 7)
1038 { /* normal colors */ 922 { /* normal colors */
1039 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 923 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1040 SET_PIXCOLOR (idx);
1041 goto done; 924 goto done;
1042 } 925 }
1043 } 926 }
1044 927
1045 if (!rXParseAllocColor (&xcol, color)) 928 set_color (xcol, color);
1046 return;
1047
1048 /* XStoreColor (display->display, display->cmap, XColor*); */
1049 929
1050 /* 930 /*
1051 * 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,
1052 * so just keep gobbling up the colormap 932 * so just keep gobbling up the colormap
1053 */ 933 */
1054# if 0
1055 for (i = Color_Black; i <= Color_White; i++)
1056 if (pix_colors[idx] == pix_colors[i])
1057 break;
1058 if (i > Color_White)
1059 {
1060 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1061 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1062 DisplayPlanes (display->display, display->screen));
1063 }
1064# endif
1065 934
1066 pix_colors_focused[idx] = xcol; 935 pix_colors_focused[idx] = xcol;
1067 SET_PIXCOLOR (idx);
1068 936
1069 /* XSetWindowAttributes attr; */ 937 /* XSetWindowAttributes attr; */
1070 /* Cursor cursor; */ 938 /* Cursor cursor; */
1071done: 939done:
1072 940
1073#if OFF_FOCUS_FADING 941#if OFF_FOCUS_FADING
1074 if (rs[Rs_fade]) 942 if (rs[Rs_fade])
1075 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 }
1076#endif 948#endif
1077 949
1078 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
1079 951
1080 recolour_cursor (); 952 recolour_cursor ();
… …
1086#endif /* XTERM_COLOR_CHANGE */ 958#endif /* XTERM_COLOR_CHANGE */
1087 959
1088void 960void
1089rxvt_term::recolour_cursor () 961rxvt_term::recolour_cursor ()
1090{ 962{
1091 XColor xcol[2]; 963 XColor fg, bg;
1092 964
1093 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 965 (ISSET_PIXCOLOR (Color_pointer_fg)
1094 ? pix_colors_focused[Color_pointer_fg] 966 ? pix_colors_focused[Color_pointer_fg]
1095 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg]).get (fg);
968
1096 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 969 (ISSET_PIXCOLOR (Color_pointer_bg)
1097 ? pix_colors_focused[Color_pointer_bg] 970 ? pix_colors_focused[Color_pointer_bg]
1098 : pix_colors_focused[Color_bg]; 971 : pix_colors_focused[Color_bg]).get (bg);
1099 972
1100 XQueryColors (display->display, display->cmap, xcol, 2); 973 XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg);
1101 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1102} 974}
1103 975
1104/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1105/* 977/*
1106 * 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
… …
1110{ 982{
1111 unsigned int i; 983 unsigned int i;
1112 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1113 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1114 986
1115 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1116 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1117 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1118 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1119 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1120 { 991 {
… …
1135 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1136} 1007}
1137 1008
1138/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1139 1010
1140int 1011bool
1141rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::set_color (rxvt_color &color, const char *name)
1142{ 1013{
1143 if (!screen_in_out->set (display, colour)) 1014 if (color.set (this, name))
1144 {
1145 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1146 return false;
1147 }
1148
1149 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]);
1150} 1025}
1151 1026
1152/* -------------------------------------------------------------------- * 1027/* -------------------------------------------------------------------- *
1153 * - WINDOW RESIZING - * 1028 * - WINDOW RESIZING - *
1154 * -------------------------------------------------------------------- */ 1029 * -------------------------------------------------------------------- */
1155void 1030void
1156rxvt_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)
1157{ 1032{
1158 int fix_screen; 1033 int fix_screen;
1159 int old_width = szHint.width, old_height = szHint.height; 1034 int old_width = szHint.width;
1160 dDisp; 1035 int old_height = szHint.height;
1161 1036
1162 window_calc (newwidth, newheight); 1037 window_calc (newwidth, newheight);
1163 XSetWMNormalHints (disp, parent[0], &szHint); 1038 XSetWMNormalHints (xdisp, parent[0], &szHint);
1164 1039
1165 if (!ignoreparent) 1040 if (!ignoreparent)
1166 { 1041 {
1167#ifdef SMART_RESIZE 1042#ifdef SMART_RESIZE
1168 /* 1043 /*
… …
1172 int x, y, x1, y1; 1047 int x, y, x1, y1;
1173 int dx, dy; 1048 int dx, dy;
1174 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1049 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1175 Window unused_cr; 1050 Window unused_cr;
1176 1051
1177 XTranslateCoordinates (disp, parent[0], display->root, 1052 XTranslateCoordinates (xdisp, parent[0], display->root,
1178 0, 0, &x, &y, &unused_cr); 1053 0, 0, &x, &y, &unused_cr);
1179 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1054 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1180 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1055 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1181 /* 1056 /*
1182 * 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
1183 * our position for handles and decorations. Counter it 1058 * our position for handles and decorations. Counter it
1184 */ 1059 */
… …
1186 { 1061 {
1187 x -= x1; 1062 x -= x1;
1188 y -= y1; 1063 y -= y1;
1189 } 1064 }
1190 1065
1191 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1066 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1192 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1067 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1193 dx = old_width - szHint.width; 1068 dx = old_width - szHint.width;
1194 dy = old_height - szHint.height; 1069 dy = old_height - szHint.height;
1195 1070
1196 /* Check position of the center of the window */ 1071 /* Check position of the center of the window */
1197 if (x < x1) /* left half */ 1072 if (x < x1) /* left half */
1198 dx = 0; 1073 dx = 0;
… …
1201 if (y < y1) /* top half */ 1076 if (y < y1) /* top half */
1202 dy = 0; 1077 dy = 0;
1203 else if (y == y1) /* exact center */ 1078 else if (y == y1) /* exact center */
1204 dy /= 2; 1079 dy /= 2;
1205 1080
1206 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1081 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1207 szHint.width, szHint.height); 1082 szHint.width, szHint.height);
1208#else 1083#else
1209 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1084 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1210#endif 1085#endif
1211 } 1086 }
1212 1087
1213 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1088 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1214 1089
1215 if (fix_screen || newwidth != old_width || newheight != old_height) 1090 if (fix_screen || newwidth != old_width || newheight != old_height)
1216 { 1091 {
1217 if (scrollbar_visible ()) 1092 if (scrollBar.state)
1218 { 1093 {
1219 XMoveResizeWindow (disp, scrollBar.win, 1094 XMoveResizeWindow (xdisp, scrollBar.win,
1220 window_sb_x, 0, 1095 window_sb_x, 0,
1221 scrollbar_TotalWidth (), szHint.height); 1096 scrollbar_TotalWidth (), szHint.height);
1222 resize_scrollbar (); 1097 resize_scrollbar ();
1223 } 1098 }
1224 1099
1225 if (menubar_visible ())
1226 XMoveResizeWindow (disp, menuBar.win,
1227 window_vt_x, 0,
1228 width, menuBar_TotalHeight ());
1229
1230 XMoveResizeWindow (disp, vt, 1100 XMoveResizeWindow (xdisp, vt,
1231 window_vt_x, window_vt_y, 1101 window_vt_x, window_vt_y,
1232 width, height); 1102 width, height);
1233 1103
1234 scr_clear (); 1104 scr_clear ();
1235#ifdef XPM_BACKGROUND 1105#ifdef XPM_BACKGROUND
1236 resize_pixmap (); 1106 resize_pixmap ();
1237#endif 1107#endif
1238 } 1108 }
1239 1109
1240 if (fix_screen || old_height == 0) 1110 if (fix_screen || old_height == 0)
1241 {
1242 int curr_screen = -1;
1243 int old_ncol = prev_ncol;
1244
1245 /* scr_reset only works on the primary screen */
1246 if (old_height) /* this is not the first time through */
1247 {
1248 unsigned int ocol = ncol;
1249 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1250 curr_screen = scr_change_screen (PRIMARY);
1251 ncol = ocol;
1252 }
1253
1254 scr_reset (); 1111 scr_reset ();
1255 1112
1256 if (curr_screen >= 0) /* this is not the first time through */ 1113 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1257 { 1114 //scr_touch (false);
1258 scr_change_screen (curr_screen);
1259 selection_check (old_ncol != ncol ? 4 : 0);
1260 }
1261 }
1262
1263 old_width = szHint.width;
1264 old_height = szHint.height;
1265 1115
1266#ifdef XPM_BACKGROUND 1116#ifdef XPM_BACKGROUND
1267 if (pixmap) 1117 if (pixmap)
1268 scr_touch (false); 1118 scr_touch (false);
1269#endif 1119#endif
… …
1282{ 1132{
1283 XWindowAttributes wattr; 1133 XWindowAttributes wattr;
1284 1134
1285 if (newwidth == 0 || newheight == 0) 1135 if (newwidth == 0 || newheight == 0)
1286 { 1136 {
1287 XGetWindowAttributes (display->display, display->root, &wattr); 1137 XGetWindowAttributes (xdisp, display->root, &wattr);
1288 1138
1289 if (newwidth == 0) 1139 if (newwidth == 0)
1290 newwidth = wattr.width - szHint.base_width; 1140 newwidth = wattr.width - szHint.base_width;
1291 if (newheight == 0) 1141 if (newheight == 0)
1292 newheight = wattr.height - szHint.base_height; 1142 newheight = wattr.height - szHint.base_height;
… …
1306#ifdef USE_XIM 1156#ifdef USE_XIM
1307 1157
1308void 1158void
1309rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1159rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1310{ 1160{
1311 fg = pix_colors[Color_fg]; 1161 fg = pix_colors [Color_fg];
1312 bg = pix_colors[Color_bg]; 1162 bg = pix_colors [Color_bg];
1313} 1163}
1314 1164
1315void 1165void
1316rxvt_term::im_set_size (XRectangle &size) 1166rxvt_term::im_set_size (XRectangle &size)
1317{ 1167{
… …
1354 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1204 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1355 1205
1356 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1206 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1357 *p = '\0'; 1207 *p = '\0';
1358 1208
1359 atom = XInternAtom (display->display, server, False); 1209 atom = XInternAtom (xdisp, server, False);
1360 win = XGetSelectionOwner (display->display, atom); 1210 win = XGetSelectionOwner (xdisp, atom);
1361 1211
1362 if (win != None) 1212 if (win != None)
1363 return True; 1213 return True;
1364 } 1214 }
1365 1215
… …
1372 XPoint nspot; 1222 XPoint nspot;
1373 XVaNestedList preedit_attr; 1223 XVaNestedList preedit_attr;
1374 1224
1375 if (!Input_Context 1225 if (!Input_Context
1376 || !focus 1226 || !focus
1377 || !(input_style & XIMPreeditPosition)) 1227 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1378 return; 1228 return;
1379 1229
1380 im_set_position (nspot); 1230 im_set_position (nspot);
1381 1231
1382 if (nspot.x == spot.x && nspot.y == spot.y) 1232 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1401 input_method = 0; 1251 input_method = 0;
1402 } 1252 }
1403 1253
1404 Input_Context = 0; 1254 Input_Context = 0;
1405} 1255}
1256
1257#ifdef ENABLE_XIM_ONTHESPOT
1258
1259static void
1260xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1261{
1262 ((rxvt_term *)client_data)->make_current ();
1263 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1264}
1265
1266static void
1267xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1268{
1269 ((rxvt_term *)client_data)->make_current ();
1270 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1271}
1272
1273static void
1274xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1275{
1276 rxvt_term *term = (rxvt_term *)client_data;
1277 XIMText *text = call_data->text;
1278
1279 term->make_current ();
1280
1281 if (text)
1282 {
1283 void *str;
1284
1285 if (!text->encoding_is_wchar && text->string.multi_byte)
1286 {
1287 // of course, X makes it ugly again
1288 if (term->rs[Rs_imLocale])
1289 SET_LOCALE (term->rs[Rs_imLocale]);
1290
1291 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1292 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1293
1294 if (term->rs[Rs_imLocale])
1295 SET_LOCALE (term->locale);
1296 }
1297 else
1298 str = (void *)text->string.wide_char;
1299
1300 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1301 DT_INT, call_data->caret,
1302 DT_INT, call_data->chg_first,
1303 DT_INT, call_data->chg_length,
1304 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1305 DT_WCS_LEN, str, str ? (int)text->length : 0,
1306 DT_END));
1307 }
1308 else
1309 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1310 DT_INT, call_data->caret,
1311 DT_INT, call_data->chg_first,
1312 DT_INT, call_data->chg_length,
1313 DT_END));
1314}
1315
1316#if 0
1317static void
1318xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1319{
1320 ((rxvt_term *)client_data)->make_current ();
1321 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1322 DT_INT, call_data->position,
1323 DT_INT, call_data->direction,
1324 DT_INT, call_data->style,
1325 DT_END));
1326}
1327#endif
1328
1329#endif
1406 1330
1407/* 1331/*
1408 * Try to open a XIM with the current modifiers, then see if we can 1332 * Try to open a XIM with the current modifiers, then see if we can
1409 * open a suitable preedit type 1333 * open a suitable preedit type
1410 */ 1334 */
… …
1417 XRectangle rect, status_rect, needed_rect; 1341 XRectangle rect, status_rect, needed_rect;
1418 unsigned long fg, bg; 1342 unsigned long fg, bg;
1419 const char *p; 1343 const char *p;
1420 char **s; 1344 char **s;
1421 XIMStyles *xim_styles; 1345 XIMStyles *xim_styles;
1346#ifdef ENABLE_XIM_ONTHESPOT
1347 XIMCallback xcb[4];
1348#endif
1349
1350 set_environ (envv);
1422 1351
1423 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1352 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1424 return false; 1353 return false;
1425 1354
1426 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1427 input_method = display->get_xim (locale, modifiers); 1355 input_method = display->get_xim (locale, modifiers);
1428 if (input_method == NULL) 1356 if (input_method == NULL)
1429 return false; 1357 return false;
1430 1358
1431 xim = input_method->xim; 1359 xim = input_method->xim;
… …
1451 s = rxvt_splitcommastring (p); 1379 s = rxvt_splitcommastring (p);
1452 1380
1453 for (i = found = 0; !found && s[i]; i++) 1381 for (i = found = 0; !found && s[i]; i++)
1454 { 1382 {
1455 if (!strcmp (s[i], "OverTheSpot")) 1383 if (!strcmp (s[i], "OverTheSpot"))
1456 input_style = (XIMPreeditPosition | XIMStatusNothing); 1384 input_style = XIMPreeditPosition | XIMStatusNothing;
1457 else if (!strcmp (s[i], "OffTheSpot")) 1385 else if (!strcmp (s[i], "OffTheSpot"))
1458 input_style = (XIMPreeditArea | XIMStatusArea); 1386 input_style = XIMPreeditArea | XIMStatusArea;
1459 else if (!strcmp (s[i], "Root")) 1387 else if (!strcmp (s[i], "Root"))
1460 input_style = (XIMPreeditNothing | XIMStatusNothing); 1388 input_style = XIMPreeditNothing | XIMStatusNothing;
1461 else if (!strcmp (s[i], "None")) 1389 else if (!strcmp (s[i], "None"))
1462 input_style = (XIMPreeditNone | XIMStatusNone); 1390 input_style = XIMPreeditNone | XIMStatusNone;
1391#ifdef ENABLE_XIM_ONTHESPOT
1392 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1393 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1394#endif
1395 else
1396 input_style = XIMPreeditNothing | XIMStatusNothing;
1463 1397
1464 for (j = 0; j < xim_styles->count_styles; j++) 1398 for (j = 0; j < xim_styles->count_styles; j++)
1465 if (input_style == xim_styles->supported_styles[j]) 1399 if (input_style == xim_styles->supported_styles[j])
1466 { 1400 {
1467 rxvt_freecommastring (s); 1401 rxvt_freecommastring (s);
… …
1505 "*", 1439 "*",
1506 fheight, 1440 fheight,
1507 fheight + 1, fheight - 1, 1441 fheight + 1, fheight - 1,
1508 fheight - 2, fheight + 2); 1442 fheight - 2, fheight + 2);
1509 1443
1510 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1444 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1511 &missing_charset_list, &missing_charset_count, &def_string); 1445 &missing_charset_list, &missing_charset_count, &def_string);
1512 1446
1513 if (missing_charset_list) 1447 if (missing_charset_list)
1514 XFreeStringList (missing_charset_list); 1448 XFreeStringList (missing_charset_list);
1515 1449
… …
1556 XNBackground, bg, 1490 XNBackground, bg,
1557 XNArea, &status_rect, 1491 XNArea, &status_rect,
1558 XNFontSet, fs, 1492 XNFontSet, fs,
1559 NULL); 1493 NULL);
1560 } 1494 }
1495#if ENABLE_XIM_ONTHESPOT
1496 else if (input_style & XIMPreeditCallbacks)
1497 {
1498 im_set_position (spot);
1499
1500 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1501 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1502 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1503# if 0
1504 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1505# endif
1506
1507 preedit_attr = XVaCreateNestedList (0,
1508 XNSpotLocation, &spot,
1509 XNPreeditStartCallback, &xcb[0],
1510 XNPreeditDoneCallback , &xcb[1],
1511 XNPreeditDrawCallback , &xcb[2],
1512# if 0
1513 XNPreeditCaretCallback, &xcb[3],
1514# endif
1515 NULL);
1516 }
1517#endif
1561 1518
1562 Input_Context = XCreateIC (xim, 1519 Input_Context = XCreateIC (xim,
1563 XNInputStyle, input_style, 1520 XNInputStyle, input_style,
1564 XNClientWindow, vt, 1521 XNClientWindow, vt,
1565 XNFocusWindow, parent[0], 1522 XNFocusWindow, parent[0],
… …
1568 status_attr ? XNStatusAttributes : NULL, 1525 status_attr ? XNStatusAttributes : NULL,
1569 status_attr, NULL); 1526 status_attr, NULL);
1570 1527
1571 if (preedit_attr) XFree (preedit_attr); 1528 if (preedit_attr) XFree (preedit_attr);
1572 if (status_attr) XFree (status_attr); 1529 if (status_attr) XFree (status_attr);
1573 if (fs) XFreeFontSet (display->display, fs); 1530 if (fs) XFreeFontSet (xdisp, fs);
1574 1531
1575 if (Input_Context == NULL) 1532 if (Input_Context == NULL)
1576 { 1533 {
1577 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1534 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1578 im_destroy (); 1535 im_destroy ();
1579 return false; 1536 return false;
1580 } 1537 }
1581 1538
1539#if 0
1540 // unfortunately, only the focus window is used by XIM, hard to fix
1541 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1542 vt_select_input ();
1543#endif
1544
1582 if (input_style & XIMPreeditArea) 1545 if (input_style & XIMPreeditArea)
1583 IMSetStatusPosition (); 1546 IMSetStatusPosition ();
1584 1547
1585 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1586 return true; 1548 return true;
1587} 1549}
1588 1550
1589void 1551void
1590rxvt_term::im_cb () 1552rxvt_term::im_cb ()
… …
1592 int i; 1554 int i;
1593 const char *p; 1555 const char *p;
1594 char **s; 1556 char **s;
1595 char buf[IMBUFSIZ]; 1557 char buf[IMBUFSIZ];
1596 1558
1597 SET_R (this); 1559 make_current ();
1598 1560
1599 im_destroy (); 1561 im_destroy ();
1600 1562
1601 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1602 if (Input_Context) 1563 if (Input_Context)
1603 return; 1564 return;
1604 1565
1605#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1566#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1606 if (rs[Rs_imLocale]) 1567 if (rs[Rs_imLocale])
… …
1679 XFree (preedit_attr); 1640 XFree (preedit_attr);
1680 XFree (status_attr); 1641 XFree (status_attr);
1681} 1642}
1682#endif /* USE_XIM */ 1643#endif /* USE_XIM */
1683 1644
1684/*----------------------------------------------------------------------*/
1685rxvt_t rxvt_current_term;
1686
1687/*----------------------- end-of-file (C source) -----------------------*/ 1645/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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