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.166 by root, Sun Jan 8 07:55:36 2006 UTC vs.
Revision 1.214 by root, Tue Jan 31 19:53:30 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]);
256
257 clear ();
271 } 258 }
272 259
273 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
274
275 delete pix_colors_focused; 261 delete pix_colors_focused;
276#if OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
277 delete pix_colors_unfocused; 263 delete pix_colors_unfocused;
278#endif 264#endif
279#if USE_XGETDEFAULT
280 XrmDestroyDatabase (xrmdatabase);
281#endif
282 265
283 displays.put (display); 266 displays.put (display);
284 267
285 scr_release (); 268 scr_release ();
286 269
… …
288 for (int i = 0; i < allocated.size (); i++) 271 for (int i = 0; i < allocated.size (); i++)
289 free (allocated [i]); 272 free (allocated [i]);
290 273
291 free (selection.text); 274 free (selection.text);
292 // TODO: manage env vars in child only(!) 275 // TODO: manage env vars in child only(!)
293 free (env_windowid);
294 free (env_display); 276 free (env_display);
295 free (env_term); 277 free (env_term);
296 free (env_colorfgbg);
297 free (locale); 278 free (locale);
298 free (v_buffer); 279 free (v_buffer);
299 free (incr_buf); 280 free (incr_buf);
300 281
301 delete envv; 282 delete envv;
… …
304#ifdef KEYSYM_RESOURCE 285#ifdef KEYSYM_RESOURCE
305 delete keyboard; 286 delete keyboard;
306#endif 287#endif
307} 288}
308 289
290// child has exited, usually destroys
309void 291void
310rxvt_term::child_exit () 292rxvt_term::child_cb (child_watcher &w, int status)
311{ 293{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295
312 cmd_pid = 0; 296 cmd_pid = 0;
313 297
314 if (!OPTION (Opt_hold)) 298 if (!OPTION (Opt_hold))
315 destroy (); 299 destroy ();
316} 300}
… …
319rxvt_term::destroy () 303rxvt_term::destroy ()
320{ 304{
321 if (destroy_ev.active) 305 if (destroy_ev.active)
322 return; 306 return;
323 307
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
309
324#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
325 scr_overlay_off (); 311 scr_overlay_off ();
326#endif 312#endif
327 313
328 if (display) 314 if (display)
… …
330#if USE_XIM 316#if USE_XIM
331 im_ev.stop (display); 317 im_ev.stop (display);
332#endif 318#endif
333#if HAVE_SCROLLBARS 319#if HAVE_SCROLLBARS
334 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
335#endif
336#if MENUBAR
337 menubar_ev.stop (display);
338#endif 321#endif
339#if TRANSPARENT 322#if TRANSPARENT
340 rootwin_ev.stop (display); 323 rootwin_ev.stop (display);
341#endif 324#endif
342 incr_ev.stop (); 325 incr_ev.stop ();
… …
366} 349}
367 350
368void 351void
369rxvt_term::destroy_cb (time_watcher &w) 352rxvt_term::destroy_cb (time_watcher &w)
370{ 353{
371 SET_R (this); 354 make_current ();
372 355
373 delete this; 356 delete this;
374} 357}
375 358
376/*----------------------------------------------------------------------*/ 359/*----------------------------------------------------------------------*/
… …
385{ 368{
386 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
387 (*t)->emergency_cleanup (); 370 (*t)->emergency_cleanup ();
388} 371}
389 372
390#if ENABLE_FRILLS 373#if !ENABLE_MINIMAL
391static void 374static void
392print_x_error (Display *dpy, XErrorEvent *event) 375print_x_error (Display *dpy, XErrorEvent *event)
393{ 376{
394 char buffer[BUFSIZ]; 377 char buffer[BUFSIZ];
395 char mesg[BUFSIZ]; 378 char mesg[BUFSIZ];
… …
443 GET_R->allowedxerror = event->error_code; 426 GET_R->allowedxerror = event->error_code;
444 else 427 else
445 { 428 {
446 // GET_R is most likely not the terminal which caused the error, 429 // GET_R is most likely not the terminal which caused the error,
447 // so just output the error and continue 430 // so just output the error and continue
448#if ENABLE_FRILLS 431#if ENABLE_MINIMAL
432 old_xerror_handler (display, event);
433#else
449 print_x_error (display, event); 434 print_x_error (display, event);
450#else
451 old_xerror_handler (display, event);
452#endif 435#endif
453 } 436 }
454 437
455 return 0; 438 return 0;
456} 439}
… …
464 _exit (EXIT_FAILURE); 447 _exit (EXIT_FAILURE);
465} 448}
466 449
467/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
468bool 451bool
469rxvt_term::init (int argc, const char *const *argv) 452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
470{ 453{
454 this->envv = envv;
455
471 SET_R (this); 456 SET_R (this);
472
473 set_locale (""); 457 set_locale ("");
458 set_environ (envv); // few things in X do not call setlocale :(
474 459
475 if (!init_vars ()) 460 if (!init_vars ())
476 return false; 461 return false;
477 462
478 init_secondary (); 463 init_secondary ();
… …
481 466
482#ifdef KEYSYM_RESOURCE 467#ifdef KEYSYM_RESOURCE
483 keyboard->register_done (); 468 keyboard->register_done ();
484#endif 469#endif
485 470
486#if MENUBAR_MAX
487 menubar_read (rs[Rs_menu]);
488#endif
489#ifdef HAVE_SCROLLBARS 471#ifdef HAVE_SCROLLBARS
490 if (OPTION (Opt_scrollBar)) 472 if (OPTION (Opt_scrollBar))
491 scrollBar.setIdle (); /* set existence for size calculations */ 473 scrollBar.setIdle (); /* set existence for size calculations */
492#endif 474#endif
493 475
494#if ENABLE_PERL 476 pty = ptytty::create ();
495 if (!rs[Rs_perl_ext_1])
496 rs[Rs_perl_ext_1] = "default";
497
498 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
499 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
500 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
501 {
502 rxvt_perl.init ();
503 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
504 }
505#endif
506 477
507 create_windows (argc, argv); 478 create_windows (argc, argv);
508 479
509 dDisp;
510
511 init_xlocale (); 480 init_xlocale ();
512 481
513 scr_reset (); /* initialize screen */ 482 scr_reset (); // initialize screen
514 483
515#if 0 484#if 0
516 XSynchronize (disp, True); 485 XSynchronize (xdisp, True);
517#endif 486#endif
518 487
519#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
520 if (OPTION (Opt_scrollBar)) 489 if (OPTION (Opt_scrollBar))
521 resize_scrollbar (); /* create and map scrollbar */ 490 resize_scrollbar (); /* create and map scrollbar */
522#endif 491#endif
523#if (MENUBAR_MAX)
524 if (menubar_visible ())
525 XMapWindow (disp, menuBar.win);
526#endif
527#ifdef TRANSPARENT 492#ifdef TRANSPARENT
528 if (OPTION (Opt_transparent)) 493 if (OPTION (Opt_transparent))
529 { 494 {
530 XSelectInput (disp, display->root, PropertyChangeMask); 495 XSelectInput (xdisp, display->root, PropertyChangeMask);
531 check_our_parents (); 496 check_our_parents ();
532 rootwin_ev.start (display, display->root); 497 rootwin_ev.start (display, display->root);
533 } 498 }
534#endif 499#endif
535 500
536 XMapWindow (disp, vt);
537 XMapWindow (disp, parent[0]);
538
539 set_colorfgbg (); 501 set_colorfgbg ();
540 502
541 init_command (cmd_argv); 503 init_command (cmd_argv);
542 504
543 free (cmd_argv); 505 free (cmd_argv);
544 506
545 if (pty.pty >= 0) 507 if (pty->pty >= 0)
546 pty_ev.start (pty.pty, EVENT_READ); 508 pty_ev.start (pty->pty, EVENT_READ);
547 509
548 check_ev.start (); 510 check_ev.start ();
549 511
550 HOOK_INVOKE ((this, HOOK_START, DT_END)); 512 HOOK_INVOKE ((this, HOOK_START, DT_END));
551 513
514#if ENABLE_XEMBED
515 if (rs[Rs_embed])
516 {
517 long info[2] = { 0, XEMBED_MAPPED };
518
519 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2);
521 }
522#endif
523
524 XMapWindow (xdisp, vt);
525 XMapWindow (xdisp, parent[0]);
526
552 return true; 527 return true;
553} 528}
554 529
555static struct sig_handlers 530static struct sig_handlers
556{ 531{
557 sig_watcher sw_chld, sw_term, sw_int; 532 sig_watcher sw_term, sw_int;
558 533
559 void sig_chld (sig_watcher &w)
560 {
561 // we are being called for every SIGCHLD, find the corresponding term
562 int pid;
563
564 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
565 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
566 if (pid == (*t)->cmd_pid)
567 {
568 (*t)->child_exit ();
569 break;
570 }
571 }
572
573 /* 534 /*
574 * Catch a fatal signal and tidy up before quitting 535 * Catch a fatal signal and tidy up before quitting
575 */ 536 */
576 void 537 void
577 sig_term (sig_watcher &w) 538 sig_term (sig_watcher &w)
578 { 539 {
579#ifdef DEBUG_CMD
580 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
581#endif
582 rxvt_emergency_cleanup (); 540 rxvt_emergency_cleanup ();
583 signal (w.signum, SIG_DFL); 541 signal (w.signum, SIG_DFL);
584 kill (getpid (), w.signum); 542 kill (getpid (), w.signum);
585 } 543 }
586 544
587 sig_handlers () 545 sig_handlers ()
588 : sw_chld (this, &sig_handlers::sig_chld),
589 sw_term (this, &sig_handlers::sig_term), 546 : sw_term (this, &sig_handlers::sig_term),
590 sw_int (this, &sig_handlers::sig_term) 547 sw_int (this, &sig_handlers::sig_term)
591 { 548 {
592 } 549 }
593} sig_handlers; 550} sig_handlers;
594 551
552char **rxvt_environ; // startup environment
553
595void 554void
596rxvt_init () 555rxvt_init ()
597{ 556{
598 /* 557 ptytty::init ();
599 * Save and then give up any super-user privileges 558
600 * If we need privileges in any area then we must specifically request it. 559 rxvt_environ = environ;
601 * We should only need to be root in these cases:
602 * 1. write utmp entries on some systems
603 * 2. chown tty on some systems
604 */
605 rxvt_privileges (SAVE);
606 rxvt_privileges (IGNORE);
607 560
608 signal (SIGHUP, SIG_IGN); 561 signal (SIGHUP, SIG_IGN);
609 signal (SIGPIPE, SIG_IGN); 562 signal (SIGPIPE, SIG_IGN);
610 563
611 sig_handlers.sw_chld.start (SIGCHLD);
612 sig_handlers.sw_term.start (SIGTERM); 564 sig_handlers.sw_term.start (SIGTERM);
613 sig_handlers.sw_int.start (SIGINT); 565 sig_handlers.sw_int.start (SIGINT);
614 566
615 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 567 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
616 /* signal (SIGURG, SIG_DFL); */ 568 /* signal (SIGURG, SIG_DFL); */
617 569
618 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 570 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
619 // TODO: handle this with exceptions and tolerate the memory loss 571 // TODO: handle this with exceptions and tolerate the memory loss
620 XSetIOErrorHandler (rxvt_xioerror_handler); 572 XSetIOErrorHandler (rxvt_xioerror_handler);
621 573
622#ifdef USE_XGETDEFAULT
623 XrmInitialize (); 574 XrmInitialize ();
624#endif
625} 575}
626 576
627/* ------------------------------------------------------------------------- * 577/* ------------------------------------------------------------------------- *
628 * MEMORY ALLOCATION WRAPPERS * 578 * MEMORY ALLOCATION WRAPPERS *
629 * ------------------------------------------------------------------------- */ 579 * ------------------------------------------------------------------------- */
… …
647 rxvt_fatal ("memory allocation failure. aborting.\n"); 597 rxvt_fatal ("memory allocation failure. aborting.\n");
648 598
649 return p; 599 return p;
650} 600}
651 601
652void * 602void *
653rxvt_realloc (void *ptr, size_t size) 603rxvt_realloc (void *ptr, size_t size)
654{ 604{
655 void *p = realloc (ptr, size); 605 void *p = realloc (ptr, size);
656 606
657 if (!p) 607 if (!p)
658 rxvt_fatal ("memory allocation failure. aborting.\n"); 608 rxvt_fatal ("memory allocation failure. aborting.\n");
659 609
660 return p; 610 return p;
661} 611}
662
663/* ------------------------------------------------------------------------- *
664 * PRIVILEGED OPERATIONS *
665 * ------------------------------------------------------------------------- */
666/* take care of suid/sgid super-user (root) privileges */
667void
668rxvt_privileges (rxvt_privaction action)
669{
670#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
671 static uid_t euid;
672 static gid_t egid;
673#endif
674
675#if ! defined(__CYGWIN32__)
676# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
677 /* setreuid () is the poor man's setuid (), seteuid () */
678# define seteuid(a) setreuid(-1, (a))
679# define setegid(a) setregid(-1, (a))
680# define HAVE_SETEUID
681# endif
682# ifdef HAVE_SETEUID
683 switch (action)
684 {
685 case IGNORE:
686 /*
687 * change effective uid/gid - not real uid/gid - so we can switch
688 * back to root later, as required
689 */
690 seteuid (getuid ());
691 setegid (getgid ());
692 break;
693 case SAVE:
694 euid = geteuid ();
695 egid = getegid ();
696 break;
697 case RESTORE:
698 seteuid (euid);
699 setegid (egid);
700 break;
701 }
702# else
703 switch (action)
704 {
705 case IGNORE:
706 setuid (getuid ());
707 setgid (getgid ());
708 /* FALLTHROUGH */
709 case SAVE:
710 /* FALLTHROUGH */
711 case RESTORE:
712 break;
713 }
714# endif
715#endif
716}
717
718#ifdef UTMP_SUPPORT
719void
720rxvt_term::privileged_utmp (rxvt_privaction action)
721{
722 if (OPTION (Opt_utmpInhibit)
723 || !pty.name || !*pty.name)
724 return;
725
726 rxvt_privileges (RESTORE);
727
728 if (action == SAVE)
729 makeutent (pty.name, rs[Rs_display_name]);
730 else
731 cleanutent ();
732
733 rxvt_privileges (IGNORE);
734}
735#endif
736 612
737/*----------------------------------------------------------------------*/ 613/*----------------------------------------------------------------------*/
738/* 614/*
739 * window size/position calculcations for XSizeHint and other storage. 615 * window size/position calculcations for XSizeHint and other storage.
740 * if width/height are non-zero then override calculated width/height 616 * if width/height are non-zero then override calculated width/height
741 */ 617 */
742void 618void
743rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 619rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
744{ 620{
745 short recalc_x, recalc_y; 621 short recalc_x, recalc_y;
746 int x, y, sb_w, mb_h, flags; 622 int x, y, sb_w, flags;
747 unsigned int w, h; 623 unsigned int w, h;
748 unsigned int max_width, max_height; 624 unsigned int max_width, max_height;
749 dDisp;
750
751 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
752 ncol, nrow, szHint.width, szHint.height));
753 625
754 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
755 szHint.win_gravity = NorthWestGravity; 627 szHint.win_gravity = NorthWestGravity;
756 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 628 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
757 629
… …
812 max_width = MAX_COLS * fwidth; 684 max_width = MAX_COLS * fwidth;
813 max_height = MAX_ROWS * fheight; 685 max_height = MAX_ROWS * fheight;
814 686
815 szHint.base_width = szHint.base_height = 2 * int_bwidth; 687 szHint.base_width = szHint.base_height = 2 * int_bwidth;
816 688
817 sb_w = mb_h = 0; 689 sb_w = 0;
818 window_vt_x = window_vt_y = int_bwidth; 690 window_vt_x = window_vt_y = int_bwidth;
819 691
820 if (scrollbar_visible ()) 692 if (scrollBar.state)
821 { 693 {
822 sb_w = scrollbar_TotalWidth (); 694 sb_w = scrollbar_TotalWidth ();
823 szHint.base_width += sb_w; 695 szHint.base_width += sb_w;
696
824 if (!OPTION (Opt_scrollBar_right)) 697 if (!OPTION (Opt_scrollBar_right))
825 window_vt_x += sb_w; 698 window_vt_x += sb_w;
826 }
827
828 if (menubar_visible ())
829 {
830 mb_h = menuBar_TotalHeight ();
831 szHint.base_height += mb_h;
832 window_vt_y += mb_h;
833 } 699 }
834 700
835 szHint.width_inc = fwidth; 701 szHint.width_inc = fwidth;
836 szHint.height_inc = fheight; 702 szHint.height_inc = fheight;
837 szHint.min_width = szHint.base_width + szHint.width_inc; 703 szHint.min_width = szHint.base_width + szHint.width_inc;
… …
857 { 723 {
858 min_it (height, max_height); 724 min_it (height, max_height);
859 szHint.height = szHint.base_height + height; 725 szHint.height = szHint.base_height + height;
860 } 726 }
861 727
862 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 728 if (scrollBar.state && OPTION (Opt_scrollBar_right))
863 window_sb_x = szHint.width - sb_w; 729 window_sb_x = szHint.width - sb_w;
864 730
865 if (recalc_x) 731 if (recalc_x)
866 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 732 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
733
867 if (recalc_y) 734 if (recalc_y)
868 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 735 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
869 736
870 ncol = width / fwidth; 737 ncol = width / fwidth;
871 nrow = height / fheight; 738 nrow = height / fheight;
872 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
873 ncol, nrow, szHint.width,
874 szHint.height));
875 return;
876} 739}
877 740
878/*----------------------------------------------------------------------*/ 741/*----------------------------------------------------------------------*/
879/* 742/*
880 * Tell the teletype handler what size the window is. 743 * Tell the teletype handler what size the window is.
881 * Called after a window size change. 744 * Called after a window size change.
882 */ 745 */
883void 746void
884rxvt_term::tt_winch () 747rxvt_term::tt_winch ()
885{ 748{
886 if (pty.pty < 0) 749 if (pty->pty < 0)
887 return; 750 return;
888 751
889 struct winsize ws; 752 struct winsize ws;
890 753
891 ws.ws_col = ncol; 754 ws.ws_col = ncol;
892 ws.ws_row = nrow; 755 ws.ws_row = nrow;
893 ws.ws_xpixel = width; 756 ws.ws_xpixel = width;
894 ws.ws_ypixel = height; 757 ws.ws_ypixel = height;
895 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 758 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
896 759
897#if 0 760#if 0
898 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 761 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
899 if (cmd_pid) /* force through to the command */ 762 if (cmd_pid) /* force through to the command */
900 kill (-cmd_pid, SIGWINCH); 763 kill (-cmd_pid, SIGWINCH);
… …
980 return true; 843 return true;
981} 844}
982 845
983void rxvt_term::set_string_property (Atom prop, const char *str, int len) 846void rxvt_term::set_string_property (Atom prop, const char *str, int len)
984{ 847{
985 XChangeProperty (display->display, parent[0], 848 XChangeProperty (xdisp, parent[0],
986 prop, XA_STRING, 8, PropModeReplace, 849 prop, XA_STRING, 8, PropModeReplace,
987 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 850 (const unsigned char *)str, len >= 0 ? len : strlen (str));
988} 851}
989 852
990void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 853void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
991{ 854{
992 wchar_t *ws = rxvt_mbstowcs (str, len); 855 wchar_t *ws = rxvt_mbstowcs (str, len);
993 char *s = rxvt_wcstoutf8 (ws); 856 char *s = rxvt_wcstoutf8 (ws);
994 857
995 XChangeProperty (display->display, parent[0], 858 XChangeProperty (xdisp, parent[0],
996 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 859 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
997 (const unsigned char *)s, strlen (s)); 860 (const unsigned char *)s, strlen (s));
998 861
999 free (s); 862 free (s);
1000 free (ws); 863 free (ws);
… …
1025void 888void
1026rxvt_term::set_window_color (int idx, const char *color) 889rxvt_term::set_window_color (int idx, const char *color)
1027{ 890{
1028 rxvt_color xcol; 891 rxvt_color xcol;
1029 int i; 892 int i;
1030 893
1031 if (color == NULL || *color == '\0') 894 if (color == NULL || *color == '\0')
1032 return; 895 return;
896
897 color = strdup (color);
898 allocated.push_back ((void *)color);
899 rs[Rs_color + idx] = color;
1033 900
1034 /* handle color aliases */ 901 /* handle color aliases */
1035 if (isdigit (*color)) 902 if (isdigit (*color))
1036 { 903 {
1037 i = atoi (color); 904 i = atoi (color);
1038 905
1039 if (i >= 8 && i <= 15) 906 if (i >= 8 && i <= 15)
1040 { /* bright colors */ 907 { /* bright colors */
1041 i -= 8; 908 i -= 8;
1042 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 909 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1043 SET_PIXCOLOR (idx);
1044 goto done; 910 goto done;
1045 } 911 }
1046 912
1047 if (i >= 0 && i <= 7) 913 if (i >= 0 && i <= 7)
1048 { /* normal colors */ 914 { /* normal colors */
1049 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1050 SET_PIXCOLOR (idx);
1051 goto done; 916 goto done;
1052 } 917 }
1053 } 918 }
1054 919
1055 if (!rXParseAllocColor (&xcol, color)) 920 set_color (xcol, color);
1056 return;
1057
1058 /* XStoreColor (display->display, display->cmap, XColor*); */
1059 921
1060 /* 922 /*
1061 * FIXME: should free colors here, but no idea how to do it so instead, 923 * FIXME: should free colors here, but no idea how to do it so instead,
1062 * so just keep gobbling up the colormap 924 * so just keep gobbling up the colormap
1063 */ 925 */
1064# if 0
1065 for (i = Color_Black; i <= Color_White; i++)
1066 if (pix_colors[idx] == pix_colors[i])
1067 break;
1068 if (i > Color_White)
1069 {
1070 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1071 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1072 DisplayPlanes (display->display, display->screen));
1073 }
1074# endif
1075 926
1076 pix_colors_focused[idx] = xcol; 927 pix_colors_focused[idx] = xcol;
1077 SET_PIXCOLOR (idx);
1078 928
1079 /* XSetWindowAttributes attr; */ 929 /* XSetWindowAttributes attr; */
1080 /* Cursor cursor; */ 930 /* Cursor cursor; */
1081done: 931done:
1082 932
1083#if OFF_FOCUS_FADING 933#if OFF_FOCUS_FADING
1084 if (rs[Rs_fade]) 934 if (rs[Rs_fade])
1085 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 935 {
936 rgba c;
937 pix_colors [Color_fade].get (c);
938 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
939 }
1086#endif 940#endif
1087 941
1088 /*TODO: handle Color_BD, scrollbar background, etc. */ 942 /*TODO: handle Color_BD, scrollbar background, etc. */
1089 943
1090 recolour_cursor (); 944 recolour_cursor ();
… …
1105 : pix_colors_focused[Color_fg]; 959 : pix_colors_focused[Color_fg];
1106 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 960 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1107 ? pix_colors_focused[Color_pointer_bg] 961 ? pix_colors_focused[Color_pointer_bg]
1108 : pix_colors_focused[Color_bg]; 962 : pix_colors_focused[Color_bg];
1109 963
1110 XQueryColors (display->display, display->cmap, xcol, 2); 964 XQueryColors (xdisp, cmap, xcol, 2);
1111 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 965 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1);
1112} 966}
1113 967
1114/*----------------------------------------------------------------------*/ 968/*----------------------------------------------------------------------*/
1115/* 969/*
1116 * find if fg/bg matches any of the normal (low-intensity) colors 970 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1120{ 974{
1121 unsigned int i; 975 unsigned int i;
1122 const char *xpmb = "\0"; 976 const char *xpmb = "\0";
1123 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 977 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1124 978
1125 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1126 strcpy (fstr, "default"); 979 strcpy (fstr, "default");
1127 strcpy (bstr, "default"); 980 strcpy (bstr, "default");
1128 for (i = Color_Black; i <= Color_White; i++) 981 for (i = Color_Black; i <= Color_White; i++)
1129 if (pix_colors[Color_fg] == pix_colors[i]) 982 if (pix_colors[Color_fg] == pix_colors[i])
1130 { 983 {
… …
1145 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 998 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1146} 999}
1147 1000
1148/*----------------------------------------------------------------------*/ 1001/*----------------------------------------------------------------------*/
1149 1002
1150int 1003bool
1151rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1004rxvt_term::set_color (rxvt_color &color, const char *name)
1152{ 1005{
1153 if (!screen_in_out->set (display, colour)) 1006 if (color.set (this, name))
1154 {
1155 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1156 return false;
1157 }
1158
1159 return true; 1007 return true;
1008
1009 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1010 return false;
1160} 1011}
1161 1012
1162/* -------------------------------------------------------------------- * 1013/* -------------------------------------------------------------------- *
1163 * - WINDOW RESIZING - * 1014 * - WINDOW RESIZING - *
1164 * -------------------------------------------------------------------- */ 1015 * -------------------------------------------------------------------- */
1165void 1016void
1166rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1017rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1167{ 1018{
1168 int fix_screen; 1019 int fix_screen;
1169 int old_width = szHint.width, old_height = szHint.height; 1020 int old_width = szHint.width;
1170 dDisp; 1021 int old_height = szHint.height;
1171 1022
1172 window_calc (newwidth, newheight); 1023 window_calc (newwidth, newheight);
1173 XSetWMNormalHints (disp, parent[0], &szHint); 1024 XSetWMNormalHints (xdisp, parent[0], &szHint);
1174 1025
1175 if (!ignoreparent) 1026 if (!ignoreparent)
1176 { 1027 {
1177#ifdef SMART_RESIZE 1028#ifdef SMART_RESIZE
1178 /* 1029 /*
… …
1182 int x, y, x1, y1; 1033 int x, y, x1, y1;
1183 int dx, dy; 1034 int dx, dy;
1184 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1035 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1185 Window unused_cr; 1036 Window unused_cr;
1186 1037
1187 XTranslateCoordinates (disp, parent[0], display->root, 1038 XTranslateCoordinates (xdisp, parent[0], display->root,
1188 0, 0, &x, &y, &unused_cr); 1039 0, 0, &x, &y, &unused_cr);
1189 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1040 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1190 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1041 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1191 /* 1042 /*
1192 * if display->root isn't the parent window, a WM will probably have offset 1043 * if display->root isn't the parent window, a WM will probably have offset
1193 * our position for handles and decorations. Counter it 1044 * our position for handles and decorations. Counter it
1194 */ 1045 */
… …
1196 { 1047 {
1197 x -= x1; 1048 x -= x1;
1198 y -= y1; 1049 y -= y1;
1199 } 1050 }
1200 1051
1201 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1052 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1202 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1053 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1203 dx = old_width - szHint.width; 1054 dx = old_width - szHint.width;
1204 dy = old_height - szHint.height; 1055 dy = old_height - szHint.height;
1205 1056
1206 /* Check position of the center of the window */ 1057 /* Check position of the center of the window */
1207 if (x < x1) /* left half */ 1058 if (x < x1) /* left half */
1208 dx = 0; 1059 dx = 0;
… …
1211 if (y < y1) /* top half */ 1062 if (y < y1) /* top half */
1212 dy = 0; 1063 dy = 0;
1213 else if (y == y1) /* exact center */ 1064 else if (y == y1) /* exact center */
1214 dy /= 2; 1065 dy /= 2;
1215 1066
1216 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1067 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1217 szHint.width, szHint.height); 1068 szHint.width, szHint.height);
1218#else 1069#else
1219 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1070 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1220#endif 1071#endif
1221 } 1072 }
1222 1073
1223 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1074 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1224 1075
1225 if (fix_screen || newwidth != old_width || newheight != old_height) 1076 if (fix_screen || newwidth != old_width || newheight != old_height)
1226 { 1077 {
1227 if (scrollbar_visible ()) 1078 if (scrollBar.state)
1228 { 1079 {
1229 XMoveResizeWindow (disp, scrollBar.win, 1080 XMoveResizeWindow (xdisp, scrollBar.win,
1230 window_sb_x, 0, 1081 window_sb_x, 0,
1231 scrollbar_TotalWidth (), szHint.height); 1082 scrollbar_TotalWidth (), szHint.height);
1232 resize_scrollbar (); 1083 resize_scrollbar ();
1233 } 1084 }
1234 1085
1235 if (menubar_visible ())
1236 XMoveResizeWindow (disp, menuBar.win,
1237 window_vt_x, 0,
1238 width, menuBar_TotalHeight ());
1239
1240 XMoveResizeWindow (disp, vt, 1086 XMoveResizeWindow (xdisp, vt,
1241 window_vt_x, window_vt_y, 1087 window_vt_x, window_vt_y,
1242 width, height); 1088 width, height);
1243 1089
1244 scr_clear (); 1090 scr_clear ();
1245#ifdef XPM_BACKGROUND 1091#ifdef XPM_BACKGROUND
1246 resize_pixmap (); 1092 resize_pixmap ();
1247#endif 1093#endif
1248 } 1094 }
1249 1095
1250 if (fix_screen || old_height == 0) 1096 if (fix_screen || old_height == 0)
1251 {
1252 int curr_screen = -1;
1253 int old_ncol = prev_ncol;
1254
1255 /* scr_reset only works on the primary screen */
1256 if (old_height) /* this is not the first time through */
1257 {
1258 unsigned int ocol = ncol;
1259 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1260 curr_screen = scr_change_screen (PRIMARY);
1261 ncol = ocol;
1262 }
1263
1264 scr_reset (); 1097 scr_reset ();
1265
1266 if (curr_screen >= 0) /* this is not the first time through */
1267 {
1268 scr_change_screen (curr_screen);
1269 selection_check (old_ncol != ncol ? 4 : 0);
1270 }
1271 }
1272
1273 old_width = szHint.width;
1274 old_height = szHint.height;
1275 1098
1276#ifdef XPM_BACKGROUND 1099#ifdef XPM_BACKGROUND
1277 if (pixmap) 1100 if (pixmap)
1278 scr_touch (false); 1101 scr_touch (false);
1279#endif 1102#endif
… …
1292{ 1115{
1293 XWindowAttributes wattr; 1116 XWindowAttributes wattr;
1294 1117
1295 if (newwidth == 0 || newheight == 0) 1118 if (newwidth == 0 || newheight == 0)
1296 { 1119 {
1297 XGetWindowAttributes (display->display, display->root, &wattr); 1120 XGetWindowAttributes (xdisp, display->root, &wattr);
1298 1121
1299 if (newwidth == 0) 1122 if (newwidth == 0)
1300 newwidth = wattr.width - szHint.base_width; 1123 newwidth = wattr.width - szHint.base_width;
1301 if (newheight == 0) 1124 if (newheight == 0)
1302 newheight = wattr.height - szHint.base_height; 1125 newheight = wattr.height - szHint.base_height;
… …
1364 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1187 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1365 1188
1366 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1189 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1367 *p = '\0'; 1190 *p = '\0';
1368 1191
1369 atom = XInternAtom (display->display, server, False); 1192 atom = XInternAtom (xdisp, server, False);
1370 win = XGetSelectionOwner (display->display, atom); 1193 win = XGetSelectionOwner (xdisp, atom);
1371 1194
1372 if (win != None) 1195 if (win != None)
1373 return True; 1196 return True;
1374 } 1197 }
1375 1198
… …
1382 XPoint nspot; 1205 XPoint nspot;
1383 XVaNestedList preedit_attr; 1206 XVaNestedList preedit_attr;
1384 1207
1385 if (!Input_Context 1208 if (!Input_Context
1386 || !focus 1209 || !focus
1387 || !(input_style & XIMPreeditPosition)) 1210 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1388 return; 1211 return;
1389 1212
1390 im_set_position (nspot); 1213 im_set_position (nspot);
1391 1214
1392 if (nspot.x == spot.x && nspot.y == spot.y) 1215 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1411 input_method = 0; 1234 input_method = 0;
1412 } 1235 }
1413 1236
1414 Input_Context = 0; 1237 Input_Context = 0;
1415} 1238}
1239
1240#ifdef ENABLE_XIM_ONTHESPOT
1241
1242static void
1243xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1244{
1245 ((rxvt_term *)client_data)->make_current ();
1246 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1247}
1248
1249static void
1250xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1251{
1252 ((rxvt_term *)client_data)->make_current ();
1253 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1254}
1255
1256static void
1257xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1258{
1259 rxvt_term *term = (rxvt_term *)client_data;
1260 XIMText *text = call_data->text;
1261
1262 term->make_current ();
1263
1264 if (text)
1265 {
1266 void *str;
1267
1268 if (!text->encoding_is_wchar && text->string.multi_byte)
1269 {
1270 // of course, X makes it ugly again
1271 if (term->rs[Rs_imLocale])
1272 SET_LOCALE (term->rs[Rs_imLocale]);
1273
1274 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1275 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1276
1277 if (term->rs[Rs_imLocale])
1278 SET_LOCALE (term->locale);
1279 }
1280 else
1281 str = (void *)text->string.wide_char;
1282
1283 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1284 DT_INT, call_data->caret,
1285 DT_INT, call_data->chg_first,
1286 DT_INT, call_data->chg_length,
1287 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1288 DT_WCS_LEN, str, str ? (int)text->length : 0,
1289 DT_END));
1290 }
1291 else
1292 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1293 DT_INT, call_data->caret,
1294 DT_INT, call_data->chg_first,
1295 DT_INT, call_data->chg_length,
1296 DT_END));
1297}
1298
1299#if 0
1300static void
1301xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1302{
1303 ((rxvt_term *)client_data)->make_current ();
1304 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1305 DT_INT, call_data->position,
1306 DT_INT, call_data->direction,
1307 DT_INT, call_data->style,
1308 DT_END));
1309}
1310#endif
1311
1312#endif
1416 1313
1417/* 1314/*
1418 * Try to open a XIM with the current modifiers, then see if we can 1315 * Try to open a XIM with the current modifiers, then see if we can
1419 * open a suitable preedit type 1316 * open a suitable preedit type
1420 */ 1317 */
… …
1427 XRectangle rect, status_rect, needed_rect; 1324 XRectangle rect, status_rect, needed_rect;
1428 unsigned long fg, bg; 1325 unsigned long fg, bg;
1429 const char *p; 1326 const char *p;
1430 char **s; 1327 char **s;
1431 XIMStyles *xim_styles; 1328 XIMStyles *xim_styles;
1329#ifdef ENABLE_XIM_ONTHESPOT
1330 XIMCallback xcb[4];
1331#endif
1332
1333 set_environ (envv);
1432 1334
1433 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1335 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1434 return false; 1336 return false;
1435 1337
1436 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1437 input_method = display->get_xim (locale, modifiers); 1338 input_method = display->get_xim (locale, modifiers);
1438 if (input_method == NULL) 1339 if (input_method == NULL)
1439 return false; 1340 return false;
1440 1341
1441 xim = input_method->xim; 1342 xim = input_method->xim;
… …
1461 s = rxvt_splitcommastring (p); 1362 s = rxvt_splitcommastring (p);
1462 1363
1463 for (i = found = 0; !found && s[i]; i++) 1364 for (i = found = 0; !found && s[i]; i++)
1464 { 1365 {
1465 if (!strcmp (s[i], "OverTheSpot")) 1366 if (!strcmp (s[i], "OverTheSpot"))
1466 input_style = (XIMPreeditPosition | XIMStatusNothing); 1367 input_style = XIMPreeditPosition | XIMStatusNothing;
1467 else if (!strcmp (s[i], "OffTheSpot")) 1368 else if (!strcmp (s[i], "OffTheSpot"))
1468 input_style = (XIMPreeditArea | XIMStatusArea); 1369 input_style = XIMPreeditArea | XIMStatusArea;
1469 else if (!strcmp (s[i], "Root")) 1370 else if (!strcmp (s[i], "Root"))
1470 input_style = (XIMPreeditNothing | XIMStatusNothing); 1371 input_style = XIMPreeditNothing | XIMStatusNothing;
1471 else if (!strcmp (s[i], "None")) 1372 else if (!strcmp (s[i], "None"))
1472 input_style = (XIMPreeditNone | XIMStatusNone); 1373 input_style = XIMPreeditNone | XIMStatusNone;
1374#ifdef ENABLE_XIM_ONTHESPOT
1375 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1376 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1377#endif
1378 else
1379 input_style = XIMPreeditNothing | XIMStatusNothing;
1473 1380
1474 for (j = 0; j < xim_styles->count_styles; j++) 1381 for (j = 0; j < xim_styles->count_styles; j++)
1475 if (input_style == xim_styles->supported_styles[j]) 1382 if (input_style == xim_styles->supported_styles[j])
1476 { 1383 {
1477 rxvt_freecommastring (s); 1384 rxvt_freecommastring (s);
… …
1515 "*", 1422 "*",
1516 fheight, 1423 fheight,
1517 fheight + 1, fheight - 1, 1424 fheight + 1, fheight - 1,
1518 fheight - 2, fheight + 2); 1425 fheight - 2, fheight + 2);
1519 1426
1520 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1427 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1521 &missing_charset_list, &missing_charset_count, &def_string); 1428 &missing_charset_list, &missing_charset_count, &def_string);
1522 1429
1523 if (missing_charset_list) 1430 if (missing_charset_list)
1524 XFreeStringList (missing_charset_list); 1431 XFreeStringList (missing_charset_list);
1525 1432
… …
1566 XNBackground, bg, 1473 XNBackground, bg,
1567 XNArea, &status_rect, 1474 XNArea, &status_rect,
1568 XNFontSet, fs, 1475 XNFontSet, fs,
1569 NULL); 1476 NULL);
1570 } 1477 }
1478#if ENABLE_XIM_ONTHESPOT
1479 else if (input_style & XIMPreeditCallbacks)
1480 {
1481 im_set_position (spot);
1482
1483 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1484 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1485 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1486# if 0
1487 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1488# endif
1489
1490 preedit_attr = XVaCreateNestedList (0,
1491 XNSpotLocation, &spot,
1492 XNPreeditStartCallback, &xcb[0],
1493 XNPreeditDoneCallback , &xcb[1],
1494 XNPreeditDrawCallback , &xcb[2],
1495# if 0
1496 XNPreeditCaretCallback, &xcb[3],
1497# endif
1498 NULL);
1499 }
1500#endif
1571 1501
1572 Input_Context = XCreateIC (xim, 1502 Input_Context = XCreateIC (xim,
1573 XNInputStyle, input_style, 1503 XNInputStyle, input_style,
1574 XNClientWindow, vt, 1504 XNClientWindow, vt,
1575 XNFocusWindow, parent[0], 1505 XNFocusWindow, parent[0],
… …
1578 status_attr ? XNStatusAttributes : NULL, 1508 status_attr ? XNStatusAttributes : NULL,
1579 status_attr, NULL); 1509 status_attr, NULL);
1580 1510
1581 if (preedit_attr) XFree (preedit_attr); 1511 if (preedit_attr) XFree (preedit_attr);
1582 if (status_attr) XFree (status_attr); 1512 if (status_attr) XFree (status_attr);
1583 if (fs) XFreeFontSet (display->display, fs); 1513 if (fs) XFreeFontSet (xdisp, fs);
1584 1514
1585 if (Input_Context == NULL) 1515 if (Input_Context == NULL)
1586 { 1516 {
1587 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1517 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1588 im_destroy (); 1518 im_destroy ();
1589 return false; 1519 return false;
1590 } 1520 }
1591 1521
1522#if 0
1523 // unfortunately, only the focus window is used by XIM, hard to fix
1524 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1525 vt_select_input ();
1526#endif
1527
1592 if (input_style & XIMPreeditArea) 1528 if (input_style & XIMPreeditArea)
1593 IMSetStatusPosition (); 1529 IMSetStatusPosition ();
1594 1530
1595 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1596 return true; 1531 return true;
1597} 1532}
1598 1533
1599void 1534void
1600rxvt_term::im_cb () 1535rxvt_term::im_cb ()
… …
1602 int i; 1537 int i;
1603 const char *p; 1538 const char *p;
1604 char **s; 1539 char **s;
1605 char buf[IMBUFSIZ]; 1540 char buf[IMBUFSIZ];
1606 1541
1607 SET_R (this); 1542 make_current ();
1608 1543
1609 im_destroy (); 1544 im_destroy ();
1610 1545
1611 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1612 if (Input_Context) 1546 if (Input_Context)
1613 return; 1547 return;
1614 1548
1615#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1549#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1616 if (rs[Rs_imLocale]) 1550 if (rs[Rs_imLocale])
… …
1689 XFree (preedit_attr); 1623 XFree (preedit_attr);
1690 XFree (status_attr); 1624 XFree (status_attr);
1691} 1625}
1692#endif /* USE_XIM */ 1626#endif /* USE_XIM */
1693 1627
1694/*----------------------------------------------------------------------*/
1695rxvt_t rxvt_current_term;
1696
1697/*----------------------- end-of-file (C source) -----------------------*/ 1628/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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