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

Diff Legend

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