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.175 by root, Thu Jan 12 00:35:39 2006 UTC vs.
Revision 1.232 by root, Tue May 1 21:30:01 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
46 46
47#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 50
51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) 51vector<rxvt_term *> rxvt_term::termlist;
52static uid_t saved_euid; 52
53static gid_t saved_egid; 53// used to tell global functions which terminal instance is "active"
54#endif 54rxvt_t rxvt_current_term;
55
56static char curlocale[128], savelocale[128];
55 57
56bool 58bool
57rxvt_tainted ()
58{
59#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
60 return getuid () != saved_euid || getgid () != saved_egid;
61#else
62 return false;
63#endif
64}
65
66vector<rxvt_term *> rxvt_term::termlist;
67
68static char curlocale[128], savelocale[128];
69
70bool
71rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
72{ 60{
61 int size = strlen (locale) + 1;
62
63 if (size > sizeof (curlocale))
64 rxvt_fatal ("locale string too long, aborting.\n");
65
73 if (!locale || !strncmp (locale, curlocale, 128)) 66 if (!locale || !memcmp (locale, curlocale, size))
74 return false; 67 return false;
75 68
76 strncpy (curlocale, locale, 128); 69 memcpy (curlocale, locale, size);
77 setlocale (LC_CTYPE, curlocale); 70 setlocale (LC_CTYPE, curlocale);
78 return true; 71 return true;
79} 72}
80 73
81void 74void
82rxvt_push_locale (const char *locale) 75rxvt_push_locale (const char *locale) NOTHROW
83{ 76{
84 strcpy (savelocale, curlocale); 77 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale); 78 rxvt_set_locale (locale);
86} 79}
87 80
88void 81void
89rxvt_pop_locale () 82rxvt_pop_locale () NOTHROW
90{ 83{
91 rxvt_set_locale (savelocale); 84 rxvt_set_locale (savelocale);
92} 85}
93 86
94#if ENABLE_COMBINING 87#if ENABLE_COMBINING
… …
155} 148}
156#endif 149#endif
157 150
158rxvt_term::rxvt_term () 151rxvt_term::rxvt_term ()
159 : 152 :
160#if TRANSPARENT 153#if TRANSPARENT || ENABLE_PERL
161 rootwin_ev (this, &rxvt_term::rootwin_cb), 154 rootwin_ev (this, &rxvt_term::rootwin_cb),
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}
328 315
329void 316void
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 setlocale (LC_CTYPE, curlocale); // perl init destroys this info
529 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
530 }
531#endif
532 491
533 create_windows (argc, argv); 492 create_windows (argc, argv);
534 493
535 dDisp;
536
537 init_xlocale (); 494 init_xlocale ();
538 495
539 scr_reset (); // initialize screen 496 scr_reset (); // initialize screen
540 497
541#if 0 498#if 0
542 XSynchronize (disp, True); 499 XSynchronize (dpy, True);
543#endif 500#endif
544 501
545#ifdef HAVE_SCROLLBARS 502#ifdef HAVE_SCROLLBARS
546 if (OPTION (Opt_scrollBar)) 503 if (option (Opt_scrollBar))
547 resize_scrollbar (); /* create and map scrollbar */ 504 resize_scrollbar (); /* create and map scrollbar */
548#endif 505#endif
549#if (MENUBAR_MAX)
550 if (menubar_visible ())
551 XMapWindow (disp, menuBar.win);
552#endif
553#ifdef TRANSPARENT 506#ifdef TRANSPARENT
554 if (OPTION (Opt_transparent)) 507 if (option (Opt_transparent))
555 { 508 {
556 XSelectInput (disp, display->root, PropertyChangeMask); 509 XSelectInput (dpy, display->root, PropertyChangeMask);
557 check_our_parents (); 510 check_our_parents ();
558 rootwin_ev.start (display, display->root); 511 rootwin_ev.start (display, display->root);
559 } 512 }
560#endif 513#endif
561 514#if ENABLE_PERL
562 XMapWindow (disp, vt); 515 rootwin_ev.start (display, display->root);
563 XMapWindow (disp, parent[0]); 516#endif
564 517
565 set_colorfgbg (); 518 set_colorfgbg ();
566 519
567 init_command (cmd_argv); 520 init_command (cmd_argv);
568 521
569 free (cmd_argv); 522 free (cmd_argv);
570 523
571 if (pty.pty >= 0) 524 if (pty->pty >= 0)
572 pty_ev.start (pty.pty, EVENT_READ); 525 pty_ev.start (pty->pty, EVENT_READ);
573 526
574 check_ev.start (); 527 check_ev.start ();
575 528
576 HOOK_INVOKE ((this, HOOK_START, DT_END)); 529 HOOK_INVOKE ((this, HOOK_START, DT_END));
577 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
578 return true; 544 return true;
579} 545}
580 546
581static struct sig_handlers 547static struct sig_handlers
582{ 548{
583 sig_watcher sw_chld, sw_term, sw_int; 549 sig_watcher sw_term, sw_int;
584 550
585 void sig_chld (sig_watcher &w)
586 {
587 // we are being called for every SIGCHLD, find the corresponding term
588 int pid;
589
590 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
591 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
592 if (pid == (*t)->cmd_pid)
593 {
594 (*t)->child_exit ();
595 break;
596 }
597 }
598
599 /* 551 /*
600 * Catch a fatal signal and tidy up before quitting 552 * Catch a fatal signal and tidy up before quitting
601 */ 553 */
602 void 554 void
603 sig_term (sig_watcher &w) 555 sig_term (sig_watcher &w)
604 { 556 {
605#ifdef DEBUG_CMD
606 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
607#endif
608 rxvt_emergency_cleanup (); 557 rxvt_emergency_cleanup ();
609 signal (w.signum, SIG_DFL); 558 signal (w.signum, SIG_DFL);
610 kill (getpid (), w.signum); 559 kill (getpid (), w.signum);
611 } 560 }
612 561
613 sig_handlers () 562 sig_handlers ()
614 : sw_chld (this, &sig_handlers::sig_chld),
615 sw_term (this, &sig_handlers::sig_term), 563 : sw_term (this, &sig_handlers::sig_term),
616 sw_int (this, &sig_handlers::sig_term) 564 sw_int (this, &sig_handlers::sig_term)
617 { 565 {
618 } 566 }
619} sig_handlers; 567} sig_handlers;
620 568
621char **rxvt_environ; // startup environment 569char **rxvt_environ; // startup environment
622 570
623void 571void
624rxvt_init () 572rxvt_init ()
625{ 573{
574 ptytty::init ();
575
626 rxvt_environ = environ; 576 rxvt_environ = environ;
627
628 /*
629 * Save and then give up any super-user privileges
630 * If we need privileges in any area then we must specifically request it.
631 * We should only need to be root in these cases:
632 * 1. write utmp entries on some systems
633 * 2. chown tty on some systems
634 */
635 rxvt_privileges (SAVE);
636 rxvt_privileges (IGNORE);
637 577
638 signal (SIGHUP, SIG_IGN); 578 signal (SIGHUP, SIG_IGN);
639 signal (SIGPIPE, SIG_IGN); 579 signal (SIGPIPE, SIG_IGN);
640 580
641 sig_handlers.sw_chld.start (SIGCHLD);
642 sig_handlers.sw_term.start (SIGTERM); 581 sig_handlers.sw_term.start (SIGTERM);
643 sig_handlers.sw_int.start (SIGINT); 582 sig_handlers.sw_int.start (SIGINT);
644 583
645 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 584 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
646 /* signal (SIGURG, SIG_DFL); */ 585 /* signal (SIGURG, SIG_DFL); */
… …
675 rxvt_fatal ("memory allocation failure. aborting.\n"); 614 rxvt_fatal ("memory allocation failure. aborting.\n");
676 615
677 return p; 616 return p;
678} 617}
679 618
680void * 619void *
681rxvt_realloc (void *ptr, size_t size) 620rxvt_realloc (void *ptr, size_t size)
682{ 621{
683 void *p = realloc (ptr, size); 622 void *p = realloc (ptr, size);
684 623
685 if (!p) 624 if (!p)
686 rxvt_fatal ("memory allocation failure. aborting.\n"); 625 rxvt_fatal ("memory allocation failure. aborting.\n");
687 626
688 return p; 627 return p;
689} 628}
690
691/* ------------------------------------------------------------------------- *
692 * PRIVILEGED OPERATIONS *
693 * ------------------------------------------------------------------------- */
694/* take care of suid/sgid super-user (root) privileges */
695void
696rxvt_privileges (rxvt_privaction action)
697{
698#if ! defined(__CYGWIN32__)
699# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
700 /* setreuid () is the poor man's setuid (), seteuid () */
701# define seteuid(a) setreuid(-1, (a))
702# define setegid(a) setregid(-1, (a))
703# define HAVE_SETEUID
704# endif
705# ifdef HAVE_SETEUID
706 switch (action)
707 {
708 case IGNORE:
709 /*
710 * change effective uid/gid - not real uid/gid - so we can switch
711 * back to root later, as required
712 */
713 setegid (getgid ());
714 seteuid (getuid ());
715 break;
716 case SAVE:
717 saved_egid = getegid ();
718 saved_euid = geteuid ();
719 break;
720 case RESTORE:
721 setegid (saved_egid);
722 seteuid (saved_euid);
723 break;
724 }
725# else
726 switch (action)
727 {
728 case IGNORE:
729 setgid (getgid ());
730 setuid (getuid ());
731 /* FALLTHROUGH */
732 case SAVE:
733 /* FALLTHROUGH */
734 case RESTORE:
735 break;
736 }
737# endif
738#endif
739}
740
741#ifdef UTMP_SUPPORT
742void
743rxvt_term::privileged_utmp (rxvt_privaction action)
744{
745 if (OPTION (Opt_utmpInhibit)
746 || !pty.name || !*pty.name)
747 return;
748
749 rxvt_privileges (RESTORE);
750
751 if (action == SAVE)
752 makeutent (pty.name, rs[Rs_display_name]);
753 else
754 cleanutent ();
755
756 rxvt_privileges (IGNORE);
757}
758#endif
759 629
760/*----------------------------------------------------------------------*/ 630/*----------------------------------------------------------------------*/
761/* 631/*
762 * window size/position calculcations for XSizeHint and other storage. 632 * window size/position calculcations for XSizeHint and other storage.
763 * if width/height are non-zero then override calculated width/height 633 * if width/height are non-zero then override calculated width/height
764 */ 634 */
765void 635void
766rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 636rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
767{ 637{
768 short recalc_x, recalc_y; 638 short recalc_x, recalc_y;
769 int x, y, sb_w, mb_h, flags; 639 int x, y, sb_w, flags;
770 unsigned int w, h; 640 unsigned int w, h;
771 unsigned int max_width, max_height; 641 unsigned int max_width, max_height;
772 dDisp;
773
774 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
775 ncol, nrow, szHint.width, szHint.height));
776 642
777 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 643 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
778 szHint.win_gravity = NorthWestGravity; 644 szHint.win_gravity = NorthWestGravity;
779 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 645 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
780 646
… …
835 max_width = MAX_COLS * fwidth; 701 max_width = MAX_COLS * fwidth;
836 max_height = MAX_ROWS * fheight; 702 max_height = MAX_ROWS * fheight;
837 703
838 szHint.base_width = szHint.base_height = 2 * int_bwidth; 704 szHint.base_width = szHint.base_height = 2 * int_bwidth;
839 705
840 sb_w = mb_h = 0; 706 sb_w = 0;
841 window_vt_x = window_vt_y = int_bwidth; 707 window_vt_x = window_vt_y = int_bwidth;
842 708
843 if (scrollbar_visible ()) 709 if (scrollBar.state)
844 { 710 {
845 sb_w = scrollbar_TotalWidth (); 711 sb_w = scrollbar_TotalWidth ();
846 szHint.base_width += sb_w; 712 szHint.base_width += sb_w;
713
847 if (!OPTION (Opt_scrollBar_right)) 714 if (!option (Opt_scrollBar_right))
848 window_vt_x += sb_w; 715 window_vt_x += sb_w;
849 } 716 }
850 717
851 if (menubar_visible ())
852 {
853 mb_h = menuBar_TotalHeight ();
854 szHint.base_height += mb_h;
855 window_vt_y += mb_h;
856 }
857
858 szHint.width_inc = fwidth; 718 szHint.width_inc = fwidth;
859 szHint.height_inc = fheight; 719 szHint.height_inc = fheight;
860 szHint.min_width = szHint.base_width + szHint.width_inc; 720 szHint.min_width = szHint.base_width + szHint.width_inc;
861 szHint.min_height = szHint.base_height + szHint.height_inc; 721 szHint.min_height = szHint.base_height + szHint.height_inc;
862 722
863 if (newwidth && newwidth - szHint.base_width < max_width) 723 if (newwidth && newwidth - szHint.base_width < max_width)
864 { 724 {
865 szHint.width = newwidth; 725 szHint.width = newwidth;
… …
880 { 740 {
881 min_it (height, max_height); 741 min_it (height, max_height);
882 szHint.height = szHint.base_height + height; 742 szHint.height = szHint.base_height + height;
883 } 743 }
884 744
885 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 745 if (scrollBar.state && option (Opt_scrollBar_right))
886 window_sb_x = szHint.width - sb_w; 746 window_sb_x = szHint.width - sb_w;
887 747
888 if (recalc_x) 748 if (recalc_x)
889 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 749 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
750
890 if (recalc_y) 751 if (recalc_y)
891 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 752 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
892 753
893 ncol = width / fwidth; 754 ncol = width / fwidth;
894 nrow = height / fheight; 755 nrow = height / fheight;
895 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
896 ncol, nrow, szHint.width,
897 szHint.height));
898 return;
899} 756}
900 757
901/*----------------------------------------------------------------------*/ 758/*----------------------------------------------------------------------*/
902/* 759/*
903 * Tell the teletype handler what size the window is. 760 * Tell the teletype handler what size the window is.
904 * Called after a window size change. 761 * Called after a window size change.
905 */ 762 */
906void 763void
907rxvt_term::tt_winch () 764rxvt_term::tt_winch ()
908{ 765{
909 if (pty.pty < 0) 766 if (pty->pty < 0)
910 return; 767 return;
911 768
912 struct winsize ws; 769 struct winsize ws;
913 770
914 ws.ws_col = ncol; 771 ws.ws_col = ncol;
915 ws.ws_row = nrow; 772 ws.ws_row = nrow;
916 ws.ws_xpixel = width; 773 ws.ws_xpixel = width;
917 ws.ws_ypixel = height; 774 ws.ws_ypixel = height;
918 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 775 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
919 776
920#if 0 777#if 0
921 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 778 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
922 if (cmd_pid) /* force through to the command */ 779 if (cmd_pid) /* force through to the command */
923 kill (-cmd_pid, SIGWINCH); 780 kill (-cmd_pid, SIGWINCH);
… …
955 delete fontset[0]; 812 delete fontset[0];
956 fontset[0] = fs; 813 fontset[0] = fs;
957 814
958 prop = (*fs)[1]->properties (); 815 prop = (*fs)[1]->properties ();
959 prop.height += lineSpace; 816 prop.height += lineSpace;
817
960 fs->set_prop (prop); 818 fs->set_prop (prop, false);
961 819
962 fwidth = prop.width; 820 fwidth = prop.width;
963 fheight = prop.height; 821 fheight = prop.height;
964 fbase = prop.ascent; 822 fbase = prop.ascent;
965 823
… …
974 { 832 {
975 fontset[style] = fs = new rxvt_fontset (this); 833 fontset[style] = fs = new rxvt_fontset (this);
976 rxvt_fontprop prop2 = prop; 834 rxvt_fontprop prop2 = prop;
977 835
978 if (res) 836 if (res)
979 prop2.weight = prop2.slant = rxvt_fontprop::unset; 837 {
838 fs->populate (res);
839 fs->set_prop (prop2, false);
840 }
980 else 841 else
981 { 842 {
982 res = fontset[0]->fontdesc; 843 fs->populate (fontset[0]->fontdesc);
983 844
984 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;
985 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);
986 } 849 }
987 850
988 fs->populate (res);
989 fs->set_prop (prop2);
990 } 851 }
991#else 852#else
992 fontset[style] = fontset[0]; 853 fontset[style] = fontset[0];
993#endif 854#endif
994 } 855 }
… …
1003 return true; 864 return true;
1004} 865}
1005 866
1006void 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)
1007{ 868{
1008 XChangeProperty (display->display, parent[0], 869 XChangeProperty (dpy, parent[0],
1009 prop, XA_STRING, 8, PropModeReplace, 870 prop, XA_STRING, 8, PropModeReplace,
1010 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 871 (const unsigned char *)str, len >= 0 ? len : strlen (str));
1011} 872}
1012 873
1013void 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)
1014{ 875{
1015 wchar_t *ws = rxvt_mbstowcs (str, len); 876 wchar_t *ws = rxvt_mbstowcs (str, len);
1016 char *s = rxvt_wcstoutf8 (ws); 877 char *s = rxvt_wcstoutf8 (ws);
1017 878
1018 XChangeProperty (display->display, parent[0], 879 XChangeProperty (dpy, parent[0],
1019 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 880 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
1020 (const unsigned char *)s, strlen (s)); 881 (const unsigned char *)s, strlen (s));
1021 882
1022 free (s); 883 free (s);
1023 free (ws); 884 free (ws);
… …
1048void 909void
1049rxvt_term::set_window_color (int idx, const char *color) 910rxvt_term::set_window_color (int idx, const char *color)
1050{ 911{
1051 rxvt_color xcol; 912 rxvt_color xcol;
1052 int i; 913 int i;
1053 914
1054 if (color == NULL || *color == '\0') 915 if (color == NULL || *color == '\0')
1055 return; 916 return;
917
918 color = strdup (color);
919 allocated.push_back ((void *)color);
920 rs[Rs_color + idx] = color;
1056 921
1057 /* handle color aliases */ 922 /* handle color aliases */
1058 if (isdigit (*color)) 923 if (isdigit (*color))
1059 { 924 {
1060 i = atoi (color); 925 i = atoi (color);
1061 926
1062 if (i >= 8 && i <= 15) 927 if (i >= 8 && i <= 15)
1063 { /* bright colors */ 928 { /* bright colors */
1064 i -= 8; 929 i -= 8;
1065 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 930 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1066 SET_PIXCOLOR (idx);
1067 goto done; 931 goto done;
1068 } 932 }
1069 933
1070 if (i >= 0 && i <= 7) 934 if (i >= 0 && i <= 7)
1071 { /* normal colors */ 935 { /* normal colors */
1072 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 936 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1073 SET_PIXCOLOR (idx);
1074 goto done; 937 goto done;
1075 } 938 }
1076 } 939 }
1077 940
1078 if (!rXParseAllocColor (&xcol, color)) 941 set_color (xcol, color);
1079 return;
1080
1081 /* XStoreColor (display->display, display->cmap, XColor*); */
1082 942
1083 /* 943 /*
1084 * 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,
1085 * so just keep gobbling up the colormap 945 * so just keep gobbling up the colormap
1086 */ 946 */
1087# if 0
1088 for (i = Color_Black; i <= Color_White; i++)
1089 if (pix_colors[idx] == pix_colors[i])
1090 break;
1091 if (i > Color_White)
1092 {
1093 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1094 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1095 DisplayPlanes (display->display, display->screen));
1096 }
1097# endif
1098 947
1099 pix_colors_focused[idx] = xcol; 948 pix_colors_focused[idx] = xcol;
1100 SET_PIXCOLOR (idx);
1101 949
1102 /* XSetWindowAttributes attr; */ 950 /* XSetWindowAttributes attr; */
1103 /* Cursor cursor; */ 951 /* Cursor cursor; */
1104done: 952done:
1105
1106#if OFF_FOCUS_FADING
1107 if (rs[Rs_fade])
1108 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1109#endif
1110
1111 /*TODO: handle Color_BD, scrollbar background, etc. */ 953 /*TODO: handle Color_BD, scrollbar background, etc. */
1112 954
955 update_fade_color (idx);
1113 recolour_cursor (); 956 recolour_cursor ();
1114 scr_recolour (); 957 scr_recolour ();
1115} 958}
1116 959
1117#else 960#else
… …
1119#endif /* XTERM_COLOR_CHANGE */ 962#endif /* XTERM_COLOR_CHANGE */
1120 963
1121void 964void
1122rxvt_term::recolour_cursor () 965rxvt_term::recolour_cursor ()
1123{ 966{
1124 XColor xcol[2]; 967 XColor fg, bg;
1125 968
1126 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 969 (ISSET_PIXCOLOR (Color_pointer_fg)
1127 ? pix_colors_focused[Color_pointer_fg] 970 ? pix_colors_focused[Color_pointer_fg]
1128 : pix_colors_focused[Color_fg]; 971 : pix_colors_focused[Color_fg]).get (fg);
972
1129 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 973 (ISSET_PIXCOLOR (Color_pointer_bg)
1130 ? pix_colors_focused[Color_pointer_bg] 974 ? pix_colors_focused[Color_pointer_bg]
1131 : pix_colors_focused[Color_bg]; 975 : pix_colors_focused[Color_bg]).get (bg);
1132 976
1133 XQueryColors (display->display, display->cmap, xcol, 2); 977 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1134 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1135} 978}
1136 979
1137/*----------------------------------------------------------------------*/ 980/*----------------------------------------------------------------------*/
1138/* 981/*
1139 * 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
… …
1143{ 986{
1144 unsigned int i; 987 unsigned int i;
1145 const char *xpmb = "\0"; 988 const char *xpmb = "\0";
1146 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 989 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1147 990
1148 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1149 strcpy (fstr, "default"); 991 strcpy (fstr, "default");
1150 strcpy (bstr, "default"); 992 strcpy (bstr, "default");
1151 for (i = Color_Black; i <= Color_White; i++) 993 for (i = Color_Black; i <= Color_White; i++)
1152 if (pix_colors[Color_fg] == pix_colors[i]) 994 if (pix_colors[Color_fg] == pix_colors[i])
1153 { 995 {
… …
1168 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1010 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1169} 1011}
1170 1012
1171/*----------------------------------------------------------------------*/ 1013/*----------------------------------------------------------------------*/
1172 1014
1173int 1015bool
1174rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1016rxvt_term::set_color (rxvt_color &color, const char *name)
1175{ 1017{
1176 if (!screen_in_out->set (display, colour)) 1018 if (color.set (this, name))
1177 {
1178 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1179 return false;
1180 }
1181
1182 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]);
1183} 1029}
1184 1030
1185/* -------------------------------------------------------------------- * 1031/* -------------------------------------------------------------------- *
1186 * - WINDOW RESIZING - * 1032 * - WINDOW RESIZING - *
1187 * -------------------------------------------------------------------- */ 1033 * -------------------------------------------------------------------- */
1188void 1034void
1189rxvt_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)
1190{ 1036{
1191 int fix_screen; 1037 int fix_screen;
1192 int old_width = szHint.width, old_height = szHint.height; 1038 int old_width = szHint.width;
1193 dDisp; 1039 int old_height = szHint.height;
1194 1040
1195 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)))
1196 XSetWMNormalHints (disp, parent[0], &szHint); 1044 XSetWMNormalHints (dpy, parent[0], &szHint);
1197 1045
1198 if (!ignoreparent) 1046 if (!ignoreparent)
1199 { 1047 {
1200#ifdef SMART_RESIZE 1048#ifdef SMART_RESIZE
1201 /* 1049 /*
… …
1205 int x, y, x1, y1; 1053 int x, y, x1, y1;
1206 int dx, dy; 1054 int dx, dy;
1207 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1055 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1208 Window unused_cr; 1056 Window unused_cr;
1209 1057
1210 XTranslateCoordinates (disp, parent[0], display->root, 1058 XTranslateCoordinates (dpy, parent[0], display->root,
1211 0, 0, &x, &y, &unused_cr); 1059 0, 0, &x, &y, &unused_cr);
1212 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1060 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1213 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1061 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1214 /* 1062 /*
1215 * 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
1216 * our position for handles and decorations. Counter it 1064 * our position for handles and decorations. Counter it
1217 */ 1065 */
… …
1219 { 1067 {
1220 x -= x1; 1068 x -= x1;
1221 y -= y1; 1069 y -= y1;
1222 } 1070 }
1223 1071
1224 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1072 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1225 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1073 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1226 dx = old_width - szHint.width; 1074 dx = old_width - szHint.width;
1227 dy = old_height - szHint.height; 1075 dy = old_height - szHint.height;
1228 1076
1229 /* Check position of the center of the window */ 1077 /* Check position of the center of the window */
1230 if (x < x1) /* left half */ 1078 if (x < x1) /* left half */
1231 dx = 0; 1079 dx = 0;
… …
1234 if (y < y1) /* top half */ 1082 if (y < y1) /* top half */
1235 dy = 0; 1083 dy = 0;
1236 else if (y == y1) /* exact center */ 1084 else if (y == y1) /* exact center */
1237 dy /= 2; 1085 dy /= 2;
1238 1086
1239 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1087 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1240 szHint.width, szHint.height); 1088 szHint.width, szHint.height);
1241#else 1089#else
1242 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1090 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1243#endif 1091#endif
1244 } 1092 }
1245 1093
1246 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1094 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1247 1095
1248 if (fix_screen || newwidth != old_width || newheight != old_height) 1096 if (fix_screen || newwidth != old_width || newheight != old_height)
1249 { 1097 {
1250 if (scrollbar_visible ()) 1098 if (scrollBar.state)
1251 { 1099 {
1252 XMoveResizeWindow (disp, scrollBar.win, 1100 XMoveResizeWindow (dpy, scrollBar.win,
1253 window_sb_x, 0, 1101 window_sb_x, 0,
1254 scrollbar_TotalWidth (), szHint.height); 1102 scrollbar_TotalWidth (), szHint.height);
1255 resize_scrollbar (); 1103 resize_scrollbar ();
1256 } 1104 }
1257 1105
1258 if (menubar_visible ())
1259 XMoveResizeWindow (disp, menuBar.win,
1260 window_vt_x, 0,
1261 width, menuBar_TotalHeight ());
1262
1263 XMoveResizeWindow (disp, vt, 1106 XMoveResizeWindow (dpy, vt,
1264 window_vt_x, window_vt_y, 1107 window_vt_x, window_vt_y,
1265 width, height); 1108 width, height);
1266 1109
1267 scr_clear (); 1110 scr_clear ();
1268#ifdef XPM_BACKGROUND 1111#ifdef XPM_BACKGROUND
1269 resize_pixmap (); 1112 resize_pixmap ();
1270#endif 1113#endif
1271 } 1114 }
1272 1115
1273 if (fix_screen || old_height == 0) 1116 if (fix_screen || old_height == 0)
1274 {
1275 int curr_screen = -1;
1276 int old_ncol = prev_ncol;
1277
1278 /* scr_reset only works on the primary screen */
1279 if (old_height) /* this is not the first time through */
1280 {
1281 unsigned int ocol = ncol;
1282 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1283 curr_screen = scr_change_screen (PRIMARY);
1284 ncol = ocol;
1285 }
1286
1287 scr_reset (); 1117 scr_reset ();
1288 1118
1289 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
1290 { 1120 //scr_touch (false);
1291 scr_change_screen (curr_screen);
1292 selection_check (old_ncol != ncol ? 4 : 0);
1293 }
1294 }
1295
1296 old_width = szHint.width;
1297 old_height = szHint.height;
1298 1121
1299#ifdef XPM_BACKGROUND 1122#ifdef XPM_BACKGROUND
1300 if (pixmap) 1123 if (pixmap)
1301 scr_touch (false); 1124 scr_touch (false);
1302#endif 1125#endif
1303 1126
1304#ifdef USE_XIM 1127#ifdef USE_XIM
1305 IMSetStatusPosition (); 1128 IMSetPosition ();
1306#endif 1129#endif
1307} 1130}
1308 1131
1309/* 1132/*
1310 * 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.
… …
1315{ 1138{
1316 XWindowAttributes wattr; 1139 XWindowAttributes wattr;
1317 1140
1318 if (newwidth == 0 || newheight == 0) 1141 if (newwidth == 0 || newheight == 0)
1319 { 1142 {
1320 XGetWindowAttributes (display->display, display->root, &wattr); 1143 XGetWindowAttributes (dpy, display->root, &wattr);
1321 1144
1322 if (newwidth == 0) 1145 if (newwidth == 0)
1323 newwidth = wattr.width - szHint.base_width; 1146 newwidth = wattr.width - szHint.base_width;
1324 if (newheight == 0) 1147 if (newheight == 0)
1325 newheight = wattr.height - szHint.base_height; 1148 newheight = wattr.height - szHint.base_height;
… …
1339#ifdef USE_XIM 1162#ifdef USE_XIM
1340 1163
1341void 1164void
1342rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1165rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1343{ 1166{
1344 fg = pix_colors[Color_fg]; 1167 fg = pix_colors [Color_fg];
1345 bg = pix_colors[Color_bg]; 1168 bg = pix_colors [Color_bg];
1346} 1169}
1347 1170
1348void 1171void
1349rxvt_term::im_set_size (XRectangle &size) 1172rxvt_term::im_set_size (XRectangle &size)
1350{ 1173{
… …
1387 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1210 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1388 1211
1389 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1212 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1390 *p = '\0'; 1213 *p = '\0';
1391 1214
1392 atom = XInternAtom (display->display, server, False); 1215 atom = XInternAtom (dpy, server, False);
1393 win = XGetSelectionOwner (display->display, atom); 1216 win = XGetSelectionOwner (dpy, atom);
1394 1217
1395 if (win != None) 1218 if (win != None)
1396 return True; 1219 return True;
1397 } 1220 }
1398 1221
… …
1405 XPoint nspot; 1228 XPoint nspot;
1406 XVaNestedList preedit_attr; 1229 XVaNestedList preedit_attr;
1407 1230
1408 if (!Input_Context 1231 if (!Input_Context
1409 || !focus 1232 || !focus
1410 || !(input_style & XIMPreeditPosition)) 1233 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1411 return; 1234 return;
1412 1235
1413 im_set_position (nspot); 1236 im_set_position (nspot);
1414 1237
1415 if (nspot.x == spot.x && nspot.y == spot.y) 1238 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1434 input_method = 0; 1257 input_method = 0;
1435 } 1258 }
1436 1259
1437 Input_Context = 0; 1260 Input_Context = 0;
1438} 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
1439 1336
1440/* 1337/*
1441 * 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
1442 * open a suitable preedit type 1339 * open a suitable preedit type
1443 */ 1340 */
… …
1450 XRectangle rect, status_rect, needed_rect; 1347 XRectangle rect, status_rect, needed_rect;
1451 unsigned long fg, bg; 1348 unsigned long fg, bg;
1452 const char *p; 1349 const char *p;
1453 char **s; 1350 char **s;
1454 XIMStyles *xim_styles; 1351 XIMStyles *xim_styles;
1352#ifdef ENABLE_XIM_ONTHESPOT
1353 XIMCallback xcb[4];
1354#endif
1455 1355
1456 TEMP_ENV; 1356 set_environ (envv);
1457 1357
1458 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1358 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1459 return false; 1359 return false;
1460 1360
1461 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1462 input_method = display->get_xim (locale, modifiers); 1361 input_method = display->get_xim (locale, modifiers);
1463 if (input_method == NULL) 1362 if (input_method == NULL)
1464 return false; 1363 return false;
1465 1364
1466 xim = input_method->xim; 1365 xim = input_method->xim;
… …
1486 s = rxvt_splitcommastring (p); 1385 s = rxvt_splitcommastring (p);
1487 1386
1488 for (i = found = 0; !found && s[i]; i++) 1387 for (i = found = 0; !found && s[i]; i++)
1489 { 1388 {
1490 if (!strcmp (s[i], "OverTheSpot")) 1389 if (!strcmp (s[i], "OverTheSpot"))
1491 input_style = (XIMPreeditPosition | XIMStatusNothing); 1390 input_style = XIMPreeditPosition | XIMStatusNothing;
1492 else if (!strcmp (s[i], "OffTheSpot")) 1391 else if (!strcmp (s[i], "OffTheSpot"))
1493 input_style = (XIMPreeditArea | XIMStatusArea); 1392 input_style = XIMPreeditArea | XIMStatusArea;
1494 else if (!strcmp (s[i], "Root")) 1393 else if (!strcmp (s[i], "Root"))
1495 input_style = (XIMPreeditNothing | XIMStatusNothing); 1394 input_style = XIMPreeditNothing | XIMStatusNothing;
1496 else if (!strcmp (s[i], "None")) 1395 else if (!strcmp (s[i], "None"))
1497 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;
1498 1403
1499 for (j = 0; j < xim_styles->count_styles; j++) 1404 for (j = 0; j < xim_styles->count_styles; j++)
1500 if (input_style == xim_styles->supported_styles[j]) 1405 if (input_style == xim_styles->supported_styles[j])
1501 { 1406 {
1502 rxvt_freecommastring (s); 1407 rxvt_freecommastring (s);
… …
1540 "*", 1445 "*",
1541 fheight, 1446 fheight,
1542 fheight + 1, fheight - 1, 1447 fheight + 1, fheight - 1,
1543 fheight - 2, fheight + 2); 1448 fheight - 2, fheight + 2);
1544 1449
1545 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1450 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1546 &missing_charset_list, &missing_charset_count, &def_string); 1451 &missing_charset_list, &missing_charset_count, &def_string);
1547 1452
1548 if (missing_charset_list) 1453 if (missing_charset_list)
1549 XFreeStringList (missing_charset_list); 1454 XFreeStringList (missing_charset_list);
1550 1455
… …
1591 XNBackground, bg, 1496 XNBackground, bg,
1592 XNArea, &status_rect, 1497 XNArea, &status_rect,
1593 XNFontSet, fs, 1498 XNFontSet, fs,
1594 NULL); 1499 NULL);
1595 } 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
1596 1524
1597 Input_Context = XCreateIC (xim, 1525 Input_Context = XCreateIC (xim,
1598 XNInputStyle, input_style, 1526 XNInputStyle, input_style,
1599 XNClientWindow, vt, 1527 XNClientWindow, vt,
1600 XNFocusWindow, parent[0], 1528 XNFocusWindow, parent[0],
… …
1602 preedit_attr, 1530 preedit_attr,
1603 status_attr ? XNStatusAttributes : NULL, 1531 status_attr ? XNStatusAttributes : NULL,
1604 status_attr, NULL); 1532 status_attr, NULL);
1605 1533
1606 if (preedit_attr) XFree (preedit_attr); 1534 if (preedit_attr) XFree (preedit_attr);
1607 if (status_attr) XFree (status_attr); 1535 if (status_attr) XFree (status_attr);
1608 if (fs) XFreeFontSet (display->display, fs); 1536 if (fs) XFreeFontSet (dpy, fs);
1609 1537
1610 if (Input_Context == NULL) 1538 if (Input_Context == NULL)
1611 { 1539 {
1612 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1540 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1613 im_destroy (); 1541 im_destroy ();
1614 return false; 1542 return false;
1615 } 1543 }
1616 1544
1617 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
1618 IMSetStatusPosition (); 1551 IMSetPosition ();
1619 1552
1620 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1621 return true; 1553 return true;
1622} 1554}
1623 1555
1624void 1556void
1625rxvt_term::im_cb () 1557rxvt_term::im_cb ()
… …
1627 int i; 1559 int i;
1628 const char *p; 1560 const char *p;
1629 char **s; 1561 char **s;
1630 char buf[IMBUFSIZ]; 1562 char buf[IMBUFSIZ];
1631 1563
1632 SET_R (this); 1564 make_current ();
1633 1565
1634 im_destroy (); 1566 im_destroy ();
1635 1567
1636 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1637 if (Input_Context) 1568 if (Input_Context)
1638 return; 1569 return;
1639 1570
1640#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1571#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1641 if (rs[Rs_imLocale]) 1572 if (rs[Rs_imLocale])
… …
1683 SET_LOCALE (locale); 1614 SET_LOCALE (locale);
1684#endif 1615#endif
1685} 1616}
1686 1617
1687void 1618void
1688rxvt_term::IMSetStatusPosition () 1619rxvt_term::IMSetPosition ()
1689{ 1620{
1690 XRectangle preedit_rect, status_rect, *needed_rect; 1621 XRectangle preedit_rect, status_rect, *needed_rect;
1691 XVaNestedList preedit_attr, status_attr; 1622 XVaNestedList preedit_attr, status_attr;
1692 1623
1693 if (!Input_Context 1624 if (!Input_Context
1694 || !focus 1625 || !focus
1695 || !(input_style & XIMPreeditArea) 1626 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1696 || !IMisRunning ()) 1627 || !IMisRunning ())
1697 return; 1628 return;
1698 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 {
1699 /* Getting the necessary width of preedit area */ 1640 /* Getting the necessary width of preedit area */
1700 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1641 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1701 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1642 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1702 XFree (status_attr); 1643 XFree (status_attr);
1703 1644
1704 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1645 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1705 XFree (needed_rect); 1646 XFree (needed_rect);
1706 1647
1707 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1648 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1708 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1649 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1709 1650
1710 XSetICValues (Input_Context, 1651 XSetICValues (Input_Context,
1711 XNPreeditAttributes, preedit_attr, 1652 XNPreeditAttributes, preedit_attr,
1712 XNStatusAttributes, status_attr, NULL); 1653 XNStatusAttributes, status_attr,
1654 NULL);
1713 1655
1656 XFree (status_attr);
1657 }
1658
1714 XFree (preedit_attr); 1659 XFree (preedit_attr);
1715 XFree (status_attr);
1716} 1660}
1717#endif /* USE_XIM */ 1661#endif /* USE_XIM */
1718 1662
1719/*----------------------------------------------------------------------*/
1720rxvt_t rxvt_current_term;
1721
1722/*----------------------- end-of-file (C source) -----------------------*/ 1663/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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