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.160 by root, Wed Jan 4 05:35:34 2006 UTC vs.
Revision 1.224 by root, Mon Feb 20 22:42:00 2006 UTC

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

Diff Legend

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