ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

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

Diff Legend

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