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.149 by root, Sun Dec 18 00:59:42 2005 UTC vs.
Revision 1.244 by sasha, Fri Aug 17 22:01:32 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 * TODO: this does not work for some reason when transparency is disabled !!!!
550 */
551 if (!bgPixmap.window_size_sensitive ())
552 update_background();
553#endif
554 }
555#endif
556
557#if ENABLE_PERL
558 rootwin_ev.start (display, display->root);
559#endif
498 560
499 set_colorfgbg (); 561 set_colorfgbg ();
500 562
501 init_command (cmd_argv); 563 init_command (cmd_argv);
502 564
503 free (cmd_argv); 565 free (cmd_argv);
504 566
567 if (pty->pty >= 0)
505 pty_ev.start (pty.pty, EVENT_READ); 568 pty_ev.start (pty->pty, EVENT_READ);
506 569
507 check_ev.start (); 570 check_ev.start ();
508 571
572 HOOK_INVOKE ((this, HOOK_START, DT_END));
573
574#if ENABLE_XEMBED
575 if (rs[Rs_embed])
576 {
577 long info[2] = { 0, XEMBED_MAPPED };
578
579 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
580 32, PropModeReplace, (unsigned char *)&info, 2);
581 }
582#endif
583
584 XMapWindow (dpy, vt);
585 XMapWindow (dpy, parent[0]);
586
509 return true; 587 return true;
510} 588}
511 589
512static struct sig_handlers 590static struct sig_handlers
513{ 591{
514 sig_watcher sw_chld, sw_term, sw_int; 592 sig_watcher sw_term, sw_int;
515 593
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 /* 594 /*
531 * Catch a fatal signal and tidy up before quitting 595 * Catch a fatal signal and tidy up before quitting
532 */ 596 */
533 void 597 void
534 sig_term (sig_watcher &w) 598 sig_term (sig_watcher &w)
535 { 599 {
536#ifdef DEBUG_CMD
537 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
538#endif
539 rxvt_emergency_cleanup (); 600 rxvt_emergency_cleanup ();
540 signal (w.signum, SIG_DFL); 601 signal (w.signum, SIG_DFL);
541 kill (getpid (), w.signum); 602 kill (getpid (), w.signum);
542 } 603 }
543 604
544 sig_handlers () 605 sig_handlers ()
545 : sw_chld (this, &sig_handlers::sig_chld),
546 sw_term (this, &sig_handlers::sig_term), 606 : sw_term (this, &sig_handlers::sig_term),
547 sw_int (this, &sig_handlers::sig_term) 607 sw_int (this, &sig_handlers::sig_term)
548 { 608 {
549 } 609 }
550} sig_handlers; 610} sig_handlers;
551 611
612char **rxvt_environ; // startup environment
613
552void 614void
553rxvt_init () 615rxvt_init ()
554{ 616{
555 /* 617 ptytty::init ();
556 * Save and then give up any super-user privileges 618
557 * If we need privileges in any area then we must specifically request it. 619 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 620
565 signal (SIGHUP, SIG_IGN); 621 signal (SIGHUP, SIG_IGN);
566 signal (SIGPIPE, SIG_IGN); 622 signal (SIGPIPE, SIG_IGN);
567 623
568 sig_handlers.sw_chld.start (SIGCHLD);
569 sig_handlers.sw_term.start (SIGTERM); 624 sig_handlers.sw_term.start (SIGTERM);
570 sig_handlers.sw_int.start (SIGINT); 625 sig_handlers.sw_int.start (SIGINT);
571 626
572 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 627 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
573 /* signal (SIGURG, SIG_DFL); */ 628 /* signal (SIGURG, SIG_DFL); */
574 629
575 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 630 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
576 // TODO: handle this with exceptions and tolerate the memory loss 631 // TODO: handle this with exceptions and tolerate the memory loss
577 XSetIOErrorHandler (rxvt_xioerror_handler); 632 XSetIOErrorHandler (rxvt_xioerror_handler);
633
634 XrmInitialize ();
578} 635}
579 636
580/* ------------------------------------------------------------------------- * 637/* ------------------------------------------------------------------------- *
581 * MEMORY ALLOCATION WRAPPERS * 638 * MEMORY ALLOCATION WRAPPERS *
582 * ------------------------------------------------------------------------- */ 639 * ------------------------------------------------------------------------- */
… …
600 rxvt_fatal ("memory allocation failure. aborting.\n"); 657 rxvt_fatal ("memory allocation failure. aborting.\n");
601 658
602 return p; 659 return p;
603} 660}
604 661
605void * 662void *
606rxvt_realloc (void *ptr, size_t size) 663rxvt_realloc (void *ptr, size_t size)
607{ 664{
608 void *p = realloc (ptr, size); 665 void *p = realloc (ptr, size);
609 666
610 if (!p) 667 if (!p)
611 rxvt_fatal ("memory allocation failure. aborting.\n"); 668 rxvt_fatal ("memory allocation failure. aborting.\n");
612 669
613 return p; 670 return p;
614} 671}
615 672
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/*----------------------------------------------------------------------*/ 673/*----------------------------------------------------------------------*/
691/* 674/*
692 * window size/position calculcations for XSizeHint and other storage. 675 * window size/position calculations for XSizeHint and other storage.
693 * if width/height are non-zero then override calculated width/height 676 * if width/height are non-zero then override calculated width/height
694 */ 677 */
695void 678void
696rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 679rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
697{ 680{
698 short recalc_x, recalc_y; 681 short recalc_x, recalc_y;
699 int x, y, sb_w, mb_h, flags; 682 int x, y, sb_w, flags;
700 unsigned int w, h; 683 unsigned int w, h;
701 unsigned int max_width, max_height; 684 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 685
707 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 686 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
708 szHint.win_gravity = NorthWestGravity; 687 szHint.win_gravity = NorthWestGravity;
709 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 688 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
710 689
… …
718 if (rs[Rs_geometry]) 697 if (rs[Rs_geometry])
719 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 698 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
720 699
721 if (flags & WidthValue) 700 if (flags & WidthValue)
722 { 701 {
723 ncol = BOUND_POSITIVE_INT16 (w); 702 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
724 szHint.flags |= USSize; 703 szHint.flags |= USSize;
725 } 704 }
726 705
727 if (flags & HeightValue) 706 if (flags & HeightValue)
728 { 707 {
729 nrow = BOUND_POSITIVE_INT16 (h); 708 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
730 szHint.flags |= USSize; 709 szHint.flags |= USSize;
731 } 710 }
732 711
733 if (flags & XValue) 712 if (flags & XValue)
734 { 713 {
… …
765 max_width = MAX_COLS * fwidth; 744 max_width = MAX_COLS * fwidth;
766 max_height = MAX_ROWS * fheight; 745 max_height = MAX_ROWS * fheight;
767 746
768 szHint.base_width = szHint.base_height = 2 * int_bwidth; 747 szHint.base_width = szHint.base_height = 2 * int_bwidth;
769 748
770 sb_w = mb_h = 0; 749 sb_w = 0;
771 window_vt_x = window_vt_y = int_bwidth; 750 window_vt_x = window_vt_y = int_bwidth;
772 751
773 if (scrollbar_visible ()) 752 if (scrollBar.state)
774 { 753 {
775 sb_w = scrollbar_TotalWidth (); 754 sb_w = scrollbar_TotalWidth ();
776 szHint.base_width += sb_w; 755 szHint.base_width += sb_w;
756
777 if (!(options & Opt_scrollBar_right)) 757 if (!option (Opt_scrollBar_right))
778 window_vt_x += sb_w; 758 window_vt_x += sb_w;
779 } 759 }
780 760
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; 761 szHint.width_inc = fwidth;
789 szHint.height_inc = fheight; 762 szHint.height_inc = fheight;
790 szHint.min_width = szHint.base_width + szHint.width_inc; 763 szHint.min_width = szHint.base_width + szHint.width_inc;
791 szHint.min_height = szHint.base_height + szHint.height_inc; 764 szHint.min_height = szHint.base_height + szHint.height_inc;
792 765
793 if (newwidth && newwidth - szHint.base_width < max_width) 766 if (newwidth && newwidth - szHint.base_width < max_width)
794 { 767 {
795 szHint.width = newwidth; 768 szHint.width = newwidth;
796 width = newwidth - szHint.base_width; 769 width = newwidth - szHint.base_width;
797 } 770 }
798 else 771 else
799 { 772 {
800 MIN_IT (width, max_width); 773 min_it (width, max_width);
801 szHint.width = szHint.base_width + width; 774 szHint.width = szHint.base_width + width;
802 } 775 }
803 776
804 if (newheight && newheight - szHint.base_height < max_height) 777 if (newheight && newheight - szHint.base_height < max_height)
805 { 778 {
806 szHint.height = newheight; 779 szHint.height = newheight;
807 height = newheight - szHint.base_height; 780 height = newheight - szHint.base_height;
808 } 781 }
809 else 782 else
810 { 783 {
811 MIN_IT (height, max_height); 784 min_it (height, max_height);
812 szHint.height = szHint.base_height + height; 785 szHint.height = szHint.base_height + height;
813 } 786 }
814 787
815 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 788 if (scrollBar.state && option (Opt_scrollBar_right))
816 window_sb_x = szHint.width - sb_w; 789 window_sb_x = szHint.width - sb_w;
817 790
818 if (recalc_x) 791 if (recalc_x)
819 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 792 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
793
820 if (recalc_y) 794 if (recalc_y)
821 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 795 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
822 796
823 ncol = width / fwidth; 797 ncol = width / fwidth;
824 nrow = height / fheight; 798 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} 799}
830 800
831/*----------------------------------------------------------------------*/ 801/*----------------------------------------------------------------------*/
832/* 802/*
833 * Tell the teletype handler what size the window is. 803 * Tell the teletype handler what size the window is.
834 * Called after a window size change. 804 * Called after a window size change.
835 */ 805 */
836void 806void
837rxvt_term::tt_winch () 807rxvt_term::tt_winch ()
838{ 808{
839 if (pty.pty < 0) 809 if (pty->pty < 0)
840 return; 810 return;
841 811
842 struct winsize ws; 812 struct winsize ws;
843 813
844 ws.ws_col = ncol; 814 ws.ws_col = ncol;
845 ws.ws_row = nrow; 815 ws.ws_row = nrow;
846 ws.ws_xpixel = width; 816 ws.ws_xpixel = width;
847 ws.ws_ypixel = height; 817 ws.ws_ypixel = height;
848 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 818 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
849 819
850#if 0 820#if 0
851 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 821 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
852 if (cmd_pid) /* force through to the command */ 822 if (cmd_pid) /* force through to the command */
853 kill (-cmd_pid, SIGWINCH); 823 kill (-cmd_pid, SIGWINCH);
… …
885 delete fontset[0]; 855 delete fontset[0];
886 fontset[0] = fs; 856 fontset[0] = fs;
887 857
888 prop = (*fs)[1]->properties (); 858 prop = (*fs)[1]->properties ();
889 prop.height += lineSpace; 859 prop.height += lineSpace;
860
890 fs->set_prop (prop); 861 fs->set_prop (prop, false);
891 862
892 fwidth = prop.width; 863 fwidth = prop.width;
893 fheight = prop.height; 864 fheight = prop.height;
894 fweight = prop.weight; 865 fbase = prop.ascent;
895 fslant = prop.slant;
896 fbase = (*fs)[1]->ascent;
897 866
898 for (int style = 1; style < 4; style++) 867 for (int style = 1; style < 4; style++)
899 { 868 {
900#if ENABLE_STYLES 869#if ENABLE_STYLES
901 const char *res = rs[Rs_font + style]; 870 const char *res = rs[Rs_font + style];
… …
906 { 875 {
907 fontset[style] = fs = new rxvt_fontset (this); 876 fontset[style] = fs = new rxvt_fontset (this);
908 rxvt_fontprop prop2 = prop; 877 rxvt_fontprop prop2 = prop;
909 878
910 if (res) 879 if (res)
911 prop2.weight = prop2.slant = rxvt_fontprop::unset; 880 {
881 fs->populate (res);
882 fs->set_prop (prop2, false);
883 }
912 else 884 else
913 { 885 {
914 res = fontset[0]->fontdesc; 886 fs->populate (fontset[0]->fontdesc);
915 887
916 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 888 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; 889 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
890
891 fs->set_prop (prop2, true);
918 } 892 }
919 893
920 fs->populate (res);
921 fs->set_prop (prop2);
922 } 894 }
923#else 895#else
924 fontset[style] = fontset[0]; 896 fontset[style] = fontset[0];
925#endif 897#endif
926 } 898 }
… …
935 return true; 907 return true;
936} 908}
937 909
938void rxvt_term::set_string_property (Atom prop, const char *str, int len) 910void rxvt_term::set_string_property (Atom prop, const char *str, int len)
939{ 911{
940 // TODO: SMART_WINDOW_TITLE
941 XChangeProperty (display->display, parent[0], 912 XChangeProperty (dpy, parent[0],
942 prop, XA_STRING, 8, PropModeReplace, 913 prop, XA_STRING, 8, PropModeReplace,
943 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 914 (const unsigned char *)str, len >= 0 ? len : strlen (str));
944} 915}
945 916
946void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 917void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
947{ 918{
948 // TODO: SMART_WINDOW_TITLE
949 wchar_t *ws = rxvt_mbstowcs (str, len); 919 wchar_t *ws = rxvt_mbstowcs (str, len);
950 char *s = rxvt_wcstoutf8 (ws); 920 char *s = rxvt_wcstoutf8 (ws);
951 921
952 XChangeProperty (display->display, parent[0], 922 XChangeProperty (dpy, parent[0],
953 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 923 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
954 (const unsigned char *)s, strlen (s)); 924 (const unsigned char *)s, strlen (s));
955 925
956 free (s); 926 free (s);
957 free (ws); 927 free (ws);
… …
982void 952void
983rxvt_term::set_window_color (int idx, const char *color) 953rxvt_term::set_window_color (int idx, const char *color)
984{ 954{
985 rxvt_color xcol; 955 rxvt_color xcol;
986 int i; 956 int i;
987 957
988 if (color == NULL || *color == '\0') 958 if (color == NULL || *color == '\0')
989 return; 959 return;
960
961 color = strdup (color);
962 allocated.push_back ((void *)color);
963 rs[Rs_color + idx] = color;
990 964
991 /* handle color aliases */ 965 /* handle color aliases */
992 if (isdigit (*color)) 966 if (isdigit (*color))
993 { 967 {
994 i = atoi (color); 968 i = atoi (color);
995 969
996 if (i >= 8 && i <= 15) 970 if (i >= 8 && i <= 15)
997 { /* bright colors */ 971 { /* bright colors */
998 i -= 8; 972 i -= 8;
999# ifndef NO_BRIGHTCOLOR
1000 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 973 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1001 SET_PIXCOLOR (idx);
1002 goto done; 974 goto done;
1003# endif
1004 } 975 }
1005 976
1006 if (i >= 0 && i <= 7) 977 if (i >= 0 && i <= 7)
1007 { /* normal colors */ 978 { /* normal colors */
1008 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 979 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1009 SET_PIXCOLOR (idx);
1010 goto done; 980 goto done;
1011 } 981 }
1012 } 982 }
1013 983
1014 if (!rXParseAllocColor (&xcol, color)) 984 set_color (xcol, color);
1015 return;
1016
1017 /* XStoreColor (display->display, display->cmap, XColor*); */
1018 985
1019 /* 986 /*
1020 * FIXME: should free colors here, but no idea how to do it so instead, 987 * FIXME: should free colors here, but no idea how to do it so instead,
1021 * so just keep gobbling up the colormap 988 * so just keep gobbling up the colormap
1022 */ 989 */
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 990
1035 pix_colors_focused[idx] = xcol; 991 pix_colors_focused[idx] = xcol;
1036 SET_PIXCOLOR (idx);
1037 992
1038 /* XSetWindowAttributes attr; */ 993 /* XSetWindowAttributes attr; */
1039 /* Cursor cursor; */ 994 /* Cursor cursor; */
1040done: 995done:
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. */ 996 /*TODO: handle Color_BD, scrollbar background, etc. */
1048 997
998 update_fade_color (idx);
1049 recolour_cursor (); 999 recolour_cursor ();
1050 scr_recolour (); 1000 scr_recolour ();
1051} 1001}
1052 1002
1053#else 1003#else
… …
1055#endif /* XTERM_COLOR_CHANGE */ 1005#endif /* XTERM_COLOR_CHANGE */
1056 1006
1057void 1007void
1058rxvt_term::recolour_cursor () 1008rxvt_term::recolour_cursor ()
1059{ 1009{
1060 XColor xcol[2]; 1010 XColor fg, bg;
1061 1011
1062 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1012 (ISSET_PIXCOLOR (Color_pointer_fg)
1063 ? pix_colors_focused[Color_pointer_fg] 1013 ? pix_colors_focused[Color_pointer_fg]
1064 : pix_colors_focused[Color_fg]; 1014 : pix_colors_focused[Color_fg]).get (fg);
1015
1065 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1016 (ISSET_PIXCOLOR (Color_pointer_bg)
1066 ? pix_colors_focused[Color_pointer_bg] 1017 ? pix_colors_focused[Color_pointer_bg]
1067 : pix_colors_focused[Color_bg]; 1018 : pix_colors_focused[Color_bg]).get (bg);
1068 1019
1069 XQueryColors (display->display, display->cmap, xcol, 2); 1020 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1070 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1071} 1021}
1072 1022
1073/*----------------------------------------------------------------------*/ 1023/*----------------------------------------------------------------------*/
1074/* 1024/*
1075 * find if fg/bg matches any of the normal (low-intensity) colors 1025 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1079{ 1029{
1080 unsigned int i; 1030 unsigned int i;
1081 const char *xpmb = "\0"; 1031 const char *xpmb = "\0";
1082 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1032 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1083 1033
1084 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1085 strcpy (fstr, "default"); 1034 strcpy (fstr, "default");
1086 strcpy (bstr, "default"); 1035 strcpy (bstr, "default");
1087 for (i = Color_Black; i <= Color_White; i++) 1036 for (i = Color_Black; i <= Color_White; i++)
1088 if (pix_colors[Color_fg] == pix_colors[i]) 1037 if (pix_colors[Color_fg] == pix_colors[i])
1089 { 1038 {
… …
1104 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1053 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1105} 1054}
1106 1055
1107/*----------------------------------------------------------------------*/ 1056/*----------------------------------------------------------------------*/
1108 1057
1109int 1058bool
1110rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1059rxvt_term::set_color (rxvt_color &color, const char *name)
1111{ 1060{
1112 if (!screen_in_out->set (display, colour)) 1061 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; 1062 return true;
1063
1064 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1065 return false;
1066}
1067
1068void
1069rxvt_term::alias_color (int dst, int src)
1070{
1071 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1119} 1072}
1120 1073
1121/* -------------------------------------------------------------------- * 1074/* -------------------------------------------------------------------- *
1122 * - WINDOW RESIZING - * 1075 * - WINDOW RESIZING - *
1123 * -------------------------------------------------------------------- */ 1076 * -------------------------------------------------------------------- */
1124void 1077void
1125rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1078rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1126{ 1079{
1127 int fix_screen; 1080 int fix_screen;
1128 int old_width = szHint.width, old_height = szHint.height; 1081 int old_width = szHint.width;
1129 dDisp; 1082 int old_height = szHint.height;
1130 1083
1131 window_calc (newwidth, newheight); 1084 window_calc (newwidth, newheight);
1085
1086 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1132 XSetWMNormalHints (disp, parent[0], &szHint); 1087 XSetWMNormalHints (dpy, parent[0], &szHint);
1133 1088
1134 if (!ignoreparent) 1089 if (!ignoreparent)
1135 { 1090 {
1136#ifdef SMART_RESIZE 1091#ifdef SMART_RESIZE
1137 /* 1092 /*
… …
1141 int x, y, x1, y1; 1096 int x, y, x1, y1;
1142 int dx, dy; 1097 int dx, dy;
1143 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1098 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1144 Window unused_cr; 1099 Window unused_cr;
1145 1100
1146 XTranslateCoordinates (disp, parent[0], display->root, 1101 XTranslateCoordinates (dpy, parent[0], display->root,
1147 0, 0, &x, &y, &unused_cr); 1102 0, 0, &x, &y, &unused_cr);
1148 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1103 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1149 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1104 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1150 /* 1105 /*
1151 * if display->root isn't the parent window, a WM will probably have offset 1106 * if display->root isn't the parent window, a WM will probably have offset
1152 * our position for handles and decorations. Counter it 1107 * our position for handles and decorations. Counter it
1153 */ 1108 */
… …
1155 { 1110 {
1156 x -= x1; 1111 x -= x1;
1157 y -= y1; 1112 y -= y1;
1158 } 1113 }
1159 1114
1160 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1115 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1161 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1116 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1162 dx = old_width - szHint.width; 1117 dx = old_width - szHint.width;
1163 dy = old_height - szHint.height; 1118 dy = old_height - szHint.height;
1164 1119
1165 /* Check position of the center of the window */ 1120 /* Check position of the center of the window */
1166 if (x < x1) /* left half */ 1121 if (x < x1) /* left half */
1167 dx = 0; 1122 dx = 0;
… …
1170 if (y < y1) /* top half */ 1125 if (y < y1) /* top half */
1171 dy = 0; 1126 dy = 0;
1172 else if (y == y1) /* exact center */ 1127 else if (y == y1) /* exact center */
1173 dy /= 2; 1128 dy /= 2;
1174 1129
1175 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1130 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1176 szHint.width, szHint.height); 1131 szHint.width, szHint.height);
1177#else 1132#else
1178 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1133 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1179#endif 1134#endif
1180 } 1135 }
1181 1136
1182 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1137 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1183 1138
1184 if (fix_screen || newwidth != old_width || newheight != old_height) 1139 if (fix_screen || newwidth != old_width || newheight != old_height)
1185 { 1140 {
1186 if (scrollbar_visible ()) 1141 if (scrollBar.state)
1187 { 1142 {
1188 XMoveResizeWindow (disp, scrollBar.win, 1143 XMoveResizeWindow (dpy, scrollBar.win,
1189 window_sb_x, 0, 1144 window_sb_x, 0,
1190 scrollbar_TotalWidth (), szHint.height); 1145 scrollbar_TotalWidth (), szHint.height);
1191 resize_scrollbar (); 1146 resize_scrollbar ();
1192 } 1147 }
1193 1148
1194 if (menubar_visible ())
1195 XMoveResizeWindow (disp, menuBar.win,
1196 window_vt_x, 0,
1197 TermWin_TotalWidth (), menuBar_TotalHeight ());
1198
1199 XMoveResizeWindow (disp, vt, 1149 XMoveResizeWindow (dpy, vt,
1200 window_vt_x, window_vt_y, 1150 window_vt_x, window_vt_y,
1201 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1151 width, height);
1152
1153#ifdef XPM_BACKGROUND
1154 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1155 if (bgPixmap.window_size_sensitive ())
1156 update_background ();
1157#endif
1202 1158
1203 scr_clear (); 1159 scr_clear ();
1204#ifdef XPM_BACKGROUND
1205 resize_pixmap ();
1206#endif
1207 } 1160 }
1208 1161
1209 if (fix_screen || old_height == 0) 1162 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 (); 1163 scr_reset ();
1224 1164
1225 if (curr_screen >= 0) /* this is not the first time through */ 1165 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1226 { 1166 //scr_touch (false);
1227 scr_change_screen (curr_screen);
1228 selection_check (old_ncol != ncol ? 4 : 0);
1229 }
1230 }
1231 1167
1232 old_width = szHint.width; 1168#ifdef HAVE_BG_PIXMAP
1233 old_height = szHint.height; 1169// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1234 1170// if (bgPixmap.pixmap)
1235#ifdef XPM_BACKGROUND
1236 if (pixmap)
1237 scr_touch (false); 1171// scr_touch (false);
1238#endif 1172#endif
1239 1173
1240#ifdef USE_XIM 1174#ifdef USE_XIM
1241 IMSetStatusPosition (); 1175 IMSetPosition ();
1242#endif 1176#endif
1243} 1177}
1244 1178
1245/* 1179/*
1246 * Set the width/height of the vt window in characters. Units are pixels. 1180 * Set the width/height of the vt window in characters. Units are pixels.
… …
1251{ 1185{
1252 XWindowAttributes wattr; 1186 XWindowAttributes wattr;
1253 1187
1254 if (newwidth == 0 || newheight == 0) 1188 if (newwidth == 0 || newheight == 0)
1255 { 1189 {
1256 XGetWindowAttributes (display->display, display->root, &wattr); 1190 XGetWindowAttributes (dpy, display->root, &wattr);
1257 1191
1258 if (newwidth == 0) 1192 if (newwidth == 0)
1259 newwidth = wattr.width - szHint.base_width; 1193 newwidth = wattr.width - szHint.base_width;
1260 if (newheight == 0) 1194 if (newheight == 0)
1261 newheight = wattr.height - szHint.base_height; 1195 newheight = wattr.height - szHint.base_height;
… …
1275#ifdef USE_XIM 1209#ifdef USE_XIM
1276 1210
1277void 1211void
1278rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1212rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1279{ 1213{
1280 fg = pix_colors[Color_fg]; 1214 fg = pix_colors [Color_fg];
1281 bg = pix_colors[Color_bg]; 1215 bg = pix_colors [Color_bg];
1282} 1216}
1283 1217
1284void 1218void
1285rxvt_term::im_set_size (XRectangle &size) 1219rxvt_term::im_set_size (XRectangle &size)
1286{ 1220{
… …
1323 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1257 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1324 1258
1325 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1259 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1326 *p = '\0'; 1260 *p = '\0';
1327 1261
1328 atom = XInternAtom (display->display, server, False); 1262 atom = XInternAtom (dpy, server, False);
1329 win = XGetSelectionOwner (display->display, atom); 1263 win = XGetSelectionOwner (dpy, atom);
1330 1264
1331 if (win != None) 1265 if (win != None)
1332 return True; 1266 return True;
1333 } 1267 }
1334 1268
… …
1341 XPoint nspot; 1275 XPoint nspot;
1342 XVaNestedList preedit_attr; 1276 XVaNestedList preedit_attr;
1343 1277
1344 if (!Input_Context 1278 if (!Input_Context
1345 || !focus 1279 || !focus
1346 || !(input_style & XIMPreeditPosition)) 1280 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1347 return; 1281 return;
1348 1282
1349 im_set_position (nspot); 1283 im_set_position (nspot);
1350 1284
1351 if (nspot.x == spot.x && nspot.y == spot.y) 1285 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1370 input_method = 0; 1304 input_method = 0;
1371 } 1305 }
1372 1306
1373 Input_Context = 0; 1307 Input_Context = 0;
1374} 1308}
1309
1310#ifdef ENABLE_XIM_ONTHESPOT
1311
1312static void
1313xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1314{
1315 ((rxvt_term *)client_data)->make_current ();
1316 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1317}
1318
1319static void
1320xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1321{
1322 ((rxvt_term *)client_data)->make_current ();
1323 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1324}
1325
1326static void
1327xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1328{
1329 rxvt_term *term = (rxvt_term *)client_data;
1330 XIMText *text = call_data->text;
1331
1332 term->make_current ();
1333
1334 if (text)
1335 {
1336 void *str;
1337
1338 if (!text->encoding_is_wchar && text->string.multi_byte)
1339 {
1340 // of course, X makes it ugly again
1341 if (term->rs[Rs_imLocale])
1342 SET_LOCALE (term->rs[Rs_imLocale]);
1343
1344 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1345 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1346
1347 if (term->rs[Rs_imLocale])
1348 SET_LOCALE (term->locale);
1349 }
1350 else
1351 str = (void *)text->string.wide_char;
1352
1353 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1354 DT_INT, call_data->caret,
1355 DT_INT, call_data->chg_first,
1356 DT_INT, call_data->chg_length,
1357 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1358 DT_WCS_LEN, str, str ? (int)text->length : 0,
1359 DT_END));
1360 }
1361 else
1362 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1363 DT_INT, call_data->caret,
1364 DT_INT, call_data->chg_first,
1365 DT_INT, call_data->chg_length,
1366 DT_END));
1367}
1368
1369#if 0
1370static void
1371xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1372{
1373 ((rxvt_term *)client_data)->make_current ();
1374 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1375 DT_INT, call_data->position,
1376 DT_INT, call_data->direction,
1377 DT_INT, call_data->style,
1378 DT_END));
1379}
1380#endif
1381
1382#endif
1375 1383
1376/* 1384/*
1377 * Try to open a XIM with the current modifiers, then see if we can 1385 * Try to open a XIM with the current modifiers, then see if we can
1378 * open a suitable preedit type 1386 * open a suitable preedit type
1379 */ 1387 */
… …
1386 XRectangle rect, status_rect, needed_rect; 1394 XRectangle rect, status_rect, needed_rect;
1387 unsigned long fg, bg; 1395 unsigned long fg, bg;
1388 const char *p; 1396 const char *p;
1389 char **s; 1397 char **s;
1390 XIMStyles *xim_styles; 1398 XIMStyles *xim_styles;
1399#ifdef ENABLE_XIM_ONTHESPOT
1400 XIMCallback xcb[4];
1401#endif
1402
1403 set_environ (envv);
1391 1404
1392 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1405 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1393 return false; 1406 return false;
1394 1407
1395 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1396 input_method = display->get_xim (locale, modifiers); 1408 input_method = display->get_xim (locale, modifiers);
1397 if (input_method == NULL) 1409 if (input_method == NULL)
1398 return false; 1410 return false;
1399 1411
1400 xim = input_method->xim; 1412 xim = input_method->xim;
… …
1420 s = rxvt_splitcommastring (p); 1432 s = rxvt_splitcommastring (p);
1421 1433
1422 for (i = found = 0; !found && s[i]; i++) 1434 for (i = found = 0; !found && s[i]; i++)
1423 { 1435 {
1424 if (!strcmp (s[i], "OverTheSpot")) 1436 if (!strcmp (s[i], "OverTheSpot"))
1425 input_style = (XIMPreeditPosition | XIMStatusNothing); 1437 input_style = XIMPreeditPosition | XIMStatusNothing;
1426 else if (!strcmp (s[i], "OffTheSpot")) 1438 else if (!strcmp (s[i], "OffTheSpot"))
1427 input_style = (XIMPreeditArea | XIMStatusArea); 1439 input_style = XIMPreeditArea | XIMStatusArea;
1428 else if (!strcmp (s[i], "Root")) 1440 else if (!strcmp (s[i], "Root"))
1429 input_style = (XIMPreeditNothing | XIMStatusNothing); 1441 input_style = XIMPreeditNothing | XIMStatusNothing;
1430 else if (!strcmp (s[i], "None")) 1442 else if (!strcmp (s[i], "None"))
1431 input_style = (XIMPreeditNone | XIMStatusNone); 1443 input_style = XIMPreeditNone | XIMStatusNone;
1444#ifdef ENABLE_XIM_ONTHESPOT
1445 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1446 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1447#endif
1448 else
1449 input_style = XIMPreeditNothing | XIMStatusNothing;
1432 1450
1433 for (j = 0; j < xim_styles->count_styles; j++) 1451 for (j = 0; j < xim_styles->count_styles; j++)
1434 if (input_style == xim_styles->supported_styles[j]) 1452 if (input_style == xim_styles->supported_styles[j])
1435 { 1453 {
1436 rxvt_freecommastring (s); 1454 rxvt_freecommastring (s);
… …
1474 "*", 1492 "*",
1475 fheight, 1493 fheight,
1476 fheight + 1, fheight - 1, 1494 fheight + 1, fheight - 1,
1477 fheight - 2, fheight + 2); 1495 fheight - 2, fheight + 2);
1478 1496
1479 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1497 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1480 &missing_charset_list, &missing_charset_count, &def_string); 1498 &missing_charset_list, &missing_charset_count, &def_string);
1481 1499
1482 if (missing_charset_list) 1500 if (missing_charset_list)
1483 XFreeStringList (missing_charset_list); 1501 XFreeStringList (missing_charset_list);
1484 1502
… …
1525 XNBackground, bg, 1543 XNBackground, bg,
1526 XNArea, &status_rect, 1544 XNArea, &status_rect,
1527 XNFontSet, fs, 1545 XNFontSet, fs,
1528 NULL); 1546 NULL);
1529 } 1547 }
1548#if ENABLE_XIM_ONTHESPOT
1549 else if (input_style & XIMPreeditCallbacks)
1550 {
1551 im_set_position (spot);
1552
1553 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1554 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1555 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1556# if 0
1557 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1558# endif
1559
1560 preedit_attr = XVaCreateNestedList (0,
1561 XNSpotLocation, &spot,
1562 XNPreeditStartCallback, &xcb[0],
1563 XNPreeditDoneCallback , &xcb[1],
1564 XNPreeditDrawCallback , &xcb[2],
1565# if 0
1566 XNPreeditCaretCallback, &xcb[3],
1567# endif
1568 NULL);
1569 }
1570#endif
1530 1571
1531 Input_Context = XCreateIC (xim, 1572 Input_Context = XCreateIC (xim,
1532 XNInputStyle, input_style, 1573 XNInputStyle, input_style,
1533 XNClientWindow, vt, 1574 XNClientWindow, vt,
1534 XNFocusWindow, parent[0], 1575 XNFocusWindow, parent[0],
… …
1536 preedit_attr, 1577 preedit_attr,
1537 status_attr ? XNStatusAttributes : NULL, 1578 status_attr ? XNStatusAttributes : NULL,
1538 status_attr, NULL); 1579 status_attr, NULL);
1539 1580
1540 if (preedit_attr) XFree (preedit_attr); 1581 if (preedit_attr) XFree (preedit_attr);
1541 if (status_attr) XFree (status_attr); 1582 if (status_attr) XFree (status_attr);
1542 if (fs) XFreeFontSet (display->display, fs); 1583 if (fs) XFreeFontSet (dpy, fs);
1543 1584
1544 if (Input_Context == NULL) 1585 if (Input_Context == NULL)
1545 { 1586 {
1546 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1587 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1547 im_destroy (); 1588 im_destroy ();
1548 return false; 1589 return false;
1549 } 1590 }
1550 1591
1551 if (input_style & XIMPreeditArea) 1592#if 0
1593 // unfortunately, only the focus window is used by XIM, hard to fix
1594 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1595 vt_select_input ();
1596#endif
1597
1552 IMSetStatusPosition (); 1598 IMSetPosition ();
1553 1599
1554 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1555 return true; 1600 return true;
1556} 1601}
1557 1602
1558void 1603void
1559rxvt_term::im_cb () 1604rxvt_term::im_cb ()
… …
1561 int i; 1606 int i;
1562 const char *p; 1607 const char *p;
1563 char **s; 1608 char **s;
1564 char buf[IMBUFSIZ]; 1609 char buf[IMBUFSIZ];
1565 1610
1566 SET_R (this); 1611 make_current ();
1567 1612
1568 im_destroy (); 1613 im_destroy ();
1569 1614
1570 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1571 if (Input_Context) 1615 if (Input_Context)
1572 return; 1616 return;
1573 1617
1574#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1618#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1575 if (rs[Rs_imLocale]) 1619 if (rs[Rs_imLocale])
… …
1617 SET_LOCALE (locale); 1661 SET_LOCALE (locale);
1618#endif 1662#endif
1619} 1663}
1620 1664
1621void 1665void
1622rxvt_term::IMSetStatusPosition () 1666rxvt_term::IMSetPosition ()
1623{ 1667{
1624 XRectangle preedit_rect, status_rect, *needed_rect; 1668 XRectangle preedit_rect, status_rect, *needed_rect;
1625 XVaNestedList preedit_attr, status_attr; 1669 XVaNestedList preedit_attr, status_attr;
1626 1670
1627 if (!Input_Context 1671 if (!Input_Context
1628 || !focus 1672 || !focus
1629 || !(input_style & XIMPreeditArea) 1673 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1630 || !IMisRunning ()) 1674 || !IMisRunning ())
1631 return; 1675 return;
1632 1676
1677 if (input_style & XIMPreeditPosition)
1678 {
1679 im_set_size (preedit_rect);
1680 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1681
1682 XSetICValues (Input_Context,
1683 XNPreeditAttributes, preedit_attr, NULL);
1684 }
1685 else
1686 {
1633 /* Getting the necessary width of preedit area */ 1687 /* Getting the necessary width of preedit area */
1634 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1688 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1635 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1689 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1636 XFree (status_attr); 1690 XFree (status_attr);
1637 1691
1638 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1692 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1639 XFree (needed_rect); 1693 XFree (needed_rect);
1640 1694
1641 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1695 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1642 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1696 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1643 1697
1644 XSetICValues (Input_Context, 1698 XSetICValues (Input_Context,
1645 XNPreeditAttributes, preedit_attr, 1699 XNPreeditAttributes, preedit_attr,
1646 XNStatusAttributes, status_attr, NULL); 1700 XNStatusAttributes, status_attr,
1701 NULL);
1647 1702
1703 XFree (status_attr);
1704 }
1705
1648 XFree (preedit_attr); 1706 XFree (preedit_attr);
1649 XFree (status_attr);
1650} 1707}
1651#endif /* USE_XIM */ 1708#endif /* USE_XIM */
1652 1709
1653/*----------------------------------------------------------------------*/
1654rxvt_t rxvt_current_term;
1655
1656/*----------------------- end-of-file (C source) -----------------------*/ 1710/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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