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.153 by root, Tue Dec 27 12:23:37 2005 UTC vs.
Revision 1.225 by root, Wed Jul 5 22:46:14 2006 UTC

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

Diff Legend

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