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

Diff Legend

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