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.222 by root, Sun Feb 12 09:44:04 2006 UTC

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

Diff Legend

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