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

Diff Legend

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