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.186 by root, Tue Jan 17 15:41:33 2006 UTC vs.
Revision 1.242 by sasha, Wed Aug 15 22:41:52 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
46 46
47#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 50
51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) 51vector<rxvt_term *> rxvt_term::termlist;
52static uid_t saved_euid; 52
53static gid_t saved_egid; 53// used to tell global functions which terminal instance is "active"
54#endif 54rxvt_t rxvt_current_term;
55
56static char curlocale[128], savelocale[128];
55 57
56bool 58bool
57rxvt_tainted ()
58{
59#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
60 return getuid () != saved_euid || getgid () != saved_egid;
61#else
62 return false;
63#endif
64}
65
66vector<rxvt_term *> rxvt_term::termlist;
67
68static char curlocale[128], savelocale[128];
69
70bool
71rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
72{ 60{
61 int size = strlen (locale) + 1;
62
63 if (size > sizeof (curlocale))
64 rxvt_fatal ("locale string too long, aborting.\n");
65
73 if (!locale || !strncmp (locale, curlocale, 128)) 66 if (!locale || !memcmp (locale, curlocale, size))
74 return false; 67 return false;
75 68
76 strncpy (curlocale, locale, 128); 69 memcpy (curlocale, locale, size);
77 setlocale (LC_CTYPE, curlocale); 70 setlocale (LC_CTYPE, curlocale);
78 return true; 71 return true;
79} 72}
80 73
81void 74void
82rxvt_push_locale (const char *locale) 75rxvt_push_locale (const char *locale) NOTHROW
83{ 76{
84 strcpy (savelocale, curlocale); 77 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale); 78 rxvt_set_locale (locale);
86} 79}
87 80
88void 81void
89rxvt_pop_locale () 82rxvt_pop_locale () NOTHROW
90{ 83{
91 rxvt_set_locale (savelocale); 84 rxvt_set_locale (savelocale);
92} 85}
93 86
94#if ENABLE_COMBINING 87#if ENABLE_COMBINING
… …
155} 148}
156#endif 149#endif
157 150
158rxvt_term::rxvt_term () 151rxvt_term::rxvt_term ()
159 : 152 :
160#if TRANSPARENT 153#if ENABLE_TRANSPARENCY || ENABLE_PERL
161 rootwin_ev (this, &rxvt_term::rootwin_cb), 154 rootwin_ev (this, &rxvt_term::rootwin_cb),
155#endif
156#if ENABLE_TRANSPARENCY
157 check_our_parents_ev(this, &rxvt_term::check_our_parents_cb),
162#endif 158#endif
163#ifdef HAVE_SCROLLBARS 159#ifdef HAVE_SCROLLBARS
164 scrollbar_ev (this, &rxvt_term::x_cb), 160 scrollbar_ev (this, &rxvt_term::x_cb),
165#endif 161#endif
166#ifdef CURSOR_BLINK 162#ifdef CURSOR_BLINK
… …
182 pointer_ev (this, &rxvt_term::pointer_cb), 178 pointer_ev (this, &rxvt_term::pointer_cb),
183#endif 179#endif
184#ifdef USE_XIM 180#ifdef USE_XIM
185 im_ev (this, &rxvt_term::im_cb), 181 im_ev (this, &rxvt_term::im_cb),
186#endif 182#endif
183#ifndef NO_BELL
184 bell_ev (this, &rxvt_term::bell_cb),
185#endif
187 termwin_ev (this, &rxvt_term::x_cb), 186 termwin_ev (this, &rxvt_term::x_cb),
188 vt_ev (this, &rxvt_term::x_cb), 187 vt_ev (this, &rxvt_term::x_cb),
188 child_ev (this, &rxvt_term::child_cb),
189 check_ev (this, &rxvt_term::check_cb), 189 check_ev (this, &rxvt_term::check_cb),
190 flush_ev (this, &rxvt_term::flush_cb), 190 flush_ev (this, &rxvt_term::flush_cb),
191 destroy_ev (this, &rxvt_term::destroy_cb), 191 destroy_ev (this, &rxvt_term::destroy_cb),
192 pty_ev (this, &rxvt_term::pty_cb), 192 pty_ev (this, &rxvt_term::pty_cb),
193 incr_ev (this, &rxvt_term::incr_cb) 193 incr_ev (this, &rxvt_term::incr_cb)
… …
196 196
197 termlist.push_back (this); 197 termlist.push_back (this);
198 198
199#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
200 keyboard = new keyboard_manager; 200 keyboard = new keyboard_manager;
201
202 if (!keyboard)
203 rxvt_fatal ("out of memory, aborting.\n");
204#endif 201#endif
205} 202}
206 203
207// clean up the most important stuff, do *not* call x or free mem etc. 204// clean up the most important stuff, do *not* call x or free mem etc.
208// for use before an emergency exit 205// for use before an emergency exit
209void rxvt_term::emergency_cleanup () 206void rxvt_term::emergency_cleanup ()
210{ 207{
211 if (cmd_pid) 208 if (cmd_pid)
212 kill (-cmd_pid, SIGHUP); 209 kill (-cmd_pid, SIGHUP);
213 210
211 pty_ev.stop ();
214 delete pty; pty = 0; 212 delete pty; pty = 0;
215} 213}
216 214
217rxvt_term::~rxvt_term () 215rxvt_term::~rxvt_term ()
218{ 216{
219 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
220
221 termlist.erase (find (termlist.begin (), termlist.end(), this)); 217 termlist.erase (find (termlist.begin (), termlist.end(), this));
222 218
223 emergency_cleanup (); 219 emergency_cleanup ();
224 220
225#if ENABLE_STYLES 221#if ENABLE_STYLES
… …
229#endif 225#endif
230 delete fontset[0]; 226 delete fontset[0];
231 227
232 if (display) 228 if (display)
233 { 229 {
234 dDisp;
235
236 selection_clear (); 230 selection_clear ();
237 231
238#ifdef USE_XIM 232#ifdef USE_XIM
239 im_destroy (); 233 im_destroy ();
240#endif 234#endif
241#ifdef XTERM_SCROLLBAR 235#ifdef XTERM_SCROLLBAR
242 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 236 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
243 if (ShadowGC) XFreeGC (disp, ShadowGC); 237 if (ShadowGC) XFreeGC (dpy, ShadowGC);
244#endif 238#endif
245#ifdef PLAIN_SCROLLBAR 239#ifdef PLAIN_SCROLLBAR
246 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 240 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
247#endif 241#endif
248#ifdef NEXT_SCROLLBAR 242#ifdef NEXT_SCROLLBAR
249 if (blackGC) XFreeGC (disp, blackGC); 243 if (blackGC) XFreeGC (dpy, blackGC);
250 if (whiteGC) XFreeGC (disp, whiteGC); 244 if (whiteGC) XFreeGC (dpy, whiteGC);
251 if (grayGC) XFreeGC (disp, grayGC); 245 if (grayGC) XFreeGC (dpy, grayGC);
252 if (darkGC) XFreeGC (disp, darkGC); 246 if (darkGC) XFreeGC (dpy, darkGC);
253 if (stippleGC) XFreeGC (disp, stippleGC); 247 if (stippleGC) XFreeGC (dpy, stippleGC);
254 if (dimple) XFreePixmap (disp, dimple); 248 if (dimple) XFreePixmap (dpy, dimple);
255 if (upArrow) XFreePixmap (disp, upArrow); 249 if (upArrow) XFreePixmap (dpy, upArrow);
256 if (downArrow) XFreePixmap (disp, downArrow); 250 if (downArrow) XFreePixmap (dpy, downArrow);
257 if (upArrowHi) XFreePixmap (disp, upArrowHi); 251 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
258 if (downArrowHi) XFreePixmap (disp, downArrowHi); 252 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
259#endif 253#endif
260#ifdef RXVT_SCROLLBAR 254#ifdef RXVT_SCROLLBAR
261 if (topShadowGC) XFreeGC (disp, topShadowGC); 255 if (topShadowGC) XFreeGC (dpy, topShadowGC);
262 if (botShadowGC) XFreeGC (disp, botShadowGC); 256 if (botShadowGC) XFreeGC (dpy, botShadowGC);
263 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 257 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
264#endif 258#endif
265 if (gc) XFreeGC (disp, gc); 259 if (gc) XFreeGC (dpy, gc);
266 260
267 delete drawable; 261 delete drawable;
268 // destroy all windows 262 // destroy all windows
269 if (parent[0]) 263 if (parent[0])
270 XDestroyWindow (disp, parent[0]); 264 XDestroyWindow (dpy, parent[0]);
271 }
272 265
273 // TODO: free pixcolours, colours should become part of rxvt_display 266 for (int i = 0; i < TOTAL_COLORS; i++)
274 delete pix_colors_focused; 267 if (ISSET_PIXCOLOR (i))
268 {
269 pix_colors_focused [i].free (this);
275#if OFF_FOCUS_FADING 270#if OFF_FOCUS_FADING
271 pix_colors_unfocused [i].free (this);
272#endif
273 }
274
275 clear ();
276 }
277
278 delete [] pix_colors_focused;
279#if OFF_FOCUS_FADING
276 delete pix_colors_unfocused; 280 delete [] pix_colors_unfocused;
277#endif 281#endif
278 282
279 displays.put (display); 283 displays.put (display);
280 284
281 scr_release (); 285 scr_release ();
… …
284 for (int i = 0; i < allocated.size (); i++) 288 for (int i = 0; i < allocated.size (); i++)
285 free (allocated [i]); 289 free (allocated [i]);
286 290
287 free (selection.text); 291 free (selection.text);
288 // TODO: manage env vars in child only(!) 292 // TODO: manage env vars in child only(!)
289 free (env_windowid);
290 free (env_display); 293 free (env_display);
291 free (env_term); 294 free (env_term);
292 free (env_colorfgbg);
293 free (locale); 295 free (locale);
294 free (v_buffer); 296 free (v_buffer);
295 free (incr_buf); 297 free (incr_buf);
296 298
297 delete envv; 299 delete envv;
… …
300#ifdef KEYSYM_RESOURCE 302#ifdef KEYSYM_RESOURCE
301 delete keyboard; 303 delete keyboard;
302#endif 304#endif
303} 305}
304 306
307// child has exited, usually destroys
305void 308void
306rxvt_term::child_exit () 309rxvt_term::child_cb (child_watcher &w, int status)
307{ 310{
311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312
308 cmd_pid = 0; 313 cmd_pid = 0;
309 314
310 if (!OPTION (Opt_hold)) 315 if (!option (Opt_hold))
311 destroy (); 316 destroy ();
312} 317}
313 318
314void 319void
315rxvt_term::destroy () 320rxvt_term::destroy ()
316{ 321{
317 if (destroy_ev.active) 322 if (destroy_ev.active)
318 return; 323 return;
319 324
325 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
326
320#if ENABLE_OVERLAY 327#if ENABLE_OVERLAY
321 scr_overlay_off (); 328 scr_overlay_off ();
322#endif 329#endif
323 330
324 if (display) 331 if (display)
… …
327 im_ev.stop (display); 334 im_ev.stop (display);
328#endif 335#endif
329#if HAVE_SCROLLBARS 336#if HAVE_SCROLLBARS
330 scrollbar_ev.stop (display); 337 scrollbar_ev.stop (display);
331#endif 338#endif
332#if TRANSPARENT 339#if ENABLE_TRANSPARENCY || ENABLE_PERL
333 rootwin_ev.stop (display); 340 rootwin_ev.stop (display);
334#endif 341#endif
335 incr_ev.stop (); 342 incr_ev.stop ();
336 termwin_ev.stop (display); 343 termwin_ev.stop (display);
337 vt_ev.stop (display); 344 vt_ev.stop (display);
… …
378{ 385{
379 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 386 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
380 (*t)->emergency_cleanup (); 387 (*t)->emergency_cleanup ();
381} 388}
382 389
383#if ENABLE_FRILLS 390#if !ENABLE_MINIMAL
384static void 391static void
385print_x_error (Display *dpy, XErrorEvent *event) 392print_x_error (Display *dpy, XErrorEvent *event)
386{ 393{
387 char buffer[BUFSIZ]; 394 char buffer[BUFSIZ];
388 char mesg[BUFSIZ]; 395 char mesg[BUFSIZ];
… …
436 GET_R->allowedxerror = event->error_code; 443 GET_R->allowedxerror = event->error_code;
437 else 444 else
438 { 445 {
439 // GET_R is most likely not the terminal which caused the error, 446 // GET_R is most likely not the terminal which caused the error,
440 // so just output the error and continue 447 // so just output the error and continue
441#if ENABLE_FRILLS 448#if ENABLE_MINIMAL
449 old_xerror_handler (display, event);
450#else
442 print_x_error (display, event); 451 print_x_error (display, event);
443#else
444 old_xerror_handler (display, event);
445#endif 452#endif
446 } 453 }
447 454
448 return 0; 455 return 0;
449} 456}
… …
457 _exit (EXIT_FAILURE); 464 _exit (EXIT_FAILURE);
458} 465}
459 466
460/*----------------------------------------------------------------------*/ 467/*----------------------------------------------------------------------*/
461bool 468bool
462rxvt_term::init (int argc, const char *const *argv) 469rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
463{ 470{
471 this->envv = envv;
472
464 SET_R (this); 473 SET_R (this);
465 set_locale (""); 474 set_locale ("");
466 set_environ (envv); // few things in X do not call setlocale :( 475 set_environ (envv); // few things in X do not call setlocale :(
467 476
468 if (!init_vars ()) 477 if (!init_vars ())
… …
475#ifdef KEYSYM_RESOURCE 484#ifdef KEYSYM_RESOURCE
476 keyboard->register_done (); 485 keyboard->register_done ();
477#endif 486#endif
478 487
479#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
480 if (OPTION (Opt_scrollBar)) 489 if (option (Opt_scrollBar))
481 scrollBar.setIdle (); /* set existence for size calculations */ 490 scrollBar.setIdle (); /* set existence for size calculations */
482#endif 491#endif
483 492
493 pty = ptytty::create ();
494
495 create_windows (argc, argv);
496
497 init_xlocale ();
498
499 scr_reset (); // initialize screen
500
501#if 0
502 XSynchronize (dpy, True);
503#endif
504
505#ifdef HAVE_SCROLLBARS
506 if (option (Opt_scrollBar))
507 resize_scrollbar (); /* create and map scrollbar */
508#endif
509#ifdef HAVE_BG_PIXMAP
510 {
511 bool changed = false;
512 bgPixmap.set_target (this);
513
514#ifdef ENABLE_TRANSPARENCY
515 if (option (Opt_transparent))
516 {
517 bgPixmap.set_transparent ();
518#ifdef HAVE_AFTERIMAGE
519 if (rs [Rs_blurradius])
520 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521#endif
522 if (ISSET_PIXCOLOR (Color_tint))
523 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524 if (rs [Rs_shade])
525 bgPixmap.set_shade (rs [Rs_shade]);
526 changed = true;
527
528 bgPixmap.set_root_pixmap ();
529 XSelectInput (dpy, display->root, PropertyChangeMask);
530 rootwin_ev.start (display, display->root);
531 }
532#endif
533
534#ifdef XPM_BACKGROUND
535 if (rs[Rs_backgroundPixmap] != NULL)
536 {
537 const char *p = rs[Rs_backgroundPixmap];
538
539 if ((p = strchr (p, ';')) != NULL)
540 {
541 p++;
542 bgPixmap.set_geometry (p);
543 }
544 else
545 bgPixmap.set_defaultGeometry ();
546
547 changed = bgPixmap.set_file (rs[Rs_backgroundPixmap]);
548 }
549#endif
550 if (changed)
551 {
552 bgPixmap.render ();
553 scr_touch (true);
554 }
555 }
556#endif
557
484#if ENABLE_PERL 558#if ENABLE_PERL
485 if (!rs[Rs_perl_ext_1])
486 rs[Rs_perl_ext_1] = "default";
487
488 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
489 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
490 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
491 {
492#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
493 // ignore some perl-related arguments if some bozo installed us set[ug]id
494 if (rxvt_tainted ())
495 {
496 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
497 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
498 {
499 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
500 rs[Rs_perl_lib] = 0;
501 rs[Rs_perl_eval] = 0;
502 }
503 }
504#endif
505 rxvt_perl.init (this);
506 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
507 }
508#endif
509
510 pty = rxvt_new_ptytty ();
511
512 create_windows (argc, argv);
513
514 dDisp;
515
516 init_xlocale ();
517
518 scr_reset (); // initialize screen
519
520#if 0
521 XSynchronize (disp, True);
522#endif
523
524#ifdef HAVE_SCROLLBARS
525 if (OPTION (Opt_scrollBar))
526 resize_scrollbar (); /* create and map scrollbar */
527#endif
528#ifdef TRANSPARENT
529 if (OPTION (Opt_transparent))
530 {
531 XSelectInput (disp, display->root, PropertyChangeMask);
532 check_our_parents ();
533 rootwin_ev.start (display, display->root); 559 rootwin_ev.start (display, display->root);
534 }
535#endif 560#endif
536
537 XMapWindow (disp, vt);
538 XMapWindow (disp, parent[0]);
539 561
540 set_colorfgbg (); 562 set_colorfgbg ();
541 563
542 init_command (cmd_argv); 564 init_command (cmd_argv);
543 565
… …
548 570
549 check_ev.start (); 571 check_ev.start ();
550 572
551 HOOK_INVOKE ((this, HOOK_START, DT_END)); 573 HOOK_INVOKE ((this, HOOK_START, DT_END));
552 574
575#if ENABLE_XEMBED
576 if (rs[Rs_embed])
577 {
578 long info[2] = { 0, XEMBED_MAPPED };
579
580 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
581 32, PropModeReplace, (unsigned char *)&info, 2);
582 }
583#endif
584
585 XMapWindow (dpy, vt);
586 XMapWindow (dpy, parent[0]);
587
553 return true; 588 return true;
554} 589}
555 590
556static struct sig_handlers 591static struct sig_handlers
557{ 592{
558 sig_watcher sw_chld, sw_term, sw_int; 593 sig_watcher sw_term, sw_int;
559 594
560 void sig_chld (sig_watcher &w)
561 {
562 // we are being called for every SIGCHLD, find the corresponding term
563 int pid;
564
565 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
566 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
567 if (pid == (*t)->cmd_pid)
568 {
569 (*t)->child_exit ();
570 break;
571 }
572 }
573
574 /* 595 /*
575 * Catch a fatal signal and tidy up before quitting 596 * Catch a fatal signal and tidy up before quitting
576 */ 597 */
577 void 598 void
578 sig_term (sig_watcher &w) 599 sig_term (sig_watcher &w)
579 { 600 {
580#ifdef DEBUG_CMD
581 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
582#endif
583 rxvt_emergency_cleanup (); 601 rxvt_emergency_cleanup ();
584 signal (w.signum, SIG_DFL); 602 signal (w.signum, SIG_DFL);
585 kill (getpid (), w.signum); 603 kill (getpid (), w.signum);
586 } 604 }
587 605
588 sig_handlers () 606 sig_handlers ()
589 : sw_chld (this, &sig_handlers::sig_chld),
590 sw_term (this, &sig_handlers::sig_term), 607 : sw_term (this, &sig_handlers::sig_term),
591 sw_int (this, &sig_handlers::sig_term) 608 sw_int (this, &sig_handlers::sig_term)
592 { 609 {
593 } 610 }
594} sig_handlers; 611} sig_handlers;
595 612
596char **rxvt_environ; // startup environment 613char **rxvt_environ; // startup environment
597 614
598void 615void
599rxvt_init () 616rxvt_init ()
600{ 617{
601 uid_t uid = getuid (); 618 ptytty::init ();
602 gid_t gid = getgid ();
603
604 // before doing anything else, check for setuid/setgid operation,
605 // start the helper process and drop privileges
606 if (uid != geteuid ()
607 || 1 //D
608 || gid != getegid ())
609 {
610#if PTYTTY_HELPER
611 rxvt_ptytty_server ();
612#else
613 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
614#endif
615
616 // drop privileges
617#if HAVE_SETRESUID
618 setresgid (gid, gid, gid);
619 setresuid (uid, uid, uid);
620#elif HAVE_SETREUID
621 setregid (gid, gid);
622 setreuid (uid, uid);
623#elif HAVE_SETUID
624 setgid (gid);
625 setuid (uid);
626#endif
627
628 if (uid != geteuid ()
629 || gid != getegid ())
630 rxvt_fatal ("unable to drop privileges, aborting.\n");
631 }
632 619
633 rxvt_environ = environ; 620 rxvt_environ = environ;
634
635 /*
636 * Save and then give up any super-user privileges
637 * If we need privileges in any area then we must specifically request it.
638 * We should only need to be root in these cases:
639 * 1. write utmp entries on some systems
640 * 2. chown tty on some systems
641 */
642 rxvt_privileges (SAVE);
643 rxvt_privileges (IGNORE);
644 621
645 signal (SIGHUP, SIG_IGN); 622 signal (SIGHUP, SIG_IGN);
646 signal (SIGPIPE, SIG_IGN); 623 signal (SIGPIPE, SIG_IGN);
647 624
648 sig_handlers.sw_chld.start (SIGCHLD);
649 sig_handlers.sw_term.start (SIGTERM); 625 sig_handlers.sw_term.start (SIGTERM);
650 sig_handlers.sw_int.start (SIGINT); 626 sig_handlers.sw_int.start (SIGINT);
651 627
652 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 628 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
653 /* signal (SIGURG, SIG_DFL); */ 629 /* signal (SIGURG, SIG_DFL); */
… …
682 rxvt_fatal ("memory allocation failure. aborting.\n"); 658 rxvt_fatal ("memory allocation failure. aborting.\n");
683 659
684 return p; 660 return p;
685} 661}
686 662
687void * 663void *
688rxvt_realloc (void *ptr, size_t size) 664rxvt_realloc (void *ptr, size_t size)
689{ 665{
690 void *p = realloc (ptr, size); 666 void *p = realloc (ptr, size);
691 667
692 if (!p) 668 if (!p)
693 rxvt_fatal ("memory allocation failure. aborting.\n"); 669 rxvt_fatal ("memory allocation failure. aborting.\n");
694 670
695 return p; 671 return p;
696} 672}
697 673
698/* ------------------------------------------------------------------------- *
699 * PRIVILEGED OPERATIONS *
700 * ------------------------------------------------------------------------- */
701/* take care of suid/sgid super-user (root) privileges */
702void
703rxvt_privileges (rxvt_privaction action)
704{
705#if ! defined(__CYGWIN32__)
706# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
707 /* setreuid () is the poor man's setuid (), seteuid () */
708# define seteuid(a) setreuid(-1, (a))
709# define setegid(a) setregid(-1, (a))
710# define HAVE_SETEUID
711# endif
712# ifdef HAVE_SETEUID
713 switch (action)
714 {
715 case IGNORE:
716 /*
717 * change effective uid/gid - not real uid/gid - so we can switch
718 * back to root later, as required
719 */
720 setegid (getgid ());
721 seteuid (getuid ());
722 break;
723 case SAVE:
724 saved_egid = getegid ();
725 saved_euid = geteuid ();
726 break;
727 case RESTORE:
728 setegid (saved_egid);
729 seteuid (saved_euid);
730 break;
731 }
732# else
733 switch (action)
734 {
735 case IGNORE:
736 setgid (getgid ());
737 setuid (getuid ());
738 /* FALLTHROUGH */
739 case SAVE:
740 /* FALLTHROUGH */
741 case RESTORE:
742 break;
743 }
744# endif
745#endif
746}
747
748/*----------------------------------------------------------------------*/ 674/*----------------------------------------------------------------------*/
749/* 675/*
750 * window size/position calculcations for XSizeHint and other storage. 676 * window size/position calculations for XSizeHint and other storage.
751 * if width/height are non-zero then override calculated width/height 677 * if width/height are non-zero then override calculated width/height
752 */ 678 */
753void 679void
754rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 680rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
755{ 681{
756 short recalc_x, recalc_y; 682 short recalc_x, recalc_y;
757 int x, y, sb_w, flags; 683 int x, y, sb_w, flags;
758 unsigned int w, h; 684 unsigned int w, h;
759 unsigned int max_width, max_height; 685 unsigned int max_width, max_height;
760 dDisp;
761
762 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
763 ncol, nrow, szHint.width, szHint.height));
764 686
765 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 687 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
766 szHint.win_gravity = NorthWestGravity; 688 szHint.win_gravity = NorthWestGravity;
767 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 689 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
768 690
… …
830 752
831 if (scrollBar.state) 753 if (scrollBar.state)
832 { 754 {
833 sb_w = scrollbar_TotalWidth (); 755 sb_w = scrollbar_TotalWidth ();
834 szHint.base_width += sb_w; 756 szHint.base_width += sb_w;
757
835 if (!OPTION (Opt_scrollBar_right)) 758 if (!option (Opt_scrollBar_right))
836 window_vt_x += sb_w; 759 window_vt_x += sb_w;
837 } 760 }
838 761
839 szHint.width_inc = fwidth; 762 szHint.width_inc = fwidth;
840 szHint.height_inc = fheight; 763 szHint.height_inc = fheight;
841 szHint.min_width = szHint.base_width + szHint.width_inc; 764 szHint.min_width = szHint.base_width + szHint.width_inc;
842 szHint.min_height = szHint.base_height + szHint.height_inc; 765 szHint.min_height = szHint.base_height + szHint.height_inc;
843 766
844 if (newwidth && newwidth - szHint.base_width < max_width) 767 if (newwidth && newwidth - szHint.base_width < max_width)
845 { 768 {
846 szHint.width = newwidth; 769 szHint.width = newwidth;
… …
861 { 784 {
862 min_it (height, max_height); 785 min_it (height, max_height);
863 szHint.height = szHint.base_height + height; 786 szHint.height = szHint.base_height + height;
864 } 787 }
865 788
866 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 789 if (scrollBar.state && option (Opt_scrollBar_right))
867 window_sb_x = szHint.width - sb_w; 790 window_sb_x = szHint.width - sb_w;
868 791
869 if (recalc_x) 792 if (recalc_x)
870 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 793 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
794
871 if (recalc_y) 795 if (recalc_y)
872 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 796 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
873 797
874 ncol = width / fwidth; 798 ncol = width / fwidth;
875 nrow = height / fheight; 799 nrow = height / fheight;
876 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
877 ncol, nrow, szHint.width,
878 szHint.height));
879 return;
880} 800}
881 801
882/*----------------------------------------------------------------------*/ 802/*----------------------------------------------------------------------*/
883/* 803/*
884 * Tell the teletype handler what size the window is. 804 * Tell the teletype handler what size the window is.
… …
936 delete fontset[0]; 856 delete fontset[0];
937 fontset[0] = fs; 857 fontset[0] = fs;
938 858
939 prop = (*fs)[1]->properties (); 859 prop = (*fs)[1]->properties ();
940 prop.height += lineSpace; 860 prop.height += lineSpace;
861
941 fs->set_prop (prop); 862 fs->set_prop (prop, false);
942 863
943 fwidth = prop.width; 864 fwidth = prop.width;
944 fheight = prop.height; 865 fheight = prop.height;
945 fbase = prop.ascent; 866 fbase = prop.ascent;
946 867
… …
955 { 876 {
956 fontset[style] = fs = new rxvt_fontset (this); 877 fontset[style] = fs = new rxvt_fontset (this);
957 rxvt_fontprop prop2 = prop; 878 rxvt_fontprop prop2 = prop;
958 879
959 if (res) 880 if (res)
960 prop2.weight = prop2.slant = rxvt_fontprop::unset; 881 {
882 fs->populate (res);
883 fs->set_prop (prop2, false);
884 }
961 else 885 else
962 { 886 {
963 res = fontset[0]->fontdesc; 887 fs->populate (fontset[0]->fontdesc);
964 888
965 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 889 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
966 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 890 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
891
892 fs->set_prop (prop2, true);
967 } 893 }
968 894
969 fs->populate (res);
970 fs->set_prop (prop2);
971 } 895 }
972#else 896#else
973 fontset[style] = fontset[0]; 897 fontset[style] = fontset[0];
974#endif 898#endif
975 } 899 }
… …
984 return true; 908 return true;
985} 909}
986 910
987void rxvt_term::set_string_property (Atom prop, const char *str, int len) 911void rxvt_term::set_string_property (Atom prop, const char *str, int len)
988{ 912{
989 XChangeProperty (display->display, parent[0], 913 XChangeProperty (dpy, parent[0],
990 prop, XA_STRING, 8, PropModeReplace, 914 prop, XA_STRING, 8, PropModeReplace,
991 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 915 (const unsigned char *)str, len >= 0 ? len : strlen (str));
992} 916}
993 917
994void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 918void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
995{ 919{
996 wchar_t *ws = rxvt_mbstowcs (str, len); 920 wchar_t *ws = rxvt_mbstowcs (str, len);
997 char *s = rxvt_wcstoutf8 (ws); 921 char *s = rxvt_wcstoutf8 (ws);
998 922
999 XChangeProperty (display->display, parent[0], 923 XChangeProperty (dpy, parent[0],
1000 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 924 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
1001 (const unsigned char *)s, strlen (s)); 925 (const unsigned char *)s, strlen (s));
1002 926
1003 free (s); 927 free (s);
1004 free (ws); 928 free (ws);
… …
1029void 953void
1030rxvt_term::set_window_color (int idx, const char *color) 954rxvt_term::set_window_color (int idx, const char *color)
1031{ 955{
1032 rxvt_color xcol; 956 rxvt_color xcol;
1033 int i; 957 int i;
1034 958
1035 if (color == NULL || *color == '\0') 959 if (color == NULL || *color == '\0')
1036 return; 960 return;
961
962 color = strdup (color);
963 allocated.push_back ((void *)color);
964 rs[Rs_color + idx] = color;
1037 965
1038 /* handle color aliases */ 966 /* handle color aliases */
1039 if (isdigit (*color)) 967 if (isdigit (*color))
1040 { 968 {
1041 i = atoi (color); 969 i = atoi (color);
1042 970
1043 if (i >= 8 && i <= 15) 971 if (i >= 8 && i <= 15)
1044 { /* bright colors */ 972 { /* bright colors */
1045 i -= 8; 973 i -= 8;
1046 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 974 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1047 SET_PIXCOLOR (idx);
1048 goto done; 975 goto done;
1049 } 976 }
1050 977
1051 if (i >= 0 && i <= 7) 978 if (i >= 0 && i <= 7)
1052 { /* normal colors */ 979 { /* normal colors */
1053 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 980 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1054 SET_PIXCOLOR (idx);
1055 goto done; 981 goto done;
1056 } 982 }
1057 } 983 }
1058 984
1059 if (!rXParseAllocColor (&xcol, color)) 985 set_color (xcol, color);
1060 return;
1061
1062 /* XStoreColor (display->display, display->cmap, XColor*); */
1063 986
1064 /* 987 /*
1065 * FIXME: should free colors here, but no idea how to do it so instead, 988 * FIXME: should free colors here, but no idea how to do it so instead,
1066 * so just keep gobbling up the colormap 989 * so just keep gobbling up the colormap
1067 */ 990 */
1068# if 0
1069 for (i = Color_Black; i <= Color_White; i++)
1070 if (pix_colors[idx] == pix_colors[i])
1071 break;
1072 if (i > Color_White)
1073 {
1074 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1075 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1076 DisplayPlanes (display->display, display->screen));
1077 }
1078# endif
1079 991
1080 pix_colors_focused[idx] = xcol; 992 pix_colors_focused[idx] = xcol;
1081 SET_PIXCOLOR (idx);
1082 993
1083 /* XSetWindowAttributes attr; */ 994 /* XSetWindowAttributes attr; */
1084 /* Cursor cursor; */ 995 /* Cursor cursor; */
1085done: 996done:
1086
1087#if OFF_FOCUS_FADING
1088 if (rs[Rs_fade])
1089 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1090#endif
1091
1092 /*TODO: handle Color_BD, scrollbar background, etc. */ 997 /*TODO: handle Color_BD, scrollbar background, etc. */
1093 998
999 update_fade_color (idx);
1094 recolour_cursor (); 1000 recolour_cursor ();
1095 scr_recolour (); 1001 scr_recolour ();
1096} 1002}
1097 1003
1098#else 1004#else
… …
1100#endif /* XTERM_COLOR_CHANGE */ 1006#endif /* XTERM_COLOR_CHANGE */
1101 1007
1102void 1008void
1103rxvt_term::recolour_cursor () 1009rxvt_term::recolour_cursor ()
1104{ 1010{
1105 XColor xcol[2]; 1011 XColor fg, bg;
1106 1012
1107 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1013 (ISSET_PIXCOLOR (Color_pointer_fg)
1108 ? pix_colors_focused[Color_pointer_fg] 1014 ? pix_colors_focused[Color_pointer_fg]
1109 : pix_colors_focused[Color_fg]; 1015 : pix_colors_focused[Color_fg]).get (fg);
1016
1110 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1017 (ISSET_PIXCOLOR (Color_pointer_bg)
1111 ? pix_colors_focused[Color_pointer_bg] 1018 ? pix_colors_focused[Color_pointer_bg]
1112 : pix_colors_focused[Color_bg]; 1019 : pix_colors_focused[Color_bg]).get (bg);
1113 1020
1114 XQueryColors (display->display, display->cmap, xcol, 2); 1021 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1115 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1116} 1022}
1117 1023
1118/*----------------------------------------------------------------------*/ 1024/*----------------------------------------------------------------------*/
1119/* 1025/*
1120 * find if fg/bg matches any of the normal (low-intensity) colors 1026 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1124{ 1030{
1125 unsigned int i; 1031 unsigned int i;
1126 const char *xpmb = "\0"; 1032 const char *xpmb = "\0";
1127 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1033 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1128 1034
1129 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1130 strcpy (fstr, "default"); 1035 strcpy (fstr, "default");
1131 strcpy (bstr, "default"); 1036 strcpy (bstr, "default");
1132 for (i = Color_Black; i <= Color_White; i++) 1037 for (i = Color_Black; i <= Color_White; i++)
1133 if (pix_colors[Color_fg] == pix_colors[i]) 1038 if (pix_colors[Color_fg] == pix_colors[i])
1134 { 1039 {
… …
1149 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1054 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1150} 1055}
1151 1056
1152/*----------------------------------------------------------------------*/ 1057/*----------------------------------------------------------------------*/
1153 1058
1154int 1059bool
1155rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1060rxvt_term::set_color (rxvt_color &color, const char *name)
1156{ 1061{
1157 if (!screen_in_out->set (display, colour)) 1062 if (color.set (this, name))
1158 {
1159 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1160 return false;
1161 }
1162
1163 return true; 1063 return true;
1064
1065 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1066 return false;
1067}
1068
1069void
1070rxvt_term::alias_color (int dst, int src)
1071{
1072 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1164} 1073}
1165 1074
1166/* -------------------------------------------------------------------- * 1075/* -------------------------------------------------------------------- *
1167 * - WINDOW RESIZING - * 1076 * - WINDOW RESIZING - *
1168 * -------------------------------------------------------------------- */ 1077 * -------------------------------------------------------------------- */
1169void 1078void
1170rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1079rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1171{ 1080{
1172 int fix_screen; 1081 int fix_screen;
1173 int old_width = szHint.width, old_height = szHint.height; 1082 int old_width = szHint.width;
1174 dDisp; 1083 int old_height = szHint.height;
1175 1084
1176 window_calc (newwidth, newheight); 1085 window_calc (newwidth, newheight);
1086
1087 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1177 XSetWMNormalHints (disp, parent[0], &szHint); 1088 XSetWMNormalHints (dpy, parent[0], &szHint);
1178 1089
1179 if (!ignoreparent) 1090 if (!ignoreparent)
1180 { 1091 {
1181#ifdef SMART_RESIZE 1092#ifdef SMART_RESIZE
1182 /* 1093 /*
… …
1186 int x, y, x1, y1; 1097 int x, y, x1, y1;
1187 int dx, dy; 1098 int dx, dy;
1188 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1099 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1189 Window unused_cr; 1100 Window unused_cr;
1190 1101
1191 XTranslateCoordinates (disp, parent[0], display->root, 1102 XTranslateCoordinates (dpy, parent[0], display->root,
1192 0, 0, &x, &y, &unused_cr); 1103 0, 0, &x, &y, &unused_cr);
1193 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1104 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1194 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1105 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1195 /* 1106 /*
1196 * if display->root isn't the parent window, a WM will probably have offset 1107 * if display->root isn't the parent window, a WM will probably have offset
1197 * our position for handles and decorations. Counter it 1108 * our position for handles and decorations. Counter it
1198 */ 1109 */
… …
1200 { 1111 {
1201 x -= x1; 1112 x -= x1;
1202 y -= y1; 1113 y -= y1;
1203 } 1114 }
1204 1115
1205 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1116 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1206 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1117 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1207 dx = old_width - szHint.width; 1118 dx = old_width - szHint.width;
1208 dy = old_height - szHint.height; 1119 dy = old_height - szHint.height;
1209 1120
1210 /* Check position of the center of the window */ 1121 /* Check position of the center of the window */
1211 if (x < x1) /* left half */ 1122 if (x < x1) /* left half */
1212 dx = 0; 1123 dx = 0;
… …
1215 if (y < y1) /* top half */ 1126 if (y < y1) /* top half */
1216 dy = 0; 1127 dy = 0;
1217 else if (y == y1) /* exact center */ 1128 else if (y == y1) /* exact center */
1218 dy /= 2; 1129 dy /= 2;
1219 1130
1220 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1131 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1221 szHint.width, szHint.height); 1132 szHint.width, szHint.height);
1222#else 1133#else
1223 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1134 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1224#endif 1135#endif
1225 } 1136 }
1226 1137
1227 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1138 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1228 1139
1229 if (fix_screen || newwidth != old_width || newheight != old_height) 1140 if (fix_screen || newwidth != old_width || newheight != old_height)
1230 { 1141 {
1231 if (scrollBar.state) 1142 if (scrollBar.state)
1232 { 1143 {
1233 XMoveResizeWindow (disp, scrollBar.win, 1144 XMoveResizeWindow (dpy, scrollBar.win,
1234 window_sb_x, 0, 1145 window_sb_x, 0,
1235 scrollbar_TotalWidth (), szHint.height); 1146 scrollbar_TotalWidth (), szHint.height);
1236 resize_scrollbar (); 1147 resize_scrollbar ();
1237 } 1148 }
1238 1149
1239 XMoveResizeWindow (disp, vt, 1150 XMoveResizeWindow (dpy, vt,
1240 window_vt_x, window_vt_y, 1151 window_vt_x, window_vt_y,
1241 width, height); 1152 width, height);
1242 1153
1154#ifdef XPM_BACKGROUND
1155 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1156 if (bgPixmap.window_size_sensitive ())
1157 bgPixmap.render ();
1158#endif
1159
1243 scr_clear (); 1160 scr_clear ();
1244#ifdef XPM_BACKGROUND
1245 resize_pixmap ();
1246#endif
1247 } 1161 }
1248 1162
1249 if (fix_screen || old_height == 0) 1163 if (fix_screen || old_height == 0)
1250 {
1251 int curr_screen = -1;
1252 int old_ncol = prev_ncol;
1253
1254 /* scr_reset only works on the primary screen */
1255 if (old_height) /* this is not the first time through */
1256 {
1257 unsigned int ocol = ncol;
1258 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1259 curr_screen = scr_change_screen (PRIMARY);
1260 ncol = ocol;
1261 }
1262
1263 scr_reset (); 1164 scr_reset ();
1264 1165
1265 if (curr_screen >= 0) /* this is not the first time through */ 1166 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1266 { 1167 //scr_touch (false);
1267 scr_change_screen (curr_screen);
1268 selection_check (old_ncol != ncol ? 4 : 0);
1269 }
1270 }
1271 1168
1272 old_width = szHint.width; 1169#ifdef HAVE_BG_PIXMAP
1273 old_height = szHint.height; 1170// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1274 1171// if (bgPixmap.pixmap)
1275#ifdef XPM_BACKGROUND
1276 if (pixmap)
1277 scr_touch (false); 1172// scr_touch (false);
1278#endif 1173#endif
1279 1174
1280#ifdef USE_XIM 1175#ifdef USE_XIM
1281 IMSetStatusPosition (); 1176 IMSetPosition ();
1282#endif 1177#endif
1283} 1178}
1284 1179
1285/* 1180/*
1286 * Set the width/height of the vt window in characters. Units are pixels. 1181 * Set the width/height of the vt window in characters. Units are pixels.
… …
1291{ 1186{
1292 XWindowAttributes wattr; 1187 XWindowAttributes wattr;
1293 1188
1294 if (newwidth == 0 || newheight == 0) 1189 if (newwidth == 0 || newheight == 0)
1295 { 1190 {
1296 XGetWindowAttributes (display->display, display->root, &wattr); 1191 XGetWindowAttributes (dpy, display->root, &wattr);
1297 1192
1298 if (newwidth == 0) 1193 if (newwidth == 0)
1299 newwidth = wattr.width - szHint.base_width; 1194 newwidth = wattr.width - szHint.base_width;
1300 if (newheight == 0) 1195 if (newheight == 0)
1301 newheight = wattr.height - szHint.base_height; 1196 newheight = wattr.height - szHint.base_height;
… …
1315#ifdef USE_XIM 1210#ifdef USE_XIM
1316 1211
1317void 1212void
1318rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1213rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1319{ 1214{
1320 fg = pix_colors[Color_fg]; 1215 fg = pix_colors [Color_fg];
1321 bg = pix_colors[Color_bg]; 1216 bg = pix_colors [Color_bg];
1322} 1217}
1323 1218
1324void 1219void
1325rxvt_term::im_set_size (XRectangle &size) 1220rxvt_term::im_set_size (XRectangle &size)
1326{ 1221{
… …
1363 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1258 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1364 1259
1365 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1260 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1366 *p = '\0'; 1261 *p = '\0';
1367 1262
1368 atom = XInternAtom (display->display, server, False); 1263 atom = XInternAtom (dpy, server, False);
1369 win = XGetSelectionOwner (display->display, atom); 1264 win = XGetSelectionOwner (dpy, atom);
1370 1265
1371 if (win != None) 1266 if (win != None)
1372 return True; 1267 return True;
1373 } 1268 }
1374 1269
… …
1381 XPoint nspot; 1276 XPoint nspot;
1382 XVaNestedList preedit_attr; 1277 XVaNestedList preedit_attr;
1383 1278
1384 if (!Input_Context 1279 if (!Input_Context
1385 || !focus 1280 || !focus
1386 || !(input_style & XIMPreeditPosition)) 1281 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1387 return; 1282 return;
1388 1283
1389 im_set_position (nspot); 1284 im_set_position (nspot);
1390 1285
1391 if (nspot.x == spot.x && nspot.y == spot.y) 1286 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1410 input_method = 0; 1305 input_method = 0;
1411 } 1306 }
1412 1307
1413 Input_Context = 0; 1308 Input_Context = 0;
1414} 1309}
1310
1311#ifdef ENABLE_XIM_ONTHESPOT
1312
1313static void
1314xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1315{
1316 ((rxvt_term *)client_data)->make_current ();
1317 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1318}
1319
1320static void
1321xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1322{
1323 ((rxvt_term *)client_data)->make_current ();
1324 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1325}
1326
1327static void
1328xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1329{
1330 rxvt_term *term = (rxvt_term *)client_data;
1331 XIMText *text = call_data->text;
1332
1333 term->make_current ();
1334
1335 if (text)
1336 {
1337 void *str;
1338
1339 if (!text->encoding_is_wchar && text->string.multi_byte)
1340 {
1341 // of course, X makes it ugly again
1342 if (term->rs[Rs_imLocale])
1343 SET_LOCALE (term->rs[Rs_imLocale]);
1344
1345 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1346 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1347
1348 if (term->rs[Rs_imLocale])
1349 SET_LOCALE (term->locale);
1350 }
1351 else
1352 str = (void *)text->string.wide_char;
1353
1354 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1355 DT_INT, call_data->caret,
1356 DT_INT, call_data->chg_first,
1357 DT_INT, call_data->chg_length,
1358 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1359 DT_WCS_LEN, str, str ? (int)text->length : 0,
1360 DT_END));
1361 }
1362 else
1363 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1364 DT_INT, call_data->caret,
1365 DT_INT, call_data->chg_first,
1366 DT_INT, call_data->chg_length,
1367 DT_END));
1368}
1369
1370#if 0
1371static void
1372xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1373{
1374 ((rxvt_term *)client_data)->make_current ();
1375 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1376 DT_INT, call_data->position,
1377 DT_INT, call_data->direction,
1378 DT_INT, call_data->style,
1379 DT_END));
1380}
1381#endif
1382
1383#endif
1415 1384
1416/* 1385/*
1417 * Try to open a XIM with the current modifiers, then see if we can 1386 * Try to open a XIM with the current modifiers, then see if we can
1418 * open a suitable preedit type 1387 * open a suitable preedit type
1419 */ 1388 */
… …
1426 XRectangle rect, status_rect, needed_rect; 1395 XRectangle rect, status_rect, needed_rect;
1427 unsigned long fg, bg; 1396 unsigned long fg, bg;
1428 const char *p; 1397 const char *p;
1429 char **s; 1398 char **s;
1430 XIMStyles *xim_styles; 1399 XIMStyles *xim_styles;
1400#ifdef ENABLE_XIM_ONTHESPOT
1401 XIMCallback xcb[4];
1402#endif
1431 1403
1432 set_environ (envv); 1404 set_environ (envv);
1433 1405
1434 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1406 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1435 return false; 1407 return false;
1436 1408
1437 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1438 input_method = display->get_xim (locale, modifiers); 1409 input_method = display->get_xim (locale, modifiers);
1439 if (input_method == NULL) 1410 if (input_method == NULL)
1440 return false; 1411 return false;
1441 1412
1442 xim = input_method->xim; 1413 xim = input_method->xim;
… …
1462 s = rxvt_splitcommastring (p); 1433 s = rxvt_splitcommastring (p);
1463 1434
1464 for (i = found = 0; !found && s[i]; i++) 1435 for (i = found = 0; !found && s[i]; i++)
1465 { 1436 {
1466 if (!strcmp (s[i], "OverTheSpot")) 1437 if (!strcmp (s[i], "OverTheSpot"))
1467 input_style = (XIMPreeditPosition | XIMStatusNothing); 1438 input_style = XIMPreeditPosition | XIMStatusNothing;
1468 else if (!strcmp (s[i], "OffTheSpot")) 1439 else if (!strcmp (s[i], "OffTheSpot"))
1469 input_style = (XIMPreeditArea | XIMStatusArea); 1440 input_style = XIMPreeditArea | XIMStatusArea;
1470 else if (!strcmp (s[i], "Root")) 1441 else if (!strcmp (s[i], "Root"))
1471 input_style = (XIMPreeditNothing | XIMStatusNothing); 1442 input_style = XIMPreeditNothing | XIMStatusNothing;
1472 else if (!strcmp (s[i], "None")) 1443 else if (!strcmp (s[i], "None"))
1473 input_style = (XIMPreeditNone | XIMStatusNone); 1444 input_style = XIMPreeditNone | XIMStatusNone;
1445#ifdef ENABLE_XIM_ONTHESPOT
1446 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1447 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1448#endif
1449 else
1450 input_style = XIMPreeditNothing | XIMStatusNothing;
1474 1451
1475 for (j = 0; j < xim_styles->count_styles; j++) 1452 for (j = 0; j < xim_styles->count_styles; j++)
1476 if (input_style == xim_styles->supported_styles[j]) 1453 if (input_style == xim_styles->supported_styles[j])
1477 { 1454 {
1478 rxvt_freecommastring (s); 1455 rxvt_freecommastring (s);
… …
1516 "*", 1493 "*",
1517 fheight, 1494 fheight,
1518 fheight + 1, fheight - 1, 1495 fheight + 1, fheight - 1,
1519 fheight - 2, fheight + 2); 1496 fheight - 2, fheight + 2);
1520 1497
1521 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1498 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1522 &missing_charset_list, &missing_charset_count, &def_string); 1499 &missing_charset_list, &missing_charset_count, &def_string);
1523 1500
1524 if (missing_charset_list) 1501 if (missing_charset_list)
1525 XFreeStringList (missing_charset_list); 1502 XFreeStringList (missing_charset_list);
1526 1503
… …
1567 XNBackground, bg, 1544 XNBackground, bg,
1568 XNArea, &status_rect, 1545 XNArea, &status_rect,
1569 XNFontSet, fs, 1546 XNFontSet, fs,
1570 NULL); 1547 NULL);
1571 } 1548 }
1549#if ENABLE_XIM_ONTHESPOT
1550 else if (input_style & XIMPreeditCallbacks)
1551 {
1552 im_set_position (spot);
1553
1554 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1555 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1556 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1557# if 0
1558 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1559# endif
1560
1561 preedit_attr = XVaCreateNestedList (0,
1562 XNSpotLocation, &spot,
1563 XNPreeditStartCallback, &xcb[0],
1564 XNPreeditDoneCallback , &xcb[1],
1565 XNPreeditDrawCallback , &xcb[2],
1566# if 0
1567 XNPreeditCaretCallback, &xcb[3],
1568# endif
1569 NULL);
1570 }
1571#endif
1572 1572
1573 Input_Context = XCreateIC (xim, 1573 Input_Context = XCreateIC (xim,
1574 XNInputStyle, input_style, 1574 XNInputStyle, input_style,
1575 XNClientWindow, vt, 1575 XNClientWindow, vt,
1576 XNFocusWindow, parent[0], 1576 XNFocusWindow, parent[0],
… …
1578 preedit_attr, 1578 preedit_attr,
1579 status_attr ? XNStatusAttributes : NULL, 1579 status_attr ? XNStatusAttributes : NULL,
1580 status_attr, NULL); 1580 status_attr, NULL);
1581 1581
1582 if (preedit_attr) XFree (preedit_attr); 1582 if (preedit_attr) XFree (preedit_attr);
1583 if (status_attr) XFree (status_attr); 1583 if (status_attr) XFree (status_attr);
1584 if (fs) XFreeFontSet (display->display, fs); 1584 if (fs) XFreeFontSet (dpy, fs);
1585 1585
1586 if (Input_Context == NULL) 1586 if (Input_Context == NULL)
1587 { 1587 {
1588 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1588 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1589 im_destroy (); 1589 im_destroy ();
1590 return false; 1590 return false;
1591 } 1591 }
1592 1592
1593 if (input_style & XIMPreeditArea) 1593#if 0
1594 // unfortunately, only the focus window is used by XIM, hard to fix
1595 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1596 vt_select_input ();
1597#endif
1598
1594 IMSetStatusPosition (); 1599 IMSetPosition ();
1595 1600
1596 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1597 return true; 1601 return true;
1598} 1602}
1599 1603
1600void 1604void
1601rxvt_term::im_cb () 1605rxvt_term::im_cb ()
… …
1607 1611
1608 make_current (); 1612 make_current ();
1609 1613
1610 im_destroy (); 1614 im_destroy ();
1611 1615
1612 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1613 if (Input_Context) 1616 if (Input_Context)
1614 return; 1617 return;
1615 1618
1616#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1619#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1617 if (rs[Rs_imLocale]) 1620 if (rs[Rs_imLocale])
… …
1659 SET_LOCALE (locale); 1662 SET_LOCALE (locale);
1660#endif 1663#endif
1661} 1664}
1662 1665
1663void 1666void
1664rxvt_term::IMSetStatusPosition () 1667rxvt_term::IMSetPosition ()
1665{ 1668{
1666 XRectangle preedit_rect, status_rect, *needed_rect; 1669 XRectangle preedit_rect, status_rect, *needed_rect;
1667 XVaNestedList preedit_attr, status_attr; 1670 XVaNestedList preedit_attr, status_attr;
1668 1671
1669 if (!Input_Context 1672 if (!Input_Context
1670 || !focus 1673 || !focus
1671 || !(input_style & XIMPreeditArea) 1674 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1672 || !IMisRunning ()) 1675 || !IMisRunning ())
1673 return; 1676 return;
1674 1677
1678 if (input_style & XIMPreeditPosition)
1679 {
1680 im_set_size (preedit_rect);
1681 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1682
1683 XSetICValues (Input_Context,
1684 XNPreeditAttributes, preedit_attr, NULL);
1685 }
1686 else
1687 {
1675 /* Getting the necessary width of preedit area */ 1688 /* Getting the necessary width of preedit area */
1676 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1689 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1677 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1690 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1678 XFree (status_attr); 1691 XFree (status_attr);
1679 1692
1680 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1693 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1681 XFree (needed_rect); 1694 XFree (needed_rect);
1682 1695
1683 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1696 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1684 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1697 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1685 1698
1686 XSetICValues (Input_Context, 1699 XSetICValues (Input_Context,
1687 XNPreeditAttributes, preedit_attr, 1700 XNPreeditAttributes, preedit_attr,
1688 XNStatusAttributes, status_attr, NULL); 1701 XNStatusAttributes, status_attr,
1702 NULL);
1689 1703
1704 XFree (status_attr);
1705 }
1706
1690 XFree (preedit_attr); 1707 XFree (preedit_attr);
1691 XFree (status_attr);
1692} 1708}
1693#endif /* USE_XIM */ 1709#endif /* USE_XIM */
1694 1710
1695/*----------------------------------------------------------------------*/
1696rxvt_t rxvt_current_term;
1697
1698/*----------------------- end-of-file (C source) -----------------------*/ 1711/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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