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

Diff Legend

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