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.171 by root, Wed Jan 11 03:13:26 2006 UTC vs.
Revision 1.226 by root, Thu Jul 6 23:48:11 2006 UTC

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

Diff Legend

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