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.177 by root, Mon Jan 16 06:37:52 2006 UTC vs.
Revision 1.228 by root, Wed Aug 2 09:14:19 2006 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}
93
94void
95rxvt_term::make_current () const
96{
97 SET_R (this);
98 rxvt_set_locale (locale);
99 set_environ (envv);
100} 85}
101 86
102#if ENABLE_COMBINING 87#if ENABLE_COMBINING
103class rxvt_composite_vec rxvt_composite; 88class rxvt_composite_vec rxvt_composite;
104 89
… …
163} 148}
164#endif 149#endif
165 150
166rxvt_term::rxvt_term () 151rxvt_term::rxvt_term ()
167 : 152 :
168#if TRANSPARENT 153#if TRANSPARENT || ENABLE_PERL
169 rootwin_ev (this, &rxvt_term::rootwin_cb), 154 rootwin_ev (this, &rxvt_term::rootwin_cb),
170#endif 155#endif
171#ifdef HAVE_SCROLLBARS 156#ifdef HAVE_SCROLLBARS
172 scrollbar_ev (this, &rxvt_term::x_cb), 157 scrollbar_ev (this, &rxvt_term::x_cb),
173#endif 158#endif
174#ifdef MENUBAR
175 menubar_ev (this, &rxvt_term::x_cb),
176#endif
177#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
178 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 160 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
179#endif 161#endif
180#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
181 text_blink_ev (this, &rxvt_term::text_blink_cb), 163 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
193 pointer_ev (this, &rxvt_term::pointer_cb), 175 pointer_ev (this, &rxvt_term::pointer_cb),
194#endif 176#endif
195#ifdef USE_XIM 177#ifdef USE_XIM
196 im_ev (this, &rxvt_term::im_cb), 178 im_ev (this, &rxvt_term::im_cb),
197#endif 179#endif
180#ifndef NO_BELL
181 bell_ev (this, &rxvt_term::bell_cb),
182#endif
198 termwin_ev (this, &rxvt_term::x_cb), 183 termwin_ev (this, &rxvt_term::x_cb),
199 vt_ev (this, &rxvt_term::x_cb), 184 vt_ev (this, &rxvt_term::x_cb),
185 child_ev (this, &rxvt_term::child_cb),
200 check_ev (this, &rxvt_term::check_cb), 186 check_ev (this, &rxvt_term::check_cb),
201 flush_ev (this, &rxvt_term::flush_cb), 187 flush_ev (this, &rxvt_term::flush_cb),
202 destroy_ev (this, &rxvt_term::destroy_cb), 188 destroy_ev (this, &rxvt_term::destroy_cb),
203 pty_ev (this, &rxvt_term::pty_cb), 189 pty_ev (this, &rxvt_term::pty_cb),
204 incr_ev (this, &rxvt_term::incr_cb) 190 incr_ev (this, &rxvt_term::incr_cb)
… …
207 193
208 termlist.push_back (this); 194 termlist.push_back (this);
209 195
210#ifdef KEYSYM_RESOURCE 196#ifdef KEYSYM_RESOURCE
211 keyboard = new keyboard_manager; 197 keyboard = new keyboard_manager;
212
213 if (!keyboard)
214 rxvt_fatal ("out of memory, aborting.\n");
215#endif 198#endif
216} 199}
217 200
218// clean up the most important stuff, do *not* call x or free mem etc. 201// clean up the most important stuff, do *not* call x or free mem etc.
219// for use before an emergency exit 202// for use before an emergency exit
220void rxvt_term::emergency_cleanup () 203void rxvt_term::emergency_cleanup ()
221{ 204{
222 if (cmd_pid) 205 if (cmd_pid)
223 kill (-cmd_pid, SIGHUP); 206 kill (-cmd_pid, SIGHUP);
224 207
225#ifdef UTMP_SUPPORT 208 pty_ev.stop ();
226 privileged_utmp (RESTORE); 209 delete pty; pty = 0;
227#endif
228
229 pty.put ();
230} 210}
231 211
232rxvt_term::~rxvt_term () 212rxvt_term::~rxvt_term ()
233{ 213{
234 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
235
236 termlist.erase (find (termlist.begin (), termlist.end(), this)); 214 termlist.erase (find (termlist.begin (), termlist.end(), this));
237 215
238 emergency_cleanup (); 216 emergency_cleanup ();
239 217
240#if ENABLE_STYLES 218#if ENABLE_STYLES
… …
244#endif 222#endif
245 delete fontset[0]; 223 delete fontset[0];
246 224
247 if (display) 225 if (display)
248 { 226 {
249 dDisp;
250
251 selection_clear (); 227 selection_clear ();
252 228
253#ifdef USE_XIM 229#ifdef USE_XIM
254 im_destroy (); 230 im_destroy ();
255#endif 231#endif
256#ifdef MENUBAR
257 if (menubarGC) XFreeGC (disp, menubarGC);
258#endif
259#ifdef XTERM_SCROLLBAR 232#ifdef XTERM_SCROLLBAR
260 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 233 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
261 if (ShadowGC) XFreeGC (disp, ShadowGC); 234 if (ShadowGC) XFreeGC (dpy, ShadowGC);
262#endif 235#endif
263#ifdef PLAIN_SCROLLBAR 236#ifdef PLAIN_SCROLLBAR
264 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 237 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
265#endif 238#endif
266#ifdef NEXT_SCROLLBAR 239#ifdef NEXT_SCROLLBAR
267 if (blackGC) XFreeGC (disp, blackGC); 240 if (blackGC) XFreeGC (dpy, blackGC);
268 if (whiteGC) XFreeGC (disp, whiteGC); 241 if (whiteGC) XFreeGC (dpy, whiteGC);
269 if (grayGC) XFreeGC (disp, grayGC); 242 if (grayGC) XFreeGC (dpy, grayGC);
270 if (darkGC) XFreeGC (disp, darkGC); 243 if (darkGC) XFreeGC (dpy, darkGC);
271 if (stippleGC) XFreeGC (disp, stippleGC); 244 if (stippleGC) XFreeGC (dpy, stippleGC);
272 if (dimple) XFreePixmap (disp, dimple); 245 if (dimple) XFreePixmap (dpy, dimple);
273 if (upArrow) XFreePixmap (disp, upArrow); 246 if (upArrow) XFreePixmap (dpy, upArrow);
274 if (downArrow) XFreePixmap (disp, downArrow); 247 if (downArrow) XFreePixmap (dpy, downArrow);
275 if (upArrowHi) XFreePixmap (disp, upArrowHi); 248 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
276 if (downArrowHi) XFreePixmap (disp, downArrowHi); 249 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
277#endif 250#endif
278#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 251#ifdef RXVT_SCROLLBAR
279 if (topShadowGC) XFreeGC (disp, topShadowGC); 252 if (topShadowGC) XFreeGC (dpy, topShadowGC);
280 if (botShadowGC) XFreeGC (disp, botShadowGC); 253 if (botShadowGC) XFreeGC (dpy, botShadowGC);
281 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 254 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
282#endif 255#endif
283 if (gc) XFreeGC (disp, gc); 256 if (gc) XFreeGC (dpy, gc);
284 257
285#if defined(MENUBAR) && (MENUBAR_MAX > 1)
286 delete menuBar.drawable;
287 //if (menuBar.win)
288 // XDestroyWindow (disp, menuBar.win);
289#endif
290 delete drawable; 258 delete drawable;
291 // destroy all windows 259 // destroy all windows
292 if (parent[0]) 260 if (parent[0])
293 XDestroyWindow (disp, parent[0]); 261 XDestroyWindow (dpy, parent[0]);
294 }
295 262
296 // TODO: free pixcolours, colours should become part of rxvt_display 263 for (int i = 0; i < TOTAL_COLORS; i++)
264 if (ISSET_PIXCOLOR (i))
265 {
266 pix_colors_focused [i].free (this);
267#if OFF_FOCUS_FADING
268 pix_colors_unfocused [i].free (this);
269#endif
270 }
271
272 clear ();
273 }
274
297 delete pix_colors_focused; 275 delete pix_colors_focused;
298#if OFF_FOCUS_FADING 276#if OFF_FOCUS_FADING
299 delete pix_colors_unfocused; 277 delete pix_colors_unfocused;
300#endif 278#endif
301 279
… …
307 for (int i = 0; i < allocated.size (); i++) 285 for (int i = 0; i < allocated.size (); i++)
308 free (allocated [i]); 286 free (allocated [i]);
309 287
310 free (selection.text); 288 free (selection.text);
311 // TODO: manage env vars in child only(!) 289 // TODO: manage env vars in child only(!)
312 free (env_windowid);
313 free (env_display); 290 free (env_display);
314 free (env_term); 291 free (env_term);
315 free (env_colorfgbg);
316 free (locale); 292 free (locale);
317 free (v_buffer); 293 free (v_buffer);
318 free (incr_buf); 294 free (incr_buf);
319 295
320 delete envv; 296 delete envv;
… …
323#ifdef KEYSYM_RESOURCE 299#ifdef KEYSYM_RESOURCE
324 delete keyboard; 300 delete keyboard;
325#endif 301#endif
326} 302}
327 303
304// child has exited, usually destroys
328void 305void
329rxvt_term::child_exit () 306rxvt_term::child_cb (child_watcher &w, int status)
330{ 307{
308 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
309
331 cmd_pid = 0; 310 cmd_pid = 0;
332 311
333 if (!OPTION (Opt_hold)) 312 if (!OPTION (Opt_hold))
334 destroy (); 313 destroy ();
335} 314}
… …
338rxvt_term::destroy () 317rxvt_term::destroy ()
339{ 318{
340 if (destroy_ev.active) 319 if (destroy_ev.active)
341 return; 320 return;
342 321
322 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
323
343#if ENABLE_OVERLAY 324#if ENABLE_OVERLAY
344 scr_overlay_off (); 325 scr_overlay_off ();
345#endif 326#endif
346 327
347 if (display) 328 if (display)
… …
350 im_ev.stop (display); 331 im_ev.stop (display);
351#endif 332#endif
352#if HAVE_SCROLLBARS 333#if HAVE_SCROLLBARS
353 scrollbar_ev.stop (display); 334 scrollbar_ev.stop (display);
354#endif 335#endif
355#if MENUBAR 336#if TRANSPARENT || ENABLE_PERL
356 menubar_ev.stop (display);
357#endif
358#if TRANSPARENT
359 rootwin_ev.stop (display); 337 rootwin_ev.stop (display);
360#endif 338#endif
361 incr_ev.stop (); 339 incr_ev.stop ();
362 termwin_ev.stop (display); 340 termwin_ev.stop (display);
363 vt_ev.stop (display); 341 vt_ev.stop (display);
… …
404{ 382{
405 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 383 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
406 (*t)->emergency_cleanup (); 384 (*t)->emergency_cleanup ();
407} 385}
408 386
409#if ENABLE_FRILLS 387#if !ENABLE_MINIMAL
410static void 388static void
411print_x_error (Display *dpy, XErrorEvent *event) 389print_x_error (Display *dpy, XErrorEvent *event)
412{ 390{
413 char buffer[BUFSIZ]; 391 char buffer[BUFSIZ];
414 char mesg[BUFSIZ]; 392 char mesg[BUFSIZ];
… …
462 GET_R->allowedxerror = event->error_code; 440 GET_R->allowedxerror = event->error_code;
463 else 441 else
464 { 442 {
465 // GET_R is most likely not the terminal which caused the error, 443 // GET_R is most likely not the terminal which caused the error,
466 // so just output the error and continue 444 // so just output the error and continue
467#if ENABLE_FRILLS 445#if ENABLE_MINIMAL
446 old_xerror_handler (display, event);
447#else
468 print_x_error (display, event); 448 print_x_error (display, event);
469#else
470 old_xerror_handler (display, event);
471#endif 449#endif
472 } 450 }
473 451
474 return 0; 452 return 0;
475} 453}
… …
483 _exit (EXIT_FAILURE); 461 _exit (EXIT_FAILURE);
484} 462}
485 463
486/*----------------------------------------------------------------------*/ 464/*----------------------------------------------------------------------*/
487bool 465bool
488rxvt_term::init (int argc, const char *const *argv) 466rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
489{ 467{
468 this->envv = envv;
469
490 SET_R (this); 470 SET_R (this);
491 set_locale (""); 471 set_locale ("");
492 set_environ (envv); // few things in X do not call setlocale :( 472 set_environ (envv); // few things in X do not call setlocale :(
493 473
494 if (!init_vars ()) 474 if (!init_vars ())
… …
500 480
501#ifdef KEYSYM_RESOURCE 481#ifdef KEYSYM_RESOURCE
502 keyboard->register_done (); 482 keyboard->register_done ();
503#endif 483#endif
504 484
505#if MENUBAR_MAX
506 menubar_read (rs[Rs_menu]);
507#endif
508#ifdef HAVE_SCROLLBARS 485#ifdef HAVE_SCROLLBARS
509 if (OPTION (Opt_scrollBar)) 486 if (OPTION (Opt_scrollBar))
510 scrollBar.setIdle (); /* set existence for size calculations */ 487 scrollBar.setIdle (); /* set existence for size calculations */
511#endif 488#endif
512 489
513#if ENABLE_PERL 490 pty = ptytty::create ();
514 if (!rs[Rs_perl_ext_1])
515 rs[Rs_perl_ext_1] = "default";
516
517 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
518 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
519 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
520 {
521#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
522 // ignore some perl-related arguments if some bozo installed us set[ug]id
523 if (rxvt_tainted ())
524 {
525 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
526 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
527 {
528 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
529 rs[Rs_perl_lib] = 0;
530 rs[Rs_perl_eval] = 0;
531 }
532 }
533#endif
534 rxvt_perl.init ();
535 setlocale (LC_CTYPE, curlocale); // perl init destroys current locale
536 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
537 }
538#endif
539 491
540 create_windows (argc, argv); 492 create_windows (argc, argv);
541 493
542 dDisp;
543
544 init_xlocale (); 494 init_xlocale ();
545 495
546 scr_reset (); // initialize screen 496 scr_reset (); // initialize screen
547 497
548#if 0 498#if 0
549 XSynchronize (disp, True); 499 XSynchronize (dpy, True);
550#endif 500#endif
551 501
552#ifdef HAVE_SCROLLBARS 502#ifdef HAVE_SCROLLBARS
553 if (OPTION (Opt_scrollBar)) 503 if (OPTION (Opt_scrollBar))
554 resize_scrollbar (); /* create and map scrollbar */ 504 resize_scrollbar (); /* create and map scrollbar */
555#endif 505#endif
556#if (MENUBAR_MAX)
557 if (menubar_visible ())
558 XMapWindow (disp, menuBar.win);
559#endif
560#ifdef TRANSPARENT 506#ifdef TRANSPARENT
561 if (OPTION (Opt_transparent)) 507 if (OPTION (Opt_transparent))
562 { 508 {
563 XSelectInput (disp, display->root, PropertyChangeMask); 509 XSelectInput (dpy, display->root, PropertyChangeMask);
564 check_our_parents (); 510 check_our_parents ();
565 rootwin_ev.start (display, display->root); 511 rootwin_ev.start (display, display->root);
566 } 512 }
567#endif 513#endif
568 514#if ENABLE_PERL
569 XMapWindow (disp, vt); 515 rootwin_ev.start (display, display->root);
570 XMapWindow (disp, parent[0]); 516#endif
571 517
572 set_colorfgbg (); 518 set_colorfgbg ();
573 519
574 init_command (cmd_argv); 520 init_command (cmd_argv);
575 521
576 free (cmd_argv); 522 free (cmd_argv);
577 523
578 if (pty.pty >= 0) 524 if (pty->pty >= 0)
579 pty_ev.start (pty.pty, EVENT_READ); 525 pty_ev.start (pty->pty, EVENT_READ);
580 526
581 check_ev.start (); 527 check_ev.start ();
582 528
583 HOOK_INVOKE ((this, HOOK_START, DT_END)); 529 HOOK_INVOKE ((this, HOOK_START, DT_END));
584 530
531#if ENABLE_XEMBED
532 if (rs[Rs_embed])
533 {
534 long info[2] = { 0, XEMBED_MAPPED };
535
536 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
537 32, PropModeReplace, (unsigned char *)&info, 2);
538 }
539#endif
540
541 XMapWindow (dpy, vt);
542 XMapWindow (dpy, parent[0]);
543
585 return true; 544 return true;
586} 545}
587 546
588static struct sig_handlers 547static struct sig_handlers
589{ 548{
590 sig_watcher sw_chld, sw_term, sw_int; 549 sig_watcher sw_term, sw_int;
591 550
592 void sig_chld (sig_watcher &w)
593 {
594 // we are being called for every SIGCHLD, find the corresponding term
595 int pid;
596
597 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
598 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
599 if (pid == (*t)->cmd_pid)
600 {
601 (*t)->child_exit ();
602 break;
603 }
604 }
605
606 /* 551 /*
607 * Catch a fatal signal and tidy up before quitting 552 * Catch a fatal signal and tidy up before quitting
608 */ 553 */
609 void 554 void
610 sig_term (sig_watcher &w) 555 sig_term (sig_watcher &w)
611 { 556 {
612#ifdef DEBUG_CMD
613 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
614#endif
615 rxvt_emergency_cleanup (); 557 rxvt_emergency_cleanup ();
616 signal (w.signum, SIG_DFL); 558 signal (w.signum, SIG_DFL);
617 kill (getpid (), w.signum); 559 kill (getpid (), w.signum);
618 } 560 }
619 561
620 sig_handlers () 562 sig_handlers ()
621 : sw_chld (this, &sig_handlers::sig_chld),
622 sw_term (this, &sig_handlers::sig_term), 563 : sw_term (this, &sig_handlers::sig_term),
623 sw_int (this, &sig_handlers::sig_term) 564 sw_int (this, &sig_handlers::sig_term)
624 { 565 {
625 } 566 }
626} sig_handlers; 567} sig_handlers;
627 568
628char **rxvt_environ; // startup environment 569char **rxvt_environ; // startup environment
629 570
630void 571void
631rxvt_init () 572rxvt_init ()
632{ 573{
574 ptytty::init ();
575
633 rxvt_environ = environ; 576 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 577
645 signal (SIGHUP, SIG_IGN); 578 signal (SIGHUP, SIG_IGN);
646 signal (SIGPIPE, SIG_IGN); 579 signal (SIGPIPE, SIG_IGN);
647 580
648 sig_handlers.sw_chld.start (SIGCHLD);
649 sig_handlers.sw_term.start (SIGTERM); 581 sig_handlers.sw_term.start (SIGTERM);
650 sig_handlers.sw_int.start (SIGINT); 582 sig_handlers.sw_int.start (SIGINT);
651 583
652 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 584 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
653 /* signal (SIGURG, SIG_DFL); */ 585 /* signal (SIGURG, SIG_DFL); */
… …
682 rxvt_fatal ("memory allocation failure. aborting.\n"); 614 rxvt_fatal ("memory allocation failure. aborting.\n");
683 615
684 return p; 616 return p;
685} 617}
686 618
687void * 619void *
688rxvt_realloc (void *ptr, size_t size) 620rxvt_realloc (void *ptr, size_t size)
689{ 621{
690 void *p = realloc (ptr, size); 622 void *p = realloc (ptr, size);
691 623
692 if (!p) 624 if (!p)
693 rxvt_fatal ("memory allocation failure. aborting.\n"); 625 rxvt_fatal ("memory allocation failure. aborting.\n");
694 626
695 return p; 627 return p;
696} 628}
697
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#ifdef UTMP_SUPPORT
749void
750rxvt_term::privileged_utmp (rxvt_privaction action)
751{
752 if (OPTION (Opt_utmpInhibit)
753 || !pty.name || !*pty.name)
754 return;
755
756 rxvt_privileges (RESTORE);
757
758 if (action == SAVE)
759 makeutent (pty.name, rs[Rs_display_name]);
760 else
761 cleanutent ();
762
763 rxvt_privileges (IGNORE);
764}
765#endif
766 629
767/*----------------------------------------------------------------------*/ 630/*----------------------------------------------------------------------*/
768/* 631/*
769 * window size/position calculcations for XSizeHint and other storage. 632 * window size/position calculcations for XSizeHint and other storage.
770 * if width/height are non-zero then override calculated width/height 633 * if width/height are non-zero then override calculated width/height
771 */ 634 */
772void 635void
773rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 636rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
774{ 637{
775 short recalc_x, recalc_y; 638 short recalc_x, recalc_y;
776 int x, y, sb_w, mb_h, flags; 639 int x, y, sb_w, flags;
777 unsigned int w, h; 640 unsigned int w, h;
778 unsigned int max_width, max_height; 641 unsigned int max_width, max_height;
779 dDisp;
780
781 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
782 ncol, nrow, szHint.width, szHint.height));
783 642
784 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 643 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
785 szHint.win_gravity = NorthWestGravity; 644 szHint.win_gravity = NorthWestGravity;
786 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 645 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
787 646
… …
842 max_width = MAX_COLS * fwidth; 701 max_width = MAX_COLS * fwidth;
843 max_height = MAX_ROWS * fheight; 702 max_height = MAX_ROWS * fheight;
844 703
845 szHint.base_width = szHint.base_height = 2 * int_bwidth; 704 szHint.base_width = szHint.base_height = 2 * int_bwidth;
846 705
847 sb_w = mb_h = 0; 706 sb_w = 0;
848 window_vt_x = window_vt_y = int_bwidth; 707 window_vt_x = window_vt_y = int_bwidth;
849 708
850 if (scrollbar_visible ()) 709 if (scrollBar.state)
851 { 710 {
852 sb_w = scrollbar_TotalWidth (); 711 sb_w = scrollbar_TotalWidth ();
853 szHint.base_width += sb_w; 712 szHint.base_width += sb_w;
713
854 if (!OPTION (Opt_scrollBar_right)) 714 if (!OPTION (Opt_scrollBar_right))
855 window_vt_x += sb_w; 715 window_vt_x += sb_w;
856 } 716 }
857 717
858 if (menubar_visible ())
859 {
860 mb_h = menuBar_TotalHeight ();
861 szHint.base_height += mb_h;
862 window_vt_y += mb_h;
863 }
864
865 szHint.width_inc = fwidth; 718 szHint.width_inc = fwidth;
866 szHint.height_inc = fheight; 719 szHint.height_inc = fheight;
867 szHint.min_width = szHint.base_width + szHint.width_inc; 720 szHint.min_width = szHint.base_width + szHint.width_inc;
868 szHint.min_height = szHint.base_height + szHint.height_inc; 721 szHint.min_height = szHint.base_height + szHint.height_inc;
869 722
870 if (newwidth && newwidth - szHint.base_width < max_width) 723 if (newwidth && newwidth - szHint.base_width < max_width)
871 { 724 {
872 szHint.width = newwidth; 725 szHint.width = newwidth;
… …
887 { 740 {
888 min_it (height, max_height); 741 min_it (height, max_height);
889 szHint.height = szHint.base_height + height; 742 szHint.height = szHint.base_height + height;
890 } 743 }
891 744
892 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 745 if (scrollBar.state && OPTION (Opt_scrollBar_right))
893 window_sb_x = szHint.width - sb_w; 746 window_sb_x = szHint.width - sb_w;
894 747
895 if (recalc_x) 748 if (recalc_x)
896 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 749 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
750
897 if (recalc_y) 751 if (recalc_y)
898 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 752 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
899 753
900 ncol = width / fwidth; 754 ncol = width / fwidth;
901 nrow = height / fheight; 755 nrow = height / fheight;
902 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
903 ncol, nrow, szHint.width,
904 szHint.height));
905 return;
906} 756}
907 757
908/*----------------------------------------------------------------------*/ 758/*----------------------------------------------------------------------*/
909/* 759/*
910 * Tell the teletype handler what size the window is. 760 * Tell the teletype handler what size the window is.
911 * Called after a window size change. 761 * Called after a window size change.
912 */ 762 */
913void 763void
914rxvt_term::tt_winch () 764rxvt_term::tt_winch ()
915{ 765{
916 if (pty.pty < 0) 766 if (pty->pty < 0)
917 return; 767 return;
918 768
919 struct winsize ws; 769 struct winsize ws;
920 770
921 ws.ws_col = ncol; 771 ws.ws_col = ncol;
922 ws.ws_row = nrow; 772 ws.ws_row = nrow;
923 ws.ws_xpixel = width; 773 ws.ws_xpixel = width;
924 ws.ws_ypixel = height; 774 ws.ws_ypixel = height;
925 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 775 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
926 776
927#if 0 777#if 0
928 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 778 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
929 if (cmd_pid) /* force through to the command */ 779 if (cmd_pid) /* force through to the command */
930 kill (-cmd_pid, SIGWINCH); 780 kill (-cmd_pid, SIGWINCH);
… …
1010 return true; 860 return true;
1011} 861}
1012 862
1013void rxvt_term::set_string_property (Atom prop, const char *str, int len) 863void rxvt_term::set_string_property (Atom prop, const char *str, int len)
1014{ 864{
1015 XChangeProperty (display->display, parent[0], 865 XChangeProperty (dpy, parent[0],
1016 prop, XA_STRING, 8, PropModeReplace, 866 prop, XA_STRING, 8, PropModeReplace,
1017 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 867 (const unsigned char *)str, len >= 0 ? len : strlen (str));
1018} 868}
1019 869
1020void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 870void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
1021{ 871{
1022 wchar_t *ws = rxvt_mbstowcs (str, len); 872 wchar_t *ws = rxvt_mbstowcs (str, len);
1023 char *s = rxvt_wcstoutf8 (ws); 873 char *s = rxvt_wcstoutf8 (ws);
1024 874
1025 XChangeProperty (display->display, parent[0], 875 XChangeProperty (dpy, parent[0],
1026 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 876 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
1027 (const unsigned char *)s, strlen (s)); 877 (const unsigned char *)s, strlen (s));
1028 878
1029 free (s); 879 free (s);
1030 free (ws); 880 free (ws);
… …
1055void 905void
1056rxvt_term::set_window_color (int idx, const char *color) 906rxvt_term::set_window_color (int idx, const char *color)
1057{ 907{
1058 rxvt_color xcol; 908 rxvt_color xcol;
1059 int i; 909 int i;
1060 910
1061 if (color == NULL || *color == '\0') 911 if (color == NULL || *color == '\0')
1062 return; 912 return;
913
914 color = strdup (color);
915 allocated.push_back ((void *)color);
916 rs[Rs_color + idx] = color;
1063 917
1064 /* handle color aliases */ 918 /* handle color aliases */
1065 if (isdigit (*color)) 919 if (isdigit (*color))
1066 { 920 {
1067 i = atoi (color); 921 i = atoi (color);
1068 922
1069 if (i >= 8 && i <= 15) 923 if (i >= 8 && i <= 15)
1070 { /* bright colors */ 924 { /* bright colors */
1071 i -= 8; 925 i -= 8;
1072 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 926 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1073 SET_PIXCOLOR (idx);
1074 goto done; 927 goto done;
1075 } 928 }
1076 929
1077 if (i >= 0 && i <= 7) 930 if (i >= 0 && i <= 7)
1078 { /* normal colors */ 931 { /* normal colors */
1079 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 932 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1080 SET_PIXCOLOR (idx);
1081 goto done; 933 goto done;
1082 } 934 }
1083 } 935 }
1084 936
1085 if (!rXParseAllocColor (&xcol, color)) 937 set_color (xcol, color);
1086 return;
1087
1088 /* XStoreColor (display->display, display->cmap, XColor*); */
1089 938
1090 /* 939 /*
1091 * FIXME: should free colors here, but no idea how to do it so instead, 940 * FIXME: should free colors here, but no idea how to do it so instead,
1092 * so just keep gobbling up the colormap 941 * so just keep gobbling up the colormap
1093 */ 942 */
1094# if 0
1095 for (i = Color_Black; i <= Color_White; i++)
1096 if (pix_colors[idx] == pix_colors[i])
1097 break;
1098 if (i > Color_White)
1099 {
1100 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1101 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1102 DisplayPlanes (display->display, display->screen));
1103 }
1104# endif
1105 943
1106 pix_colors_focused[idx] = xcol; 944 pix_colors_focused[idx] = xcol;
1107 SET_PIXCOLOR (idx);
1108 945
1109 /* XSetWindowAttributes attr; */ 946 /* XSetWindowAttributes attr; */
1110 /* Cursor cursor; */ 947 /* Cursor cursor; */
1111done: 948done:
1112
1113#if OFF_FOCUS_FADING
1114 if (rs[Rs_fade])
1115 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1116#endif
1117
1118 /*TODO: handle Color_BD, scrollbar background, etc. */ 949 /*TODO: handle Color_BD, scrollbar background, etc. */
1119 950
951 update_fade_color (idx);
1120 recolour_cursor (); 952 recolour_cursor ();
1121 scr_recolour (); 953 scr_recolour ();
1122} 954}
1123 955
1124#else 956#else
… …
1126#endif /* XTERM_COLOR_CHANGE */ 958#endif /* XTERM_COLOR_CHANGE */
1127 959
1128void 960void
1129rxvt_term::recolour_cursor () 961rxvt_term::recolour_cursor ()
1130{ 962{
1131 XColor xcol[2]; 963 XColor fg, bg;
1132 964
1133 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 965 (ISSET_PIXCOLOR (Color_pointer_fg)
1134 ? pix_colors_focused[Color_pointer_fg] 966 ? pix_colors_focused[Color_pointer_fg]
1135 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg]).get (fg);
968
1136 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 969 (ISSET_PIXCOLOR (Color_pointer_bg)
1137 ? pix_colors_focused[Color_pointer_bg] 970 ? pix_colors_focused[Color_pointer_bg]
1138 : pix_colors_focused[Color_bg]; 971 : pix_colors_focused[Color_bg]).get (bg);
1139 972
1140 XQueryColors (display->display, display->cmap, xcol, 2); 973 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1141 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1142} 974}
1143 975
1144/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1145/* 977/*
1146 * find if fg/bg matches any of the normal (low-intensity) colors 978 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1150{ 982{
1151 unsigned int i; 983 unsigned int i;
1152 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1153 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1154 986
1155 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1156 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1157 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1158 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1159 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1160 { 991 {
… …
1175 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1176} 1007}
1177 1008
1178/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1179 1010
1180int 1011bool
1181rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::set_color (rxvt_color &color, const char *name)
1182{ 1013{
1183 if (!screen_in_out->set (display, colour)) 1014 if (color.set (this, name))
1184 {
1185 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1186 return false;
1187 }
1188
1189 return true; 1015 return true;
1016
1017 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1018 return false;
1019}
1020
1021void
1022rxvt_term::alias_color (int dst, int src)
1023{
1024 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1190} 1025}
1191 1026
1192/* -------------------------------------------------------------------- * 1027/* -------------------------------------------------------------------- *
1193 * - WINDOW RESIZING - * 1028 * - WINDOW RESIZING - *
1194 * -------------------------------------------------------------------- */ 1029 * -------------------------------------------------------------------- */
1195void 1030void
1196rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1031rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1197{ 1032{
1198 int fix_screen; 1033 int fix_screen;
1199 int old_width = szHint.width, old_height = szHint.height; 1034 int old_width = szHint.width;
1200 dDisp; 1035 int old_height = szHint.height;
1201 1036
1202 window_calc (newwidth, newheight); 1037 window_calc (newwidth, newheight);
1038
1039 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1203 XSetWMNormalHints (disp, parent[0], &szHint); 1040 XSetWMNormalHints (dpy, parent[0], &szHint);
1204 1041
1205 if (!ignoreparent) 1042 if (!ignoreparent)
1206 { 1043 {
1207#ifdef SMART_RESIZE 1044#ifdef SMART_RESIZE
1208 /* 1045 /*
… …
1212 int x, y, x1, y1; 1049 int x, y, x1, y1;
1213 int dx, dy; 1050 int dx, dy;
1214 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1215 Window unused_cr; 1052 Window unused_cr;
1216 1053
1217 XTranslateCoordinates (disp, parent[0], display->root, 1054 XTranslateCoordinates (dpy, parent[0], display->root,
1218 0, 0, &x, &y, &unused_cr); 1055 0, 0, &x, &y, &unused_cr);
1219 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1056 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1220 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1221 /* 1058 /*
1222 * if display->root isn't the parent window, a WM will probably have offset 1059 * if display->root isn't the parent window, a WM will probably have offset
1223 * our position for handles and decorations. Counter it 1060 * our position for handles and decorations. Counter it
1224 */ 1061 */
… …
1226 { 1063 {
1227 x -= x1; 1064 x -= x1;
1228 y -= y1; 1065 y -= y1;
1229 } 1066 }
1230 1067
1231 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1068 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1232 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1069 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1233 dx = old_width - szHint.width; 1070 dx = old_width - szHint.width;
1234 dy = old_height - szHint.height; 1071 dy = old_height - szHint.height;
1235 1072
1236 /* Check position of the center of the window */ 1073 /* Check position of the center of the window */
1237 if (x < x1) /* left half */ 1074 if (x < x1) /* left half */
1238 dx = 0; 1075 dx = 0;
… …
1241 if (y < y1) /* top half */ 1078 if (y < y1) /* top half */
1242 dy = 0; 1079 dy = 0;
1243 else if (y == y1) /* exact center */ 1080 else if (y == y1) /* exact center */
1244 dy /= 2; 1081 dy /= 2;
1245 1082
1246 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1083 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1247 szHint.width, szHint.height); 1084 szHint.width, szHint.height);
1248#else 1085#else
1249 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1086 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1250#endif 1087#endif
1251 } 1088 }
1252 1089
1253 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1254 1091
1255 if (fix_screen || newwidth != old_width || newheight != old_height) 1092 if (fix_screen || newwidth != old_width || newheight != old_height)
1256 { 1093 {
1257 if (scrollbar_visible ()) 1094 if (scrollBar.state)
1258 { 1095 {
1259 XMoveResizeWindow (disp, scrollBar.win, 1096 XMoveResizeWindow (dpy, scrollBar.win,
1260 window_sb_x, 0, 1097 window_sb_x, 0,
1261 scrollbar_TotalWidth (), szHint.height); 1098 scrollbar_TotalWidth (), szHint.height);
1262 resize_scrollbar (); 1099 resize_scrollbar ();
1263 } 1100 }
1264 1101
1265 if (menubar_visible ())
1266 XMoveResizeWindow (disp, menuBar.win,
1267 window_vt_x, 0,
1268 width, menuBar_TotalHeight ());
1269
1270 XMoveResizeWindow (disp, vt, 1102 XMoveResizeWindow (dpy, vt,
1271 window_vt_x, window_vt_y, 1103 window_vt_x, window_vt_y,
1272 width, height); 1104 width, height);
1273 1105
1274 scr_clear (); 1106 scr_clear ();
1275#ifdef XPM_BACKGROUND 1107#ifdef XPM_BACKGROUND
1276 resize_pixmap (); 1108 resize_pixmap ();
1277#endif 1109#endif
1278 } 1110 }
1279 1111
1280 if (fix_screen || old_height == 0) 1112 if (fix_screen || old_height == 0)
1281 {
1282 int curr_screen = -1;
1283 int old_ncol = prev_ncol;
1284
1285 /* scr_reset only works on the primary screen */
1286 if (old_height) /* this is not the first time through */
1287 {
1288 unsigned int ocol = ncol;
1289 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1290 curr_screen = scr_change_screen (PRIMARY);
1291 ncol = ocol;
1292 }
1293
1294 scr_reset (); 1113 scr_reset ();
1295 1114
1296 if (curr_screen >= 0) /* this is not the first time through */ 1115 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1297 { 1116 //scr_touch (false);
1298 scr_change_screen (curr_screen);
1299 selection_check (old_ncol != ncol ? 4 : 0);
1300 }
1301 }
1302
1303 old_width = szHint.width;
1304 old_height = szHint.height;
1305 1117
1306#ifdef XPM_BACKGROUND 1118#ifdef XPM_BACKGROUND
1307 if (pixmap) 1119 if (pixmap)
1308 scr_touch (false); 1120 scr_touch (false);
1309#endif 1121#endif
1310 1122
1311#ifdef USE_XIM 1123#ifdef USE_XIM
1312 IMSetStatusPosition (); 1124 IMSetPosition ();
1313#endif 1125#endif
1314} 1126}
1315 1127
1316/* 1128/*
1317 * Set the width/height of the vt window in characters. Units are pixels. 1129 * Set the width/height of the vt window in characters. Units are pixels.
… …
1322{ 1134{
1323 XWindowAttributes wattr; 1135 XWindowAttributes wattr;
1324 1136
1325 if (newwidth == 0 || newheight == 0) 1137 if (newwidth == 0 || newheight == 0)
1326 { 1138 {
1327 XGetWindowAttributes (display->display, display->root, &wattr); 1139 XGetWindowAttributes (dpy, display->root, &wattr);
1328 1140
1329 if (newwidth == 0) 1141 if (newwidth == 0)
1330 newwidth = wattr.width - szHint.base_width; 1142 newwidth = wattr.width - szHint.base_width;
1331 if (newheight == 0) 1143 if (newheight == 0)
1332 newheight = wattr.height - szHint.base_height; 1144 newheight = wattr.height - szHint.base_height;
… …
1346#ifdef USE_XIM 1158#ifdef USE_XIM
1347 1159
1348void 1160void
1349rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1161rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1350{ 1162{
1351 fg = pix_colors[Color_fg]; 1163 fg = pix_colors [Color_fg];
1352 bg = pix_colors[Color_bg]; 1164 bg = pix_colors [Color_bg];
1353} 1165}
1354 1166
1355void 1167void
1356rxvt_term::im_set_size (XRectangle &size) 1168rxvt_term::im_set_size (XRectangle &size)
1357{ 1169{
… …
1394 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1206 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1395 1207
1396 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1208 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1397 *p = '\0'; 1209 *p = '\0';
1398 1210
1399 atom = XInternAtom (display->display, server, False); 1211 atom = XInternAtom (dpy, server, False);
1400 win = XGetSelectionOwner (display->display, atom); 1212 win = XGetSelectionOwner (dpy, atom);
1401 1213
1402 if (win != None) 1214 if (win != None)
1403 return True; 1215 return True;
1404 } 1216 }
1405 1217
… …
1412 XPoint nspot; 1224 XPoint nspot;
1413 XVaNestedList preedit_attr; 1225 XVaNestedList preedit_attr;
1414 1226
1415 if (!Input_Context 1227 if (!Input_Context
1416 || !focus 1228 || !focus
1417 || !(input_style & XIMPreeditPosition)) 1229 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1418 return; 1230 return;
1419 1231
1420 im_set_position (nspot); 1232 im_set_position (nspot);
1421 1233
1422 if (nspot.x == spot.x && nspot.y == spot.y) 1234 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1441 input_method = 0; 1253 input_method = 0;
1442 } 1254 }
1443 1255
1444 Input_Context = 0; 1256 Input_Context = 0;
1445} 1257}
1258
1259#ifdef ENABLE_XIM_ONTHESPOT
1260
1261static void
1262xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1263{
1264 ((rxvt_term *)client_data)->make_current ();
1265 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1266}
1267
1268static void
1269xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1270{
1271 ((rxvt_term *)client_data)->make_current ();
1272 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1273}
1274
1275static void
1276xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1277{
1278 rxvt_term *term = (rxvt_term *)client_data;
1279 XIMText *text = call_data->text;
1280
1281 term->make_current ();
1282
1283 if (text)
1284 {
1285 void *str;
1286
1287 if (!text->encoding_is_wchar && text->string.multi_byte)
1288 {
1289 // of course, X makes it ugly again
1290 if (term->rs[Rs_imLocale])
1291 SET_LOCALE (term->rs[Rs_imLocale]);
1292
1293 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1294 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1295
1296 if (term->rs[Rs_imLocale])
1297 SET_LOCALE (term->locale);
1298 }
1299 else
1300 str = (void *)text->string.wide_char;
1301
1302 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1303 DT_INT, call_data->caret,
1304 DT_INT, call_data->chg_first,
1305 DT_INT, call_data->chg_length,
1306 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1307 DT_WCS_LEN, str, str ? (int)text->length : 0,
1308 DT_END));
1309 }
1310 else
1311 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1312 DT_INT, call_data->caret,
1313 DT_INT, call_data->chg_first,
1314 DT_INT, call_data->chg_length,
1315 DT_END));
1316}
1317
1318#if 0
1319static void
1320xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1321{
1322 ((rxvt_term *)client_data)->make_current ();
1323 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1324 DT_INT, call_data->position,
1325 DT_INT, call_data->direction,
1326 DT_INT, call_data->style,
1327 DT_END));
1328}
1329#endif
1330
1331#endif
1446 1332
1447/* 1333/*
1448 * Try to open a XIM with the current modifiers, then see if we can 1334 * Try to open a XIM with the current modifiers, then see if we can
1449 * open a suitable preedit type 1335 * open a suitable preedit type
1450 */ 1336 */
… …
1457 XRectangle rect, status_rect, needed_rect; 1343 XRectangle rect, status_rect, needed_rect;
1458 unsigned long fg, bg; 1344 unsigned long fg, bg;
1459 const char *p; 1345 const char *p;
1460 char **s; 1346 char **s;
1461 XIMStyles *xim_styles; 1347 XIMStyles *xim_styles;
1348#ifdef ENABLE_XIM_ONTHESPOT
1349 XIMCallback xcb[4];
1350#endif
1462 1351
1463 set_environ (envv); 1352 set_environ (envv);
1464 1353
1465 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1354 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1466 return false; 1355 return false;
1467 1356
1468 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1469 input_method = display->get_xim (locale, modifiers); 1357 input_method = display->get_xim (locale, modifiers);
1470 if (input_method == NULL) 1358 if (input_method == NULL)
1471 return false; 1359 return false;
1472 1360
1473 xim = input_method->xim; 1361 xim = input_method->xim;
… …
1493 s = rxvt_splitcommastring (p); 1381 s = rxvt_splitcommastring (p);
1494 1382
1495 for (i = found = 0; !found && s[i]; i++) 1383 for (i = found = 0; !found && s[i]; i++)
1496 { 1384 {
1497 if (!strcmp (s[i], "OverTheSpot")) 1385 if (!strcmp (s[i], "OverTheSpot"))
1498 input_style = (XIMPreeditPosition | XIMStatusNothing); 1386 input_style = XIMPreeditPosition | XIMStatusNothing;
1499 else if (!strcmp (s[i], "OffTheSpot")) 1387 else if (!strcmp (s[i], "OffTheSpot"))
1500 input_style = (XIMPreeditArea | XIMStatusArea); 1388 input_style = XIMPreeditArea | XIMStatusArea;
1501 else if (!strcmp (s[i], "Root")) 1389 else if (!strcmp (s[i], "Root"))
1502 input_style = (XIMPreeditNothing | XIMStatusNothing); 1390 input_style = XIMPreeditNothing | XIMStatusNothing;
1503 else if (!strcmp (s[i], "None")) 1391 else if (!strcmp (s[i], "None"))
1504 input_style = (XIMPreeditNone | XIMStatusNone); 1392 input_style = XIMPreeditNone | XIMStatusNone;
1393#ifdef ENABLE_XIM_ONTHESPOT
1394 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1395 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1396#endif
1397 else
1398 input_style = XIMPreeditNothing | XIMStatusNothing;
1505 1399
1506 for (j = 0; j < xim_styles->count_styles; j++) 1400 for (j = 0; j < xim_styles->count_styles; j++)
1507 if (input_style == xim_styles->supported_styles[j]) 1401 if (input_style == xim_styles->supported_styles[j])
1508 { 1402 {
1509 rxvt_freecommastring (s); 1403 rxvt_freecommastring (s);
… …
1547 "*", 1441 "*",
1548 fheight, 1442 fheight,
1549 fheight + 1, fheight - 1, 1443 fheight + 1, fheight - 1,
1550 fheight - 2, fheight + 2); 1444 fheight - 2, fheight + 2);
1551 1445
1552 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1446 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1553 &missing_charset_list, &missing_charset_count, &def_string); 1447 &missing_charset_list, &missing_charset_count, &def_string);
1554 1448
1555 if (missing_charset_list) 1449 if (missing_charset_list)
1556 XFreeStringList (missing_charset_list); 1450 XFreeStringList (missing_charset_list);
1557 1451
… …
1598 XNBackground, bg, 1492 XNBackground, bg,
1599 XNArea, &status_rect, 1493 XNArea, &status_rect,
1600 XNFontSet, fs, 1494 XNFontSet, fs,
1601 NULL); 1495 NULL);
1602 } 1496 }
1497#if ENABLE_XIM_ONTHESPOT
1498 else if (input_style & XIMPreeditCallbacks)
1499 {
1500 im_set_position (spot);
1501
1502 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1503 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1504 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1505# if 0
1506 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1507# endif
1508
1509 preedit_attr = XVaCreateNestedList (0,
1510 XNSpotLocation, &spot,
1511 XNPreeditStartCallback, &xcb[0],
1512 XNPreeditDoneCallback , &xcb[1],
1513 XNPreeditDrawCallback , &xcb[2],
1514# if 0
1515 XNPreeditCaretCallback, &xcb[3],
1516# endif
1517 NULL);
1518 }
1519#endif
1603 1520
1604 Input_Context = XCreateIC (xim, 1521 Input_Context = XCreateIC (xim,
1605 XNInputStyle, input_style, 1522 XNInputStyle, input_style,
1606 XNClientWindow, vt, 1523 XNClientWindow, vt,
1607 XNFocusWindow, parent[0], 1524 XNFocusWindow, parent[0],
… …
1609 preedit_attr, 1526 preedit_attr,
1610 status_attr ? XNStatusAttributes : NULL, 1527 status_attr ? XNStatusAttributes : NULL,
1611 status_attr, NULL); 1528 status_attr, NULL);
1612 1529
1613 if (preedit_attr) XFree (preedit_attr); 1530 if (preedit_attr) XFree (preedit_attr);
1614 if (status_attr) XFree (status_attr); 1531 if (status_attr) XFree (status_attr);
1615 if (fs) XFreeFontSet (display->display, fs); 1532 if (fs) XFreeFontSet (dpy, fs);
1616 1533
1617 if (Input_Context == NULL) 1534 if (Input_Context == NULL)
1618 { 1535 {
1619 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1536 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1620 im_destroy (); 1537 im_destroy ();
1621 return false; 1538 return false;
1622 } 1539 }
1623 1540
1624 if (input_style & XIMPreeditArea) 1541#if 0
1542 // unfortunately, only the focus window is used by XIM, hard to fix
1543 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1544 vt_select_input ();
1545#endif
1546
1625 IMSetStatusPosition (); 1547 IMSetPosition ();
1626 1548
1627 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1628 return true; 1549 return true;
1629} 1550}
1630 1551
1631void 1552void
1632rxvt_term::im_cb () 1553rxvt_term::im_cb ()
… …
1638 1559
1639 make_current (); 1560 make_current ();
1640 1561
1641 im_destroy (); 1562 im_destroy ();
1642 1563
1643 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1644 if (Input_Context) 1564 if (Input_Context)
1645 return; 1565 return;
1646 1566
1647#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1567#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1648 if (rs[Rs_imLocale]) 1568 if (rs[Rs_imLocale])
… …
1690 SET_LOCALE (locale); 1610 SET_LOCALE (locale);
1691#endif 1611#endif
1692} 1612}
1693 1613
1694void 1614void
1695rxvt_term::IMSetStatusPosition () 1615rxvt_term::IMSetPosition ()
1696{ 1616{
1697 XRectangle preedit_rect, status_rect, *needed_rect; 1617 XRectangle preedit_rect, status_rect, *needed_rect;
1698 XVaNestedList preedit_attr, status_attr; 1618 XVaNestedList preedit_attr, status_attr;
1699 1619
1700 if (!Input_Context 1620 if (!Input_Context
1701 || !focus 1621 || !focus
1702 || !(input_style & XIMPreeditArea) 1622 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1703 || !IMisRunning ()) 1623 || !IMisRunning ())
1704 return; 1624 return;
1705 1625
1626 if (input_style & XIMPreeditPosition)
1627 {
1628 im_set_size (preedit_rect);
1629 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1630
1631 XSetICValues (Input_Context,
1632 XNPreeditAttributes, preedit_attr, NULL);
1633 }
1634 else
1635 {
1706 /* Getting the necessary width of preedit area */ 1636 /* Getting the necessary width of preedit area */
1707 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1637 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1708 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1638 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1709 XFree (status_attr); 1639 XFree (status_attr);
1710 1640
1711 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1641 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1712 XFree (needed_rect); 1642 XFree (needed_rect);
1713 1643
1714 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1644 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1715 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1645 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1716 1646
1717 XSetICValues (Input_Context, 1647 XSetICValues (Input_Context,
1718 XNPreeditAttributes, preedit_attr, 1648 XNPreeditAttributes, preedit_attr,
1719 XNStatusAttributes, status_attr, NULL); 1649 XNStatusAttributes, status_attr,
1650 NULL);
1720 1651
1652 XFree (status_attr);
1653 }
1654
1721 XFree (preedit_attr); 1655 XFree (preedit_attr);
1722 XFree (status_attr);
1723} 1656}
1724#endif /* USE_XIM */ 1657#endif /* USE_XIM */
1725 1658
1726/*----------------------------------------------------------------------*/
1727rxvt_t rxvt_current_term;
1728
1729/*----------------------- end-of-file (C source) -----------------------*/ 1659/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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