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.151 by root, Wed Dec 21 19:50:16 2005 UTC vs.
Revision 1.225 by root, Wed Jul 5 22:46:14 2006 UTC

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

Diff Legend

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