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

Diff Legend

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