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

Diff Legend

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