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.152 by root, Thu Dec 22 16:44:10 2005 UTC vs.
Revision 1.224 by root, Mon Feb 20 22:42:00 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
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 // TODO: SMART_WINDOW_TITLE
950 XChangeProperty (display->display, parent[0], 857 XChangeProperty (dpy, parent[0],
951 prop, XA_STRING, 8, PropModeReplace, 858 prop, XA_STRING, 8, PropModeReplace,
952 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 859 (const unsigned char *)str, len >= 0 ? len : strlen (str));
953} 860}
954 861
955void 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)
956{ 863{
957 // TODO: SMART_WINDOW_TITLE
958 wchar_t *ws = rxvt_mbstowcs (str, len); 864 wchar_t *ws = rxvt_mbstowcs (str, len);
959 char *s = rxvt_wcstoutf8 (ws); 865 char *s = rxvt_wcstoutf8 (ws);
960 866
961 XChangeProperty (display->display, parent[0], 867 XChangeProperty (dpy, parent[0],
962 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 868 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
963 (const unsigned char *)s, strlen (s)); 869 (const unsigned char *)s, strlen (s));
964 870
965 free (s); 871 free (s);
966 free (ws); 872 free (ws);
… …
991void 897void
992rxvt_term::set_window_color (int idx, const char *color) 898rxvt_term::set_window_color (int idx, const char *color)
993{ 899{
994 rxvt_color xcol; 900 rxvt_color xcol;
995 int i; 901 int i;
996 902
997 if (color == NULL || *color == '\0') 903 if (color == NULL || *color == '\0')
998 return; 904 return;
905
906 color = strdup (color);
907 allocated.push_back ((void *)color);
908 rs[Rs_color + idx] = color;
999 909
1000 /* handle color aliases */ 910 /* handle color aliases */
1001 if (isdigit (*color)) 911 if (isdigit (*color))
1002 { 912 {
1003 i = atoi (color); 913 i = atoi (color);
1004 914
1005 if (i >= 8 && i <= 15) 915 if (i >= 8 && i <= 15)
1006 { /* bright colors */ 916 { /* bright colors */
1007 i -= 8; 917 i -= 8;
1008# ifndef NO_BRIGHTCOLOR
1009 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1010 SET_PIXCOLOR (idx);
1011 goto done; 919 goto done;
1012# endif
1013 } 920 }
1014 921
1015 if (i >= 0 && i <= 7) 922 if (i >= 0 && i <= 7)
1016 { /* normal colors */ 923 { /* normal colors */
1017 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 924 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1018 SET_PIXCOLOR (idx);
1019 goto done; 925 goto done;
1020 } 926 }
1021 } 927 }
1022 928
1023 if (!rXParseAllocColor (&xcol, color)) 929 set_color (xcol, color);
1024 return;
1025
1026 /* XStoreColor (display->display, display->cmap, XColor*); */
1027 930
1028 /* 931 /*
1029 * 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,
1030 * so just keep gobbling up the colormap 933 * so just keep gobbling up the colormap
1031 */ 934 */
1032# if 0
1033 for (i = Color_Black; i <= Color_White; i++)
1034 if (pix_colors[idx] == pix_colors[i])
1035 break;
1036 if (i > Color_White)
1037 {
1038 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1039 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1040 DisplayPlanes (display->display, display->screen));
1041 }
1042# endif
1043 935
1044 pix_colors_focused[idx] = xcol; 936 pix_colors_focused[idx] = xcol;
1045 SET_PIXCOLOR (idx);
1046 937
1047 /* XSetWindowAttributes attr; */ 938 /* XSetWindowAttributes attr; */
1048 /* Cursor cursor; */ 939 /* Cursor cursor; */
1049done: 940done:
1050 941
1051#if OFF_FOCUS_FADING 942#if OFF_FOCUS_FADING
1052 if (rs[Rs_fade]) 943 if (rs[Rs_fade])
1053 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 944 {
945 rgba c;
946 pix_colors [Color_fade].get (c);
947 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
948 }
1054#endif 949#endif
1055 950
1056 /*TODO: handle Color_BD, scrollbar background, etc. */ 951 /*TODO: handle Color_BD, scrollbar background, etc. */
1057 952
1058 recolour_cursor (); 953 recolour_cursor ();
… …
1064#endif /* XTERM_COLOR_CHANGE */ 959#endif /* XTERM_COLOR_CHANGE */
1065 960
1066void 961void
1067rxvt_term::recolour_cursor () 962rxvt_term::recolour_cursor ()
1068{ 963{
1069 XColor xcol[2]; 964 XColor fg, bg;
1070 965
1071 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 966 (ISSET_PIXCOLOR (Color_pointer_fg)
1072 ? pix_colors_focused[Color_pointer_fg] 967 ? pix_colors_focused[Color_pointer_fg]
1073 : pix_colors_focused[Color_fg]; 968 : pix_colors_focused[Color_fg]).get (fg);
969
1074 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 970 (ISSET_PIXCOLOR (Color_pointer_bg)
1075 ? pix_colors_focused[Color_pointer_bg] 971 ? pix_colors_focused[Color_pointer_bg]
1076 : pix_colors_focused[Color_bg]; 972 : pix_colors_focused[Color_bg]).get (bg);
1077 973
1078 XQueryColors (display->display, display->cmap, xcol, 2); 974 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1079 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1080} 975}
1081 976
1082/*----------------------------------------------------------------------*/ 977/*----------------------------------------------------------------------*/
1083/* 978/*
1084 * find if fg/bg matches any of the normal (low-intensity) colors 979 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1088{ 983{
1089 unsigned int i; 984 unsigned int i;
1090 const char *xpmb = "\0"; 985 const char *xpmb = "\0";
1091 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 986 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1092 987
1093 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1094 strcpy (fstr, "default"); 988 strcpy (fstr, "default");
1095 strcpy (bstr, "default"); 989 strcpy (bstr, "default");
1096 for (i = Color_Black; i <= Color_White; i++) 990 for (i = Color_Black; i <= Color_White; i++)
1097 if (pix_colors[Color_fg] == pix_colors[i]) 991 if (pix_colors[Color_fg] == pix_colors[i])
1098 { 992 {
… …
1113 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1007 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1114} 1008}
1115 1009
1116/*----------------------------------------------------------------------*/ 1010/*----------------------------------------------------------------------*/
1117 1011
1118int 1012bool
1119rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1013rxvt_term::set_color (rxvt_color &color, const char *name)
1120{ 1014{
1121 if (!screen_in_out->set (display, colour)) 1015 if (color.set (this, name))
1122 {
1123 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1124 return false;
1125 }
1126
1127 return true; 1016 return true;
1017
1018 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1019 return false;
1020}
1021
1022void
1023rxvt_term::alias_color (int dst, int src)
1024{
1025 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1128} 1026}
1129 1027
1130/* -------------------------------------------------------------------- * 1028/* -------------------------------------------------------------------- *
1131 * - WINDOW RESIZING - * 1029 * - WINDOW RESIZING - *
1132 * -------------------------------------------------------------------- */ 1030 * -------------------------------------------------------------------- */
1133void 1031void
1134rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1032rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1135{ 1033{
1136 int fix_screen; 1034 int fix_screen;
1137 int old_width = szHint.width, old_height = szHint.height; 1035 int old_width = szHint.width;
1138 dDisp; 1036 int old_height = szHint.height;
1139 1037
1140 window_calc (newwidth, newheight); 1038 window_calc (newwidth, newheight);
1039
1040 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1141 XSetWMNormalHints (disp, parent[0], &szHint); 1041 XSetWMNormalHints (dpy, parent[0], &szHint);
1142 1042
1143 if (!ignoreparent) 1043 if (!ignoreparent)
1144 { 1044 {
1145#ifdef SMART_RESIZE 1045#ifdef SMART_RESIZE
1146 /* 1046 /*
… …
1150 int x, y, x1, y1; 1050 int x, y, x1, y1;
1151 int dx, dy; 1051 int dx, dy;
1152 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1052 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1153 Window unused_cr; 1053 Window unused_cr;
1154 1054
1155 XTranslateCoordinates (disp, parent[0], display->root, 1055 XTranslateCoordinates (dpy, parent[0], display->root,
1156 0, 0, &x, &y, &unused_cr); 1056 0, 0, &x, &y, &unused_cr);
1157 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1057 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1158 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1058 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1159 /* 1059 /*
1160 * if display->root isn't the parent window, a WM will probably have offset 1060 * if display->root isn't the parent window, a WM will probably have offset
1161 * our position for handles and decorations. Counter it 1061 * our position for handles and decorations. Counter it
1162 */ 1062 */
… …
1164 { 1064 {
1165 x -= x1; 1065 x -= x1;
1166 y -= y1; 1066 y -= y1;
1167 } 1067 }
1168 1068
1169 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1069 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1170 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1070 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1171 dx = old_width - szHint.width; 1071 dx = old_width - szHint.width;
1172 dy = old_height - szHint.height; 1072 dy = old_height - szHint.height;
1173 1073
1174 /* Check position of the center of the window */ 1074 /* Check position of the center of the window */
1175 if (x < x1) /* left half */ 1075 if (x < x1) /* left half */
1176 dx = 0; 1076 dx = 0;
… …
1179 if (y < y1) /* top half */ 1079 if (y < y1) /* top half */
1180 dy = 0; 1080 dy = 0;
1181 else if (y == y1) /* exact center */ 1081 else if (y == y1) /* exact center */
1182 dy /= 2; 1082 dy /= 2;
1183 1083
1184 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1084 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1185 szHint.width, szHint.height); 1085 szHint.width, szHint.height);
1186#else 1086#else
1187 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1087 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1188#endif 1088#endif
1189 } 1089 }
1190 1090
1191 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1091 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1192 1092
1193 if (fix_screen || newwidth != old_width || newheight != old_height) 1093 if (fix_screen || newwidth != old_width || newheight != old_height)
1194 { 1094 {
1195 if (scrollbar_visible ()) 1095 if (scrollBar.state)
1196 { 1096 {
1197 XMoveResizeWindow (disp, scrollBar.win, 1097 XMoveResizeWindow (dpy, scrollBar.win,
1198 window_sb_x, 0, 1098 window_sb_x, 0,
1199 scrollbar_TotalWidth (), szHint.height); 1099 scrollbar_TotalWidth (), szHint.height);
1200 resize_scrollbar (); 1100 resize_scrollbar ();
1201 } 1101 }
1202 1102
1203 if (menubar_visible ())
1204 XMoveResizeWindow (disp, menuBar.win,
1205 window_vt_x, 0,
1206 TermWin_TotalWidth (), menuBar_TotalHeight ());
1207
1208 XMoveResizeWindow (disp, vt, 1103 XMoveResizeWindow (dpy, vt,
1209 window_vt_x, window_vt_y, 1104 window_vt_x, window_vt_y,
1210 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1105 width, height);
1211 1106
1212 scr_clear (); 1107 scr_clear ();
1213#ifdef XPM_BACKGROUND 1108#ifdef XPM_BACKGROUND
1214 resize_pixmap (); 1109 resize_pixmap ();
1215#endif 1110#endif
1216 } 1111 }
1217 1112
1218 if (fix_screen || old_height == 0) 1113 if (fix_screen || old_height == 0)
1219 {
1220 int curr_screen = -1;
1221 int old_ncol = prev_ncol;
1222
1223 /* scr_reset only works on the primary screen */
1224 if (old_height) /* this is not the first time through */
1225 {
1226 unsigned int ocol = ncol;
1227 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1228 curr_screen = scr_change_screen (PRIMARY);
1229 ncol = ocol;
1230 }
1231
1232 scr_reset (); 1114 scr_reset ();
1233 1115
1234 if (curr_screen >= 0) /* this is not the first time through */ 1116 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1235 { 1117 //scr_touch (false);
1236 scr_change_screen (curr_screen);
1237 selection_check (old_ncol != ncol ? 4 : 0);
1238 }
1239 }
1240
1241 old_width = szHint.width;
1242 old_height = szHint.height;
1243 1118
1244#ifdef XPM_BACKGROUND 1119#ifdef XPM_BACKGROUND
1245 if (pixmap) 1120 if (pixmap)
1246 scr_touch (false); 1121 scr_touch (false);
1247#endif 1122#endif
1248 1123
1249#ifdef USE_XIM 1124#ifdef USE_XIM
1250 IMSetStatusPosition (); 1125 IMSetPosition ();
1251#endif 1126#endif
1252} 1127}
1253 1128
1254/* 1129/*
1255 * Set the width/height of the vt window in characters. Units are pixels. 1130 * Set the width/height of the vt window in characters. Units are pixels.
… …
1260{ 1135{
1261 XWindowAttributes wattr; 1136 XWindowAttributes wattr;
1262 1137
1263 if (newwidth == 0 || newheight == 0) 1138 if (newwidth == 0 || newheight == 0)
1264 { 1139 {
1265 XGetWindowAttributes (display->display, display->root, &wattr); 1140 XGetWindowAttributes (dpy, display->root, &wattr);
1266 1141
1267 if (newwidth == 0) 1142 if (newwidth == 0)
1268 newwidth = wattr.width - szHint.base_width; 1143 newwidth = wattr.width - szHint.base_width;
1269 if (newheight == 0) 1144 if (newheight == 0)
1270 newheight = wattr.height - szHint.base_height; 1145 newheight = wattr.height - szHint.base_height;
… …
1284#ifdef USE_XIM 1159#ifdef USE_XIM
1285 1160
1286void 1161void
1287rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1162rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1288{ 1163{
1289 fg = pix_colors[Color_fg]; 1164 fg = pix_colors [Color_fg];
1290 bg = pix_colors[Color_bg]; 1165 bg = pix_colors [Color_bg];
1291} 1166}
1292 1167
1293void 1168void
1294rxvt_term::im_set_size (XRectangle &size) 1169rxvt_term::im_set_size (XRectangle &size)
1295{ 1170{
… …
1332 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1207 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1333 1208
1334 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1209 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1335 *p = '\0'; 1210 *p = '\0';
1336 1211
1337 atom = XInternAtom (display->display, server, False); 1212 atom = XInternAtom (dpy, server, False);
1338 win = XGetSelectionOwner (display->display, atom); 1213 win = XGetSelectionOwner (dpy, atom);
1339 1214
1340 if (win != None) 1215 if (win != None)
1341 return True; 1216 return True;
1342 } 1217 }
1343 1218
… …
1350 XPoint nspot; 1225 XPoint nspot;
1351 XVaNestedList preedit_attr; 1226 XVaNestedList preedit_attr;
1352 1227
1353 if (!Input_Context 1228 if (!Input_Context
1354 || !focus 1229 || !focus
1355 || !(input_style & XIMPreeditPosition)) 1230 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1356 return; 1231 return;
1357 1232
1358 im_set_position (nspot); 1233 im_set_position (nspot);
1359 1234
1360 if (nspot.x == spot.x && nspot.y == spot.y) 1235 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1379 input_method = 0; 1254 input_method = 0;
1380 } 1255 }
1381 1256
1382 Input_Context = 0; 1257 Input_Context = 0;
1383} 1258}
1259
1260#ifdef ENABLE_XIM_ONTHESPOT
1261
1262static void
1263xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1264{
1265 ((rxvt_term *)client_data)->make_current ();
1266 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1267}
1268
1269static void
1270xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1271{
1272 ((rxvt_term *)client_data)->make_current ();
1273 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1274}
1275
1276static void
1277xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1278{
1279 rxvt_term *term = (rxvt_term *)client_data;
1280 XIMText *text = call_data->text;
1281
1282 term->make_current ();
1283
1284 if (text)
1285 {
1286 void *str;
1287
1288 if (!text->encoding_is_wchar && text->string.multi_byte)
1289 {
1290 // of course, X makes it ugly again
1291 if (term->rs[Rs_imLocale])
1292 SET_LOCALE (term->rs[Rs_imLocale]);
1293
1294 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1295 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1296
1297 if (term->rs[Rs_imLocale])
1298 SET_LOCALE (term->locale);
1299 }
1300 else
1301 str = (void *)text->string.wide_char;
1302
1303 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1304 DT_INT, call_data->caret,
1305 DT_INT, call_data->chg_first,
1306 DT_INT, call_data->chg_length,
1307 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1308 DT_WCS_LEN, str, str ? (int)text->length : 0,
1309 DT_END));
1310 }
1311 else
1312 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1313 DT_INT, call_data->caret,
1314 DT_INT, call_data->chg_first,
1315 DT_INT, call_data->chg_length,
1316 DT_END));
1317}
1318
1319#if 0
1320static void
1321xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1322{
1323 ((rxvt_term *)client_data)->make_current ();
1324 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1325 DT_INT, call_data->position,
1326 DT_INT, call_data->direction,
1327 DT_INT, call_data->style,
1328 DT_END));
1329}
1330#endif
1331
1332#endif
1384 1333
1385/* 1334/*
1386 * Try to open a XIM with the current modifiers, then see if we can 1335 * Try to open a XIM with the current modifiers, then see if we can
1387 * open a suitable preedit type 1336 * open a suitable preedit type
1388 */ 1337 */
… …
1395 XRectangle rect, status_rect, needed_rect; 1344 XRectangle rect, status_rect, needed_rect;
1396 unsigned long fg, bg; 1345 unsigned long fg, bg;
1397 const char *p; 1346 const char *p;
1398 char **s; 1347 char **s;
1399 XIMStyles *xim_styles; 1348 XIMStyles *xim_styles;
1349#ifdef ENABLE_XIM_ONTHESPOT
1350 XIMCallback xcb[4];
1351#endif
1352
1353 set_environ (envv);
1400 1354
1401 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1355 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1402 return false; 1356 return false;
1403 1357
1404 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1405 input_method = display->get_xim (locale, modifiers); 1358 input_method = display->get_xim (locale, modifiers);
1406 if (input_method == NULL) 1359 if (input_method == NULL)
1407 return false; 1360 return false;
1408 1361
1409 xim = input_method->xim; 1362 xim = input_method->xim;
… …
1429 s = rxvt_splitcommastring (p); 1382 s = rxvt_splitcommastring (p);
1430 1383
1431 for (i = found = 0; !found && s[i]; i++) 1384 for (i = found = 0; !found && s[i]; i++)
1432 { 1385 {
1433 if (!strcmp (s[i], "OverTheSpot")) 1386 if (!strcmp (s[i], "OverTheSpot"))
1434 input_style = (XIMPreeditPosition | XIMStatusNothing); 1387 input_style = XIMPreeditPosition | XIMStatusNothing;
1435 else if (!strcmp (s[i], "OffTheSpot")) 1388 else if (!strcmp (s[i], "OffTheSpot"))
1436 input_style = (XIMPreeditArea | XIMStatusArea); 1389 input_style = XIMPreeditArea | XIMStatusArea;
1437 else if (!strcmp (s[i], "Root")) 1390 else if (!strcmp (s[i], "Root"))
1438 input_style = (XIMPreeditNothing | XIMStatusNothing); 1391 input_style = XIMPreeditNothing | XIMStatusNothing;
1439 else if (!strcmp (s[i], "None")) 1392 else if (!strcmp (s[i], "None"))
1440 input_style = (XIMPreeditNone | XIMStatusNone); 1393 input_style = XIMPreeditNone | XIMStatusNone;
1394#ifdef ENABLE_XIM_ONTHESPOT
1395 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1396 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1397#endif
1398 else
1399 input_style = XIMPreeditNothing | XIMStatusNothing;
1441 1400
1442 for (j = 0; j < xim_styles->count_styles; j++) 1401 for (j = 0; j < xim_styles->count_styles; j++)
1443 if (input_style == xim_styles->supported_styles[j]) 1402 if (input_style == xim_styles->supported_styles[j])
1444 { 1403 {
1445 rxvt_freecommastring (s); 1404 rxvt_freecommastring (s);
… …
1483 "*", 1442 "*",
1484 fheight, 1443 fheight,
1485 fheight + 1, fheight - 1, 1444 fheight + 1, fheight - 1,
1486 fheight - 2, fheight + 2); 1445 fheight - 2, fheight + 2);
1487 1446
1488 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1447 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1489 &missing_charset_list, &missing_charset_count, &def_string); 1448 &missing_charset_list, &missing_charset_count, &def_string);
1490 1449
1491 if (missing_charset_list) 1450 if (missing_charset_list)
1492 XFreeStringList (missing_charset_list); 1451 XFreeStringList (missing_charset_list);
1493 1452
… …
1534 XNBackground, bg, 1493 XNBackground, bg,
1535 XNArea, &status_rect, 1494 XNArea, &status_rect,
1536 XNFontSet, fs, 1495 XNFontSet, fs,
1537 NULL); 1496 NULL);
1538 } 1497 }
1498#if ENABLE_XIM_ONTHESPOT
1499 else if (input_style & XIMPreeditCallbacks)
1500 {
1501 im_set_position (spot);
1502
1503 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1504 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1505 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1506# if 0
1507 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1508# endif
1509
1510 preedit_attr = XVaCreateNestedList (0,
1511 XNSpotLocation, &spot,
1512 XNPreeditStartCallback, &xcb[0],
1513 XNPreeditDoneCallback , &xcb[1],
1514 XNPreeditDrawCallback , &xcb[2],
1515# if 0
1516 XNPreeditCaretCallback, &xcb[3],
1517# endif
1518 NULL);
1519 }
1520#endif
1539 1521
1540 Input_Context = XCreateIC (xim, 1522 Input_Context = XCreateIC (xim,
1541 XNInputStyle, input_style, 1523 XNInputStyle, input_style,
1542 XNClientWindow, vt, 1524 XNClientWindow, vt,
1543 XNFocusWindow, parent[0], 1525 XNFocusWindow, parent[0],
… …
1545 preedit_attr, 1527 preedit_attr,
1546 status_attr ? XNStatusAttributes : NULL, 1528 status_attr ? XNStatusAttributes : NULL,
1547 status_attr, NULL); 1529 status_attr, NULL);
1548 1530
1549 if (preedit_attr) XFree (preedit_attr); 1531 if (preedit_attr) XFree (preedit_attr);
1550 if (status_attr) XFree (status_attr); 1532 if (status_attr) XFree (status_attr);
1551 if (fs) XFreeFontSet (display->display, fs); 1533 if (fs) XFreeFontSet (dpy, fs);
1552 1534
1553 if (Input_Context == NULL) 1535 if (Input_Context == NULL)
1554 { 1536 {
1555 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1537 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1556 im_destroy (); 1538 im_destroy ();
1557 return false; 1539 return false;
1558 } 1540 }
1559 1541
1560 if (input_style & XIMPreeditArea) 1542#if 0
1543 // unfortunately, only the focus window is used by XIM, hard to fix
1544 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1545 vt_select_input ();
1546#endif
1547
1561 IMSetStatusPosition (); 1548 IMSetPosition ();
1562 1549
1563 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1564 return true; 1550 return true;
1565} 1551}
1566 1552
1567void 1553void
1568rxvt_term::im_cb () 1554rxvt_term::im_cb ()
… …
1570 int i; 1556 int i;
1571 const char *p; 1557 const char *p;
1572 char **s; 1558 char **s;
1573 char buf[IMBUFSIZ]; 1559 char buf[IMBUFSIZ];
1574 1560
1575 SET_R (this); 1561 make_current ();
1576 1562
1577 im_destroy (); 1563 im_destroy ();
1578 1564
1579 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1580 if (Input_Context) 1565 if (Input_Context)
1581 return; 1566 return;
1582 1567
1583#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1568#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1584 if (rs[Rs_imLocale]) 1569 if (rs[Rs_imLocale])
… …
1626 SET_LOCALE (locale); 1611 SET_LOCALE (locale);
1627#endif 1612#endif
1628} 1613}
1629 1614
1630void 1615void
1631rxvt_term::IMSetStatusPosition () 1616rxvt_term::IMSetPosition ()
1632{ 1617{
1633 XRectangle preedit_rect, status_rect, *needed_rect; 1618 XRectangle preedit_rect, status_rect, *needed_rect;
1634 XVaNestedList preedit_attr, status_attr; 1619 XVaNestedList preedit_attr, status_attr;
1635 1620
1636 if (!Input_Context 1621 if (!Input_Context
1637 || !focus 1622 || !focus
1638 || !(input_style & XIMPreeditArea) 1623 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1639 || !IMisRunning ()) 1624 || !IMisRunning ())
1640 return; 1625 return;
1641 1626
1627 if (input_style & XIMPreeditPosition)
1628 {
1629 im_set_size (preedit_rect);
1630 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631
1632 XSetICValues (Input_Context,
1633 XNPreeditAttributes, preedit_attr, NULL);
1634 }
1635 else
1636 {
1642 /* Getting the necessary width of preedit area */ 1637 /* Getting the necessary width of preedit area */
1643 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1638 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1644 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1639 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1645 XFree (status_attr); 1640 XFree (status_attr);
1646 1641
1647 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1642 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1648 XFree (needed_rect); 1643 XFree (needed_rect);
1649 1644
1650 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1645 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1651 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1646 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1652 1647
1653 XSetICValues (Input_Context, 1648 XSetICValues (Input_Context,
1654 XNPreeditAttributes, preedit_attr, 1649 XNPreeditAttributes, preedit_attr,
1655 XNStatusAttributes, status_attr, NULL); 1650 XNStatusAttributes, status_attr,
1651 NULL);
1656 1652
1653 XFree (status_attr);
1654 }
1655
1657 XFree (preedit_attr); 1656 XFree (preedit_attr);
1658 XFree (status_attr);
1659} 1657}
1660#endif /* USE_XIM */ 1658#endif /* USE_XIM */
1661 1659
1662/*----------------------------------------------------------------------*/
1663rxvt_t rxvt_current_term;
1664
1665/*----------------------- end-of-file (C source) -----------------------*/ 1660/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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