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.156 by root, Mon Jan 2 18:20:23 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>
… …
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
… …
140} 143}
141#endif 144#endif
142 145
143rxvt_term::rxvt_term () 146rxvt_term::rxvt_term ()
144 : 147 :
145#if TRANSPARENT 148#if TRANSPARENT || ENABLE_PERL
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)
… …
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 330#endif
333#if MENUBAR 331#if TRANSPARENT || ENABLE_PERL
334 menubar_ev.stop (display);
335#endif
336#if TRANSPARENT
337 rootwin_ev.stop (display); 332 rootwin_ev.stop (display);
338#endif 333#endif
339 incr_ev.stop (); 334 incr_ev.stop ();
340 termwin_ev.stop (display); 335 termwin_ev.stop (display);
341 vt_ev.stop (display); 336 vt_ev.stop (display);
… …
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 rxvt_perl.init ();
493#endif
494
495 PERL_INVOKE ((this, HOOK_INIT, DT_END));
496 486
497 create_windows (argc, argv); 487 create_windows (argc, argv);
498 488
499 dDisp;
500
501 init_xlocale (); 489 init_xlocale ();
502 490
503 scr_reset (); /* initialize screen */ 491 scr_reset (); // initialize screen
504 492
505#if 0 493#if 0
506 XSynchronize (disp, True); 494 XSynchronize (dpy, True);
507#endif 495#endif
508 496
509#ifdef HAVE_SCROLLBARS 497#ifdef HAVE_SCROLLBARS
510 if (OPTION (Opt_scrollBar)) 498 if (OPTION (Opt_scrollBar))
511 resize_scrollbar (); /* create and map scrollbar */ 499 resize_scrollbar (); /* create and map scrollbar */
512#endif 500#endif
513#if (MENUBAR_MAX)
514 if (menubar_visible ())
515 XMapWindow (disp, menuBar.win);
516#endif
517#ifdef TRANSPARENT 501#ifdef TRANSPARENT
518 if (OPTION (Opt_transparent)) 502 if (OPTION (Opt_transparent))
519 { 503 {
520 XSelectInput (disp, display->root, PropertyChangeMask); 504 XSelectInput (dpy, display->root, PropertyChangeMask);
521 check_our_parents (); 505 check_our_parents ();
522 rootwin_ev.start (display, display->root); 506 rootwin_ev.start (display, display->root);
523 } 507 }
524#endif 508#endif
525 509#if ENABLE_PERL
526 XMapWindow (disp, vt); 510 rootwin_ev.start (display, display->root);
527 XMapWindow (disp, parent[0]); 511#endif
528 512
529 set_colorfgbg (); 513 set_colorfgbg ();
530 514
531 init_command (cmd_argv); 515 init_command (cmd_argv);
532 516
533 free (cmd_argv); 517 free (cmd_argv);
534 518
519 if (pty->pty >= 0)
535 pty_ev.start (pty.pty, EVENT_READ); 520 pty_ev.start (pty->pty, EVENT_READ);
536 521
537 check_ev.start (); 522 check_ev.start ();
538 523
539 PERL_INVOKE ((this, HOOK_START, DT_END)); 524 HOOK_INVOKE ((this, HOOK_START, DT_END));
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]);
540 538
541 return true; 539 return true;
542} 540}
543 541
544static struct sig_handlers 542static struct sig_handlers
545{ 543{
546 sig_watcher sw_chld, sw_term, sw_int; 544 sig_watcher sw_term, sw_int;
547 545
548 void sig_chld (sig_watcher &w)
549 {
550 // we are being called for every SIGCHLD, find the corresponding term
551 int pid;
552
553 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
554 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
555 if (pid == (*t)->cmd_pid)
556 {
557 (*t)->child_exit ();
558 break;
559 }
560 }
561
562 /* 546 /*
563 * Catch a fatal signal and tidy up before quitting 547 * Catch a fatal signal and tidy up before quitting
564 */ 548 */
565 void 549 void
566 sig_term (sig_watcher &w) 550 sig_term (sig_watcher &w)
567 { 551 {
568#ifdef DEBUG_CMD
569 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
570#endif
571 rxvt_emergency_cleanup (); 552 rxvt_emergency_cleanup ();
572 signal (w.signum, SIG_DFL); 553 signal (w.signum, SIG_DFL);
573 kill (getpid (), w.signum); 554 kill (getpid (), w.signum);
574 } 555 }
575 556
576 sig_handlers () 557 sig_handlers ()
577 : sw_chld (this, &sig_handlers::sig_chld),
578 sw_term (this, &sig_handlers::sig_term), 558 : sw_term (this, &sig_handlers::sig_term),
579 sw_int (this, &sig_handlers::sig_term) 559 sw_int (this, &sig_handlers::sig_term)
580 { 560 {
581 } 561 }
582} sig_handlers; 562} sig_handlers;
583 563
564char **rxvt_environ; // startup environment
565
584void 566void
585rxvt_init () 567rxvt_init ()
586{ 568{
587 /* 569 ptytty::init ();
588 * Save and then give up any super-user privileges 570
589 * If we need privileges in any area then we must specifically request it. 571 rxvt_environ = environ;
590 * We should only need to be root in these cases:
591 * 1. write utmp entries on some systems
592 * 2. chown tty on some systems
593 */
594 rxvt_privileges (SAVE);
595 rxvt_privileges (IGNORE);
596 572
597 signal (SIGHUP, SIG_IGN); 573 signal (SIGHUP, SIG_IGN);
598 signal (SIGPIPE, SIG_IGN); 574 signal (SIGPIPE, SIG_IGN);
599 575
600 sig_handlers.sw_chld.start (SIGCHLD);
601 sig_handlers.sw_term.start (SIGTERM); 576 sig_handlers.sw_term.start (SIGTERM);
602 sig_handlers.sw_int.start (SIGINT); 577 sig_handlers.sw_int.start (SIGINT);
603 578
604 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 579 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
605 /* signal (SIGURG, SIG_DFL); */ 580 /* signal (SIGURG, SIG_DFL); */
606 581
607 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 582 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
608 // TODO: handle this with exceptions and tolerate the memory loss 583 // TODO: handle this with exceptions and tolerate the memory loss
609 XSetIOErrorHandler (rxvt_xioerror_handler); 584 XSetIOErrorHandler (rxvt_xioerror_handler);
585
586 XrmInitialize ();
610} 587}
611 588
612/* ------------------------------------------------------------------------- * 589/* ------------------------------------------------------------------------- *
613 * MEMORY ALLOCATION WRAPPERS * 590 * MEMORY ALLOCATION WRAPPERS *
614 * ------------------------------------------------------------------------- */ 591 * ------------------------------------------------------------------------- */
… …
632 rxvt_fatal ("memory allocation failure. aborting.\n"); 609 rxvt_fatal ("memory allocation failure. aborting.\n");
633 610
634 return p; 611 return p;
635} 612}
636 613
637void * 614void *
638rxvt_realloc (void *ptr, size_t size) 615rxvt_realloc (void *ptr, size_t size)
639{ 616{
640 void *p = realloc (ptr, size); 617 void *p = realloc (ptr, size);
641 618
642 if (!p) 619 if (!p)
643 rxvt_fatal ("memory allocation failure. aborting.\n"); 620 rxvt_fatal ("memory allocation failure. aborting.\n");
644 621
645 return p; 622 return p;
646} 623}
647
648/* ------------------------------------------------------------------------- *
649 * PRIVILEGED OPERATIONS *
650 * ------------------------------------------------------------------------- */
651/* take care of suid/sgid super-user (root) privileges */
652void
653rxvt_privileges (rxvt_privaction action)
654{
655#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
656 static uid_t euid;
657 static gid_t egid;
658#endif
659
660#if ! defined(__CYGWIN32__)
661# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
662 /* setreuid () is the poor man's setuid (), seteuid () */
663# define seteuid(a) setreuid(-1, (a))
664# define setegid(a) setregid(-1, (a))
665# define HAVE_SETEUID
666# endif
667# ifdef HAVE_SETEUID
668 switch (action)
669 {
670 case IGNORE:
671 /*
672 * change effective uid/gid - not real uid/gid - so we can switch
673 * back to root later, as required
674 */
675 seteuid (getuid ());
676 setegid (getgid ());
677 break;
678 case SAVE:
679 euid = geteuid ();
680 egid = getegid ();
681 break;
682 case RESTORE:
683 seteuid (euid);
684 setegid (egid);
685 break;
686 }
687# else
688 switch (action)
689 {
690 case IGNORE:
691 setuid (getuid ());
692 setgid (getgid ());
693 /* FALLTHROUGH */
694 case SAVE:
695 /* FALLTHROUGH */
696 case RESTORE:
697 break;
698 }
699# endif
700#endif
701}
702
703#ifdef UTMP_SUPPORT
704void
705rxvt_term::privileged_utmp (rxvt_privaction action)
706{
707 if (OPTION (Opt_utmpInhibit)
708 || !pty.name || !*pty.name)
709 return;
710
711 rxvt_privileges (RESTORE);
712
713 if (action == SAVE)
714 makeutent (pty.name, rs[Rs_display_name]);
715 else
716 cleanutent ();
717
718 rxvt_privileges (IGNORE);
719}
720#endif
721 624
722/*----------------------------------------------------------------------*/ 625/*----------------------------------------------------------------------*/
723/* 626/*
724 * window size/position calculcations for XSizeHint and other storage. 627 * window size/position calculcations for XSizeHint and other storage.
725 * if width/height are non-zero then override calculated width/height 628 * if width/height are non-zero then override calculated width/height
726 */ 629 */
727void 630void
728rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 631rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
729{ 632{
730 short recalc_x, recalc_y; 633 short recalc_x, recalc_y;
731 int x, y, sb_w, mb_h, flags; 634 int x, y, sb_w, flags;
732 unsigned int w, h; 635 unsigned int w, h;
733 unsigned int max_width, max_height; 636 unsigned int max_width, max_height;
734 dDisp;
735
736 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
737 ncol, nrow, szHint.width, szHint.height));
738 637
739 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 638 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
740 szHint.win_gravity = NorthWestGravity; 639 szHint.win_gravity = NorthWestGravity;
741 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 640 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
742 641
… …
797 max_width = MAX_COLS * fwidth; 696 max_width = MAX_COLS * fwidth;
798 max_height = MAX_ROWS * fheight; 697 max_height = MAX_ROWS * fheight;
799 698
800 szHint.base_width = szHint.base_height = 2 * int_bwidth; 699 szHint.base_width = szHint.base_height = 2 * int_bwidth;
801 700
802 sb_w = mb_h = 0; 701 sb_w = 0;
803 window_vt_x = window_vt_y = int_bwidth; 702 window_vt_x = window_vt_y = int_bwidth;
804 703
805 if (scrollbar_visible ()) 704 if (scrollBar.state)
806 { 705 {
807 sb_w = scrollbar_TotalWidth (); 706 sb_w = scrollbar_TotalWidth ();
808 szHint.base_width += sb_w; 707 szHint.base_width += sb_w;
708
809 if (!OPTION (Opt_scrollBar_right)) 709 if (!OPTION (Opt_scrollBar_right))
810 window_vt_x += sb_w; 710 window_vt_x += sb_w;
811 } 711 }
812 712
813 if (menubar_visible ())
814 {
815 mb_h = menuBar_TotalHeight ();
816 szHint.base_height += mb_h;
817 window_vt_y += mb_h;
818 }
819
820 szHint.width_inc = fwidth; 713 szHint.width_inc = fwidth;
821 szHint.height_inc = fheight; 714 szHint.height_inc = fheight;
822 szHint.min_width = szHint.base_width + szHint.width_inc; 715 szHint.min_width = szHint.base_width + szHint.width_inc;
823 szHint.min_height = szHint.base_height + szHint.height_inc; 716 szHint.min_height = szHint.base_height + szHint.height_inc;
824 717
825 if (newwidth && newwidth - szHint.base_width < max_width) 718 if (newwidth && newwidth - szHint.base_width < max_width)
826 { 719 {
827 szHint.width = newwidth; 720 szHint.width = newwidth;
… …
842 { 735 {
843 min_it (height, max_height); 736 min_it (height, max_height);
844 szHint.height = szHint.base_height + height; 737 szHint.height = szHint.base_height + height;
845 } 738 }
846 739
847 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 740 if (scrollBar.state && OPTION (Opt_scrollBar_right))
848 window_sb_x = szHint.width - sb_w; 741 window_sb_x = szHint.width - sb_w;
849 742
850 if (recalc_x) 743 if (recalc_x)
851 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 744 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
745
852 if (recalc_y) 746 if (recalc_y)
853 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 747 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
854 748
855 ncol = width / fwidth; 749 ncol = width / fwidth;
856 nrow = height / fheight; 750 nrow = height / fheight;
857 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
858 ncol, nrow, szHint.width,
859 szHint.height));
860 return;
861} 751}
862 752
863/*----------------------------------------------------------------------*/ 753/*----------------------------------------------------------------------*/
864/* 754/*
865 * Tell the teletype handler what size the window is. 755 * Tell the teletype handler what size the window is.
866 * Called after a window size change. 756 * Called after a window size change.
867 */ 757 */
868void 758void
869rxvt_term::tt_winch () 759rxvt_term::tt_winch ()
870{ 760{
871 if (pty.pty < 0) 761 if (pty->pty < 0)
872 return; 762 return;
873 763
874 struct winsize ws; 764 struct winsize ws;
875 765
876 ws.ws_col = ncol; 766 ws.ws_col = ncol;
877 ws.ws_row = nrow; 767 ws.ws_row = nrow;
878 ws.ws_xpixel = width; 768 ws.ws_xpixel = width;
879 ws.ws_ypixel = height; 769 ws.ws_ypixel = height;
880 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 770 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
881 771
882#if 0 772#if 0
883 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 773 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
884 if (cmd_pid) /* force through to the command */ 774 if (cmd_pid) /* force through to the command */
885 kill (-cmd_pid, SIGWINCH); 775 kill (-cmd_pid, SIGWINCH);
… …
921 prop.height += lineSpace; 811 prop.height += lineSpace;
922 fs->set_prop (prop); 812 fs->set_prop (prop);
923 813
924 fwidth = prop.width; 814 fwidth = prop.width;
925 fheight = prop.height; 815 fheight = prop.height;
926 fbase = (*fs)[1]->ascent; 816 fbase = prop.ascent;
927 817
928 for (int style = 1; style < 4; style++) 818 for (int style = 1; style < 4; style++)
929 { 819 {
930#if ENABLE_STYLES 820#if ENABLE_STYLES
931 const char *res = rs[Rs_font + style]; 821 const char *res = rs[Rs_font + style];
… …
965 return true; 855 return true;
966} 856}
967 857
968void 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)
969{ 859{
970 XChangeProperty (display->display, parent[0], 860 XChangeProperty (dpy, parent[0],
971 prop, XA_STRING, 8, PropModeReplace, 861 prop, XA_STRING, 8, PropModeReplace,
972 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 862 (const unsigned char *)str, len >= 0 ? len : strlen (str));
973} 863}
974 864
975void 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)
976{ 866{
977 wchar_t *ws = rxvt_mbstowcs (str, len); 867 wchar_t *ws = rxvt_mbstowcs (str, len);
978 char *s = rxvt_wcstoutf8 (ws); 868 char *s = rxvt_wcstoutf8 (ws);
979 869
980 XChangeProperty (display->display, parent[0], 870 XChangeProperty (dpy, parent[0],
981 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 871 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
982 (const unsigned char *)s, strlen (s)); 872 (const unsigned char *)s, strlen (s));
983 873
984 free (s); 874 free (s);
985 free (ws); 875 free (ws);
… …
1010void 900void
1011rxvt_term::set_window_color (int idx, const char *color) 901rxvt_term::set_window_color (int idx, const char *color)
1012{ 902{
1013 rxvt_color xcol; 903 rxvt_color xcol;
1014 int i; 904 int i;
1015 905
1016 if (color == NULL || *color == '\0') 906 if (color == NULL || *color == '\0')
1017 return; 907 return;
908
909 color = strdup (color);
910 allocated.push_back ((void *)color);
911 rs[Rs_color + idx] = color;
1018 912
1019 /* handle color aliases */ 913 /* handle color aliases */
1020 if (isdigit (*color)) 914 if (isdigit (*color))
1021 { 915 {
1022 i = atoi (color); 916 i = atoi (color);
1023 917
1024 if (i >= 8 && i <= 15) 918 if (i >= 8 && i <= 15)
1025 { /* bright colors */ 919 { /* bright colors */
1026 i -= 8; 920 i -= 8;
1027# ifndef NO_BRIGHTCOLOR
1028 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 921 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1029 SET_PIXCOLOR (idx);
1030 goto done; 922 goto done;
1031# endif
1032 } 923 }
1033 924
1034 if (i >= 0 && i <= 7) 925 if (i >= 0 && i <= 7)
1035 { /* normal colors */ 926 { /* normal colors */
1036 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 927 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1037 SET_PIXCOLOR (idx);
1038 goto done; 928 goto done;
1039 } 929 }
1040 } 930 }
1041 931
1042 if (!rXParseAllocColor (&xcol, color)) 932 set_color (xcol, color);
1043 return;
1044
1045 /* XStoreColor (display->display, display->cmap, XColor*); */
1046 933
1047 /* 934 /*
1048 * 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,
1049 * so just keep gobbling up the colormap 936 * so just keep gobbling up the colormap
1050 */ 937 */
1051# if 0
1052 for (i = Color_Black; i <= Color_White; i++)
1053 if (pix_colors[idx] == pix_colors[i])
1054 break;
1055 if (i > Color_White)
1056 {
1057 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1058 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1059 DisplayPlanes (display->display, display->screen));
1060 }
1061# endif
1062 938
1063 pix_colors_focused[idx] = xcol; 939 pix_colors_focused[idx] = xcol;
1064 SET_PIXCOLOR (idx);
1065 940
1066 /* XSetWindowAttributes attr; */ 941 /* XSetWindowAttributes attr; */
1067 /* Cursor cursor; */ 942 /* Cursor cursor; */
1068done: 943done:
1069
1070#if OFF_FOCUS_FADING
1071 if (rs[Rs_fade])
1072 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1073#endif
1074
1075 /*TODO: handle Color_BD, scrollbar background, etc. */ 944 /*TODO: handle Color_BD, scrollbar background, etc. */
1076 945
946 update_fade_color (idx);
1077 recolour_cursor (); 947 recolour_cursor ();
1078 scr_recolour (); 948 scr_recolour ();
1079} 949}
1080 950
1081#else 951#else
… …
1083#endif /* XTERM_COLOR_CHANGE */ 953#endif /* XTERM_COLOR_CHANGE */
1084 954
1085void 955void
1086rxvt_term::recolour_cursor () 956rxvt_term::recolour_cursor ()
1087{ 957{
1088 XColor xcol[2]; 958 XColor fg, bg;
1089 959
1090 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 960 (ISSET_PIXCOLOR (Color_pointer_fg)
1091 ? pix_colors_focused[Color_pointer_fg] 961 ? pix_colors_focused[Color_pointer_fg]
1092 : pix_colors_focused[Color_fg]; 962 : pix_colors_focused[Color_fg]).get (fg);
963
1093 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 964 (ISSET_PIXCOLOR (Color_pointer_bg)
1094 ? pix_colors_focused[Color_pointer_bg] 965 ? pix_colors_focused[Color_pointer_bg]
1095 : pix_colors_focused[Color_bg]; 966 : pix_colors_focused[Color_bg]).get (bg);
1096 967
1097 XQueryColors (display->display, display->cmap, xcol, 2); 968 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1098 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1099} 969}
1100 970
1101/*----------------------------------------------------------------------*/ 971/*----------------------------------------------------------------------*/
1102/* 972/*
1103 * 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
… …
1107{ 977{
1108 unsigned int i; 978 unsigned int i;
1109 const char *xpmb = "\0"; 979 const char *xpmb = "\0";
1110 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 980 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1111 981
1112 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1113 strcpy (fstr, "default"); 982 strcpy (fstr, "default");
1114 strcpy (bstr, "default"); 983 strcpy (bstr, "default");
1115 for (i = Color_Black; i <= Color_White; i++) 984 for (i = Color_Black; i <= Color_White; i++)
1116 if (pix_colors[Color_fg] == pix_colors[i]) 985 if (pix_colors[Color_fg] == pix_colors[i])
1117 { 986 {
… …
1132 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1001 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1133} 1002}
1134 1003
1135/*----------------------------------------------------------------------*/ 1004/*----------------------------------------------------------------------*/
1136 1005
1137int 1006bool
1138rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1007rxvt_term::set_color (rxvt_color &color, const char *name)
1139{ 1008{
1140 if (!screen_in_out->set (display, colour)) 1009 if (color.set (this, name))
1141 {
1142 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1143 return false;
1144 }
1145
1146 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]);
1147} 1020}
1148 1021
1149/* -------------------------------------------------------------------- * 1022/* -------------------------------------------------------------------- *
1150 * - WINDOW RESIZING - * 1023 * - WINDOW RESIZING - *
1151 * -------------------------------------------------------------------- */ 1024 * -------------------------------------------------------------------- */
1152void 1025void
1153rxvt_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)
1154{ 1027{
1155 int fix_screen; 1028 int fix_screen;
1156 int old_width = szHint.width, old_height = szHint.height; 1029 int old_width = szHint.width;
1157 dDisp; 1030 int old_height = szHint.height;
1158 1031
1159 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)))
1160 XSetWMNormalHints (disp, parent[0], &szHint); 1035 XSetWMNormalHints (dpy, parent[0], &szHint);
1161 1036
1162 if (!ignoreparent) 1037 if (!ignoreparent)
1163 { 1038 {
1164#ifdef SMART_RESIZE 1039#ifdef SMART_RESIZE
1165 /* 1040 /*
… …
1169 int x, y, x1, y1; 1044 int x, y, x1, y1;
1170 int dx, dy; 1045 int dx, dy;
1171 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1046 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1172 Window unused_cr; 1047 Window unused_cr;
1173 1048
1174 XTranslateCoordinates (disp, parent[0], display->root, 1049 XTranslateCoordinates (dpy, parent[0], display->root,
1175 0, 0, &x, &y, &unused_cr); 1050 0, 0, &x, &y, &unused_cr);
1176 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1051 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1177 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1052 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1178 /* 1053 /*
1179 * 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
1180 * our position for handles and decorations. Counter it 1055 * our position for handles and decorations. Counter it
1181 */ 1056 */
… …
1183 { 1058 {
1184 x -= x1; 1059 x -= x1;
1185 y -= y1; 1060 y -= y1;
1186 } 1061 }
1187 1062
1188 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1063 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1189 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1064 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1190 dx = old_width - szHint.width; 1065 dx = old_width - szHint.width;
1191 dy = old_height - szHint.height; 1066 dy = old_height - szHint.height;
1192 1067
1193 /* Check position of the center of the window */ 1068 /* Check position of the center of the window */
1194 if (x < x1) /* left half */ 1069 if (x < x1) /* left half */
1195 dx = 0; 1070 dx = 0;
… …
1198 if (y < y1) /* top half */ 1073 if (y < y1) /* top half */
1199 dy = 0; 1074 dy = 0;
1200 else if (y == y1) /* exact center */ 1075 else if (y == y1) /* exact center */
1201 dy /= 2; 1076 dy /= 2;
1202 1077
1203 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1078 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1204 szHint.width, szHint.height); 1079 szHint.width, szHint.height);
1205#else 1080#else
1206 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1081 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1207#endif 1082#endif
1208 } 1083 }
1209 1084
1210 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1085 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1211 1086
1212 if (fix_screen || newwidth != old_width || newheight != old_height) 1087 if (fix_screen || newwidth != old_width || newheight != old_height)
1213 { 1088 {
1214 if (scrollbar_visible ()) 1089 if (scrollBar.state)
1215 { 1090 {
1216 XMoveResizeWindow (disp, scrollBar.win, 1091 XMoveResizeWindow (dpy, scrollBar.win,
1217 window_sb_x, 0, 1092 window_sb_x, 0,
1218 scrollbar_TotalWidth (), szHint.height); 1093 scrollbar_TotalWidth (), szHint.height);
1219 resize_scrollbar (); 1094 resize_scrollbar ();
1220 } 1095 }
1221 1096
1222 if (menubar_visible ())
1223 XMoveResizeWindow (disp, menuBar.win,
1224 window_vt_x, 0,
1225 TermWin_TotalWidth (), menuBar_TotalHeight ());
1226
1227 XMoveResizeWindow (disp, vt, 1097 XMoveResizeWindow (dpy, vt,
1228 window_vt_x, window_vt_y, 1098 window_vt_x, window_vt_y,
1229 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1099 width, height);
1230 1100
1231 scr_clear (); 1101 scr_clear ();
1232#ifdef XPM_BACKGROUND 1102#ifdef XPM_BACKGROUND
1233 resize_pixmap (); 1103 resize_pixmap ();
1234#endif 1104#endif
1235 } 1105 }
1236 1106
1237 if (fix_screen || old_height == 0) 1107 if (fix_screen || old_height == 0)
1238 {
1239 int curr_screen = -1;
1240 int old_ncol = prev_ncol;
1241
1242 /* scr_reset only works on the primary screen */
1243 if (old_height) /* this is not the first time through */
1244 {
1245 unsigned int ocol = ncol;
1246 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1247 curr_screen = scr_change_screen (PRIMARY);
1248 ncol = ocol;
1249 }
1250
1251 scr_reset (); 1108 scr_reset ();
1252 1109
1253 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
1254 { 1111 //scr_touch (false);
1255 scr_change_screen (curr_screen);
1256 selection_check (old_ncol != ncol ? 4 : 0);
1257 }
1258 }
1259
1260 old_width = szHint.width;
1261 old_height = szHint.height;
1262 1112
1263#ifdef XPM_BACKGROUND 1113#ifdef XPM_BACKGROUND
1264 if (pixmap) 1114 if (pixmap)
1265 scr_touch (false); 1115 scr_touch (false);
1266#endif 1116#endif
1267 1117
1268#ifdef USE_XIM 1118#ifdef USE_XIM
1269 IMSetStatusPosition (); 1119 IMSetPosition ();
1270#endif 1120#endif
1271} 1121}
1272 1122
1273/* 1123/*
1274 * 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.
… …
1279{ 1129{
1280 XWindowAttributes wattr; 1130 XWindowAttributes wattr;
1281 1131
1282 if (newwidth == 0 || newheight == 0) 1132 if (newwidth == 0 || newheight == 0)
1283 { 1133 {
1284 XGetWindowAttributes (display->display, display->root, &wattr); 1134 XGetWindowAttributes (dpy, display->root, &wattr);
1285 1135
1286 if (newwidth == 0) 1136 if (newwidth == 0)
1287 newwidth = wattr.width - szHint.base_width; 1137 newwidth = wattr.width - szHint.base_width;
1288 if (newheight == 0) 1138 if (newheight == 0)
1289 newheight = wattr.height - szHint.base_height; 1139 newheight = wattr.height - szHint.base_height;
… …
1303#ifdef USE_XIM 1153#ifdef USE_XIM
1304 1154
1305void 1155void
1306rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1156rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1307{ 1157{
1308 fg = pix_colors[Color_fg]; 1158 fg = pix_colors [Color_fg];
1309 bg = pix_colors[Color_bg]; 1159 bg = pix_colors [Color_bg];
1310} 1160}
1311 1161
1312void 1162void
1313rxvt_term::im_set_size (XRectangle &size) 1163rxvt_term::im_set_size (XRectangle &size)
1314{ 1164{
… …
1351 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1201 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1352 1202
1353 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1203 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1354 *p = '\0'; 1204 *p = '\0';
1355 1205
1356 atom = XInternAtom (display->display, server, False); 1206 atom = XInternAtom (dpy, server, False);
1357 win = XGetSelectionOwner (display->display, atom); 1207 win = XGetSelectionOwner (dpy, atom);
1358 1208
1359 if (win != None) 1209 if (win != None)
1360 return True; 1210 return True;
1361 } 1211 }
1362 1212
… …
1369 XPoint nspot; 1219 XPoint nspot;
1370 XVaNestedList preedit_attr; 1220 XVaNestedList preedit_attr;
1371 1221
1372 if (!Input_Context 1222 if (!Input_Context
1373 || !focus 1223 || !focus
1374 || !(input_style & XIMPreeditPosition)) 1224 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1375 return; 1225 return;
1376 1226
1377 im_set_position (nspot); 1227 im_set_position (nspot);
1378 1228
1379 if (nspot.x == spot.x && nspot.y == spot.y) 1229 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1398 input_method = 0; 1248 input_method = 0;
1399 } 1249 }
1400 1250
1401 Input_Context = 0; 1251 Input_Context = 0;
1402} 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
1403 1327
1404/* 1328/*
1405 * 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
1406 * open a suitable preedit type 1330 * open a suitable preedit type
1407 */ 1331 */
… …
1414 XRectangle rect, status_rect, needed_rect; 1338 XRectangle rect, status_rect, needed_rect;
1415 unsigned long fg, bg; 1339 unsigned long fg, bg;
1416 const char *p; 1340 const char *p;
1417 char **s; 1341 char **s;
1418 XIMStyles *xim_styles; 1342 XIMStyles *xim_styles;
1343#ifdef ENABLE_XIM_ONTHESPOT
1344 XIMCallback xcb[4];
1345#endif
1346
1347 set_environ (envv);
1419 1348
1420 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1349 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1421 return false; 1350 return false;
1422 1351
1423 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1424 input_method = display->get_xim (locale, modifiers); 1352 input_method = display->get_xim (locale, modifiers);
1425 if (input_method == NULL) 1353 if (input_method == NULL)
1426 return false; 1354 return false;
1427 1355
1428 xim = input_method->xim; 1356 xim = input_method->xim;
… …
1448 s = rxvt_splitcommastring (p); 1376 s = rxvt_splitcommastring (p);
1449 1377
1450 for (i = found = 0; !found && s[i]; i++) 1378 for (i = found = 0; !found && s[i]; i++)
1451 { 1379 {
1452 if (!strcmp (s[i], "OverTheSpot")) 1380 if (!strcmp (s[i], "OverTheSpot"))
1453 input_style = (XIMPreeditPosition | XIMStatusNothing); 1381 input_style = XIMPreeditPosition | XIMStatusNothing;
1454 else if (!strcmp (s[i], "OffTheSpot")) 1382 else if (!strcmp (s[i], "OffTheSpot"))
1455 input_style = (XIMPreeditArea | XIMStatusArea); 1383 input_style = XIMPreeditArea | XIMStatusArea;
1456 else if (!strcmp (s[i], "Root")) 1384 else if (!strcmp (s[i], "Root"))
1457 input_style = (XIMPreeditNothing | XIMStatusNothing); 1385 input_style = XIMPreeditNothing | XIMStatusNothing;
1458 else if (!strcmp (s[i], "None")) 1386 else if (!strcmp (s[i], "None"))
1459 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;
1460 1394
1461 for (j = 0; j < xim_styles->count_styles; j++) 1395 for (j = 0; j < xim_styles->count_styles; j++)
1462 if (input_style == xim_styles->supported_styles[j]) 1396 if (input_style == xim_styles->supported_styles[j])
1463 { 1397 {
1464 rxvt_freecommastring (s); 1398 rxvt_freecommastring (s);
… …
1502 "*", 1436 "*",
1503 fheight, 1437 fheight,
1504 fheight + 1, fheight - 1, 1438 fheight + 1, fheight - 1,
1505 fheight - 2, fheight + 2); 1439 fheight - 2, fheight + 2);
1506 1440
1507 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1441 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1508 &missing_charset_list, &missing_charset_count, &def_string); 1442 &missing_charset_list, &missing_charset_count, &def_string);
1509 1443
1510 if (missing_charset_list) 1444 if (missing_charset_list)
1511 XFreeStringList (missing_charset_list); 1445 XFreeStringList (missing_charset_list);
1512 1446
… …
1553 XNBackground, bg, 1487 XNBackground, bg,
1554 XNArea, &status_rect, 1488 XNArea, &status_rect,
1555 XNFontSet, fs, 1489 XNFontSet, fs,
1556 NULL); 1490 NULL);
1557 } 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
1558 1515
1559 Input_Context = XCreateIC (xim, 1516 Input_Context = XCreateIC (xim,
1560 XNInputStyle, input_style, 1517 XNInputStyle, input_style,
1561 XNClientWindow, vt, 1518 XNClientWindow, vt,
1562 XNFocusWindow, parent[0], 1519 XNFocusWindow, parent[0],
… …
1564 preedit_attr, 1521 preedit_attr,
1565 status_attr ? XNStatusAttributes : NULL, 1522 status_attr ? XNStatusAttributes : NULL,
1566 status_attr, NULL); 1523 status_attr, NULL);
1567 1524
1568 if (preedit_attr) XFree (preedit_attr); 1525 if (preedit_attr) XFree (preedit_attr);
1569 if (status_attr) XFree (status_attr); 1526 if (status_attr) XFree (status_attr);
1570 if (fs) XFreeFontSet (display->display, fs); 1527 if (fs) XFreeFontSet (dpy, fs);
1571 1528
1572 if (Input_Context == NULL) 1529 if (Input_Context == NULL)
1573 { 1530 {
1574 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1531 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1575 im_destroy (); 1532 im_destroy ();
1576 return false; 1533 return false;
1577 } 1534 }
1578 1535
1579 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
1580 IMSetStatusPosition (); 1542 IMSetPosition ();
1581 1543
1582 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1583 return true; 1544 return true;
1584} 1545}
1585 1546
1586void 1547void
1587rxvt_term::im_cb () 1548rxvt_term::im_cb ()
… …
1589 int i; 1550 int i;
1590 const char *p; 1551 const char *p;
1591 char **s; 1552 char **s;
1592 char buf[IMBUFSIZ]; 1553 char buf[IMBUFSIZ];
1593 1554
1594 SET_R (this); 1555 make_current ();
1595 1556
1596 im_destroy (); 1557 im_destroy ();
1597 1558
1598 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1599 if (Input_Context) 1559 if (Input_Context)
1600 return; 1560 return;
1601 1561
1602#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1562#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1603 if (rs[Rs_imLocale]) 1563 if (rs[Rs_imLocale])
… …
1645 SET_LOCALE (locale); 1605 SET_LOCALE (locale);
1646#endif 1606#endif
1647} 1607}
1648 1608
1649void 1609void
1650rxvt_term::IMSetStatusPosition () 1610rxvt_term::IMSetPosition ()
1651{ 1611{
1652 XRectangle preedit_rect, status_rect, *needed_rect; 1612 XRectangle preedit_rect, status_rect, *needed_rect;
1653 XVaNestedList preedit_attr, status_attr; 1613 XVaNestedList preedit_attr, status_attr;
1654 1614
1655 if (!Input_Context 1615 if (!Input_Context
1656 || !focus 1616 || !focus
1657 || !(input_style & XIMPreeditArea) 1617 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1658 || !IMisRunning ()) 1618 || !IMisRunning ())
1659 return; 1619 return;
1660 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 {
1661 /* Getting the necessary width of preedit area */ 1631 /* Getting the necessary width of preedit area */
1662 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1632 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1663 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1633 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1664 XFree (status_attr); 1634 XFree (status_attr);
1665 1635
1666 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1636 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1667 XFree (needed_rect); 1637 XFree (needed_rect);
1668 1638
1669 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1639 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1670 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1640 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1671 1641
1672 XSetICValues (Input_Context, 1642 XSetICValues (Input_Context,
1673 XNPreeditAttributes, preedit_attr, 1643 XNPreeditAttributes, preedit_attr,
1674 XNStatusAttributes, status_attr, NULL); 1644 XNStatusAttributes, status_attr,
1645 NULL);
1675 1646
1647 XFree (status_attr);
1648 }
1649
1676 XFree (preedit_attr); 1650 XFree (preedit_attr);
1677 XFree (status_attr);
1678} 1651}
1679#endif /* USE_XIM */ 1652#endif /* USE_XIM */
1680 1653
1681/*----------------------------------------------------------------------*/
1682rxvt_t rxvt_current_term;
1683
1684/*----------------------- end-of-file (C source) -----------------------*/ 1654/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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