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.173 by root, Wed Jan 11 19:55:34 2006 UTC vs.
Revision 1.231 by root, Sun Aug 27 10:14:47 2006 UTC

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

Diff Legend

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