ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.153 by root, Tue Dec 27 12:23:37 2005 UTC vs.
Revision 1.217 by root, Thu Feb 2 18:00:23 2006 UTC

… …
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 delete pty; pty = 0;
192 privileged_utmp (RESTORE);
193#endif
194
195 pty.put ();
196} 204}
197 205
198rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
199{ 207{
200 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
… …
208#endif 216#endif
209 delete fontset[0]; 217 delete fontset[0];
210 218
211 if (display) 219 if (display)
212 { 220 {
213 dDisp;
214
215 selection_clear (); 221 selection_clear ();
216 222
217#ifdef USE_XIM 223#ifdef USE_XIM
218 im_destroy (); 224 im_destroy ();
219#endif 225#endif
220#ifdef MENUBAR
221 if (menubarGC) XFreeGC (disp, menubarGC);
222#endif
223#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
224 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
225 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (xdisp, ShadowGC);
226#endif 229#endif
227#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
228 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
229#endif 232#endif
230#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
231 if (blackGC) XFreeGC (disp, blackGC); 234 if (blackGC) XFreeGC (xdisp, blackGC);
232 if (whiteGC) XFreeGC (disp, whiteGC); 235 if (whiteGC) XFreeGC (xdisp, whiteGC);
233 if (grayGC) XFreeGC (disp, grayGC); 236 if (grayGC) XFreeGC (xdisp, grayGC);
234 if (darkGC) XFreeGC (disp, darkGC); 237 if (darkGC) XFreeGC (xdisp, darkGC);
235 if (stippleGC) XFreeGC (disp, stippleGC); 238 if (stippleGC) XFreeGC (xdisp, stippleGC);
236 if (dimple) XFreePixmap (disp, dimple); 239 if (dimple) XFreePixmap (xdisp, dimple);
237 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (xdisp, upArrow);
238 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (xdisp, downArrow);
239 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
240 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
241#endif 244#endif
242#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 245#ifdef RXVT_SCROLLBAR
243 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (xdisp, topShadowGC);
244 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (xdisp, botShadowGC);
245 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
246#endif 249#endif
247 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (xdisp, gc);
248 251
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; 252 delete drawable;
255 // destroy all windows 253 // destroy all windows
256 if (parent[0]) 254 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 255 XDestroyWindow (xdisp, parent[0]);
258 }
259 256
260 // TODO: free pixcolours, colours should become part of rxvt_display 257 for (int i = 0; i < TOTAL_COLORS; i++)
258 if (ISSET_PIXCOLOR (i))
259 {
260 pix_colors_focused [i].free (this);
261#if OFF_FOCUS_FADING
262 pix_colors_unfocused [i].free (this);
263#endif
264 }
265
266 clear ();
267 }
261 268
262 delete pix_colors_focused; 269 delete pix_colors_focused;
263#if OFF_FOCUS_FADING 270#if OFF_FOCUS_FADING
264 delete pix_colors_unfocused; 271 delete pix_colors_unfocused;
265#endif 272#endif
… …
272 for (int i = 0; i < allocated.size (); i++) 279 for (int i = 0; i < allocated.size (); i++)
273 free (allocated [i]); 280 free (allocated [i]);
274 281
275 free (selection.text); 282 free (selection.text);
276 // TODO: manage env vars in child only(!) 283 // TODO: manage env vars in child only(!)
277 free (env_windowid);
278 free (env_display); 284 free (env_display);
279 free (env_term); 285 free (env_term);
280 free (env_colorfgbg);
281 free (locale); 286 free (locale);
282 free (v_buffer); 287 free (v_buffer);
283 free (incr_buf); 288 free (incr_buf);
284 289
285 delete envv; 290 delete envv;
… …
288#ifdef KEYSYM_RESOURCE 293#ifdef KEYSYM_RESOURCE
289 delete keyboard; 294 delete keyboard;
290#endif 295#endif
291} 296}
292 297
298// child has exited, usually destroys
293void 299void
294rxvt_term::child_exit () 300rxvt_term::child_cb (child_watcher &w, int status)
295{ 301{
302 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
303
296 cmd_pid = 0; 304 cmd_pid = 0;
297 305
298 if (!(options & Opt_hold)) 306 if (!OPTION (Opt_hold))
299 destroy (); 307 destroy ();
300} 308}
301 309
302void 310void
303rxvt_term::destroy () 311rxvt_term::destroy ()
304{ 312{
305 if (destroy_ev.active) 313 if (destroy_ev.active)
306 return; 314 return;
307 315
316 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
317
308#if ENABLE_OVERLAY 318#if ENABLE_OVERLAY
309 scr_overlay_off (); 319 scr_overlay_off ();
310#endif 320#endif
311 321
312 if (display) 322 if (display)
… …
314#if USE_XIM 324#if USE_XIM
315 im_ev.stop (display); 325 im_ev.stop (display);
316#endif 326#endif
317#if HAVE_SCROLLBARS 327#if HAVE_SCROLLBARS
318 scrollbar_ev.stop (display); 328 scrollbar_ev.stop (display);
319#endif
320#if MENUBAR
321 menubar_ev.stop (display);
322#endif 329#endif
323#if TRANSPARENT 330#if TRANSPARENT
324 rootwin_ev.stop (display); 331 rootwin_ev.stop (display);
325#endif 332#endif
326 incr_ev.stop (); 333 incr_ev.stop ();
… …
350} 357}
351 358
352void 359void
353rxvt_term::destroy_cb (time_watcher &w) 360rxvt_term::destroy_cb (time_watcher &w)
354{ 361{
355 SET_R (this); 362 make_current ();
356 363
357 delete this; 364 delete this;
358} 365}
359 366
360/*----------------------------------------------------------------------*/ 367/*----------------------------------------------------------------------*/
… …
369{ 376{
370 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 377 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
371 (*t)->emergency_cleanup (); 378 (*t)->emergency_cleanup ();
372} 379}
373 380
374#if ENABLE_FRILLS 381#if !ENABLE_MINIMAL
375static void 382static void
376print_x_error (Display *dpy, XErrorEvent *event) 383print_x_error (Display *dpy, XErrorEvent *event)
377{ 384{
378 char buffer[BUFSIZ]; 385 char buffer[BUFSIZ];
379 char mesg[BUFSIZ]; 386 char mesg[BUFSIZ];
… …
427 GET_R->allowedxerror = event->error_code; 434 GET_R->allowedxerror = event->error_code;
428 else 435 else
429 { 436 {
430 // GET_R is most likely not the terminal which caused the error, 437 // GET_R is most likely not the terminal which caused the error,
431 // so just output the error and continue 438 // so just output the error and continue
432#if ENABLE_FRILLS 439#if ENABLE_MINIMAL
440 old_xerror_handler (display, event);
441#else
433 print_x_error (display, event); 442 print_x_error (display, event);
434#else
435 old_xerror_handler (display, event);
436#endif 443#endif
437 } 444 }
438 445
439 return 0; 446 return 0;
440} 447}
… …
448 _exit (EXIT_FAILURE); 455 _exit (EXIT_FAILURE);
449} 456}
450 457
451/*----------------------------------------------------------------------*/ 458/*----------------------------------------------------------------------*/
452bool 459bool
453rxvt_term::init (int argc, const char *const *argv) 460rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
454{ 461{
462 this->envv = envv;
463
455 SET_R (this); 464 SET_R (this);
456
457 set_locale (""); 465 set_locale ("");
466 set_environ (envv); // few things in X do not call setlocale :(
458 467
459 if (!init_vars ()) 468 if (!init_vars ())
460 return false; 469 return false;
461 470
462 init_secondary (); 471 init_secondary ();
… …
465 474
466#ifdef KEYSYM_RESOURCE 475#ifdef KEYSYM_RESOURCE
467 keyboard->register_done (); 476 keyboard->register_done ();
468#endif 477#endif
469 478
470#if MENUBAR_MAX
471 menubar_read (rs[Rs_menu]);
472#endif
473#ifdef HAVE_SCROLLBARS 479#ifdef HAVE_SCROLLBARS
474 if (options & Opt_scrollBar) 480 if (OPTION (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */ 481 scrollBar.setIdle (); /* set existence for size calculations */
476#endif 482#endif
477 483
484 pty = ptytty::create ();
485
478 create_windows (argc, argv); 486 create_windows (argc, argv);
479 487
480 dDisp;
481
482 init_xlocale (); 488 init_xlocale ();
483 489
484 scr_reset (); /* initialize screen */ 490 scr_reset (); // initialize screen
485 491
486#if 0 492#if 0
487 XSynchronize (disp, True); 493 XSynchronize (xdisp, True);
488#endif 494#endif
489 495
490#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
491 if (options & Opt_scrollBar) 497 if (OPTION (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
493#endif 499#endif
494#if (MENUBAR_MAX)
495 if (menubar_visible ())
496 XMapWindow (disp, menuBar.win);
497#endif
498#ifdef TRANSPARENT 500#ifdef TRANSPARENT
499 if (options & Opt_transparent) 501 if (OPTION (Opt_transparent))
500 { 502 {
501 XSelectInput (disp, display->root, PropertyChangeMask); 503 XSelectInput (xdisp, display->root, PropertyChangeMask);
502 check_our_parents (); 504 check_our_parents ();
503 rootwin_ev.start (display, display->root); 505 rootwin_ev.start (display, display->root);
504 } 506 }
505#endif 507#endif
506 508
507 XMapWindow (disp, vt);
508 XMapWindow (disp, parent[0]);
509
510 set_colorfgbg (); 509 set_colorfgbg ();
511 510
512 init_command (cmd_argv); 511 init_command (cmd_argv);
513 512
514 free (cmd_argv); 513 free (cmd_argv);
515 514
515 if (pty->pty >= 0)
516 pty_ev.start (pty.pty, EVENT_READ); 516 pty_ev.start (pty->pty, EVENT_READ);
517 517
518 check_ev.start (); 518 check_ev.start ();
519 519
520 HOOK_INVOKE ((this, HOOK_START, DT_END));
521
522#if ENABLE_XEMBED
523 if (rs[Rs_embed])
524 {
525 long info[2] = { 0, XEMBED_MAPPED };
526
527 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
528 32, PropModeReplace, (unsigned char *)&info, 2);
529 }
530#endif
531
532 XMapWindow (xdisp, vt);
533 XMapWindow (xdisp, parent[0]);
534
520 return true; 535 return true;
521} 536}
522 537
523static struct sig_handlers 538static struct sig_handlers
524{ 539{
525 sig_watcher sw_chld, sw_term, sw_int; 540 sig_watcher sw_term, sw_int;
526 541
527 void sig_chld (sig_watcher &w)
528 {
529 // we are being called for every SIGCHLD, find the corresponding term
530 int pid;
531
532 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
533 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
534 if (pid == (*t)->cmd_pid)
535 {
536 (*t)->child_exit ();
537 break;
538 }
539 }
540
541 /* 542 /*
542 * Catch a fatal signal and tidy up before quitting 543 * Catch a fatal signal and tidy up before quitting
543 */ 544 */
544 void 545 void
545 sig_term (sig_watcher &w) 546 sig_term (sig_watcher &w)
546 { 547 {
547#ifdef DEBUG_CMD
548 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
549#endif
550 rxvt_emergency_cleanup (); 548 rxvt_emergency_cleanup ();
551 signal (w.signum, SIG_DFL); 549 signal (w.signum, SIG_DFL);
552 kill (getpid (), w.signum); 550 kill (getpid (), w.signum);
553 } 551 }
554 552
555 sig_handlers () 553 sig_handlers ()
556 : sw_chld (this, &sig_handlers::sig_chld),
557 sw_term (this, &sig_handlers::sig_term), 554 : sw_term (this, &sig_handlers::sig_term),
558 sw_int (this, &sig_handlers::sig_term) 555 sw_int (this, &sig_handlers::sig_term)
559 { 556 {
560 } 557 }
561} sig_handlers; 558} sig_handlers;
562 559
560char **rxvt_environ; // startup environment
561
563void 562void
564rxvt_init () 563rxvt_init ()
565{ 564{
566 /* 565 ptytty::init ();
567 * Save and then give up any super-user privileges 566
568 * If we need privileges in any area then we must specifically request it. 567 rxvt_environ = environ;
569 * We should only need to be root in these cases:
570 * 1. write utmp entries on some systems
571 * 2. chown tty on some systems
572 */
573 rxvt_privileges (SAVE);
574 rxvt_privileges (IGNORE);
575 568
576 signal (SIGHUP, SIG_IGN); 569 signal (SIGHUP, SIG_IGN);
577 signal (SIGPIPE, SIG_IGN); 570 signal (SIGPIPE, SIG_IGN);
578 571
579 sig_handlers.sw_chld.start (SIGCHLD);
580 sig_handlers.sw_term.start (SIGTERM); 572 sig_handlers.sw_term.start (SIGTERM);
581 sig_handlers.sw_int.start (SIGINT); 573 sig_handlers.sw_int.start (SIGINT);
582 574
583 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 575 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
584 /* signal (SIGURG, SIG_DFL); */ 576 /* signal (SIGURG, SIG_DFL); */
585 577
586 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 578 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
587 // TODO: handle this with exceptions and tolerate the memory loss 579 // TODO: handle this with exceptions and tolerate the memory loss
588 XSetIOErrorHandler (rxvt_xioerror_handler); 580 XSetIOErrorHandler (rxvt_xioerror_handler);
581
582 XrmInitialize ();
589} 583}
590 584
591/* ------------------------------------------------------------------------- * 585/* ------------------------------------------------------------------------- *
592 * MEMORY ALLOCATION WRAPPERS * 586 * MEMORY ALLOCATION WRAPPERS *
593 * ------------------------------------------------------------------------- */ 587 * ------------------------------------------------------------------------- */
… …
611 rxvt_fatal ("memory allocation failure. aborting.\n"); 605 rxvt_fatal ("memory allocation failure. aborting.\n");
612 606
613 return p; 607 return p;
614} 608}
615 609
616void * 610void *
617rxvt_realloc (void *ptr, size_t size) 611rxvt_realloc (void *ptr, size_t size)
618{ 612{
619 void *p = realloc (ptr, size); 613 void *p = realloc (ptr, size);
620 614
621 if (!p) 615 if (!p)
622 rxvt_fatal ("memory allocation failure. aborting.\n"); 616 rxvt_fatal ("memory allocation failure. aborting.\n");
623 617
624 return p; 618 return p;
625} 619}
626
627/* ------------------------------------------------------------------------- *
628 * PRIVILEGED OPERATIONS *
629 * ------------------------------------------------------------------------- */
630/* take care of suid/sgid super-user (root) privileges */
631void
632rxvt_privileges (rxvt_privaction action)
633{
634#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
635 static uid_t euid;
636 static gid_t egid;
637#endif
638
639#if ! defined(__CYGWIN32__)
640# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
641 /* setreuid () is the poor man's setuid (), seteuid () */
642# define seteuid(a) setreuid(-1, (a))
643# define setegid(a) setregid(-1, (a))
644# define HAVE_SETEUID
645# endif
646# ifdef HAVE_SETEUID
647 switch (action)
648 {
649 case IGNORE:
650 /*
651 * change effective uid/gid - not real uid/gid - so we can switch
652 * back to root later, as required
653 */
654 seteuid (getuid ());
655 setegid (getgid ());
656 break;
657 case SAVE:
658 euid = geteuid ();
659 egid = getegid ();
660 break;
661 case RESTORE:
662 seteuid (euid);
663 setegid (egid);
664 break;
665 }
666# else
667 switch (action)
668 {
669 case IGNORE:
670 setuid (getuid ());
671 setgid (getgid ());
672 /* FALLTHROUGH */
673 case SAVE:
674 /* FALLTHROUGH */
675 case RESTORE:
676 break;
677 }
678# endif
679#endif
680}
681
682#ifdef UTMP_SUPPORT
683void
684rxvt_term::privileged_utmp (rxvt_privaction action)
685{
686 if ((options & Opt_utmpInhibit)
687 || !pty.name || !*pty.name)
688 return;
689
690 rxvt_privileges (RESTORE);
691
692 if (action == SAVE)
693 makeutent (pty.name, rs[Rs_display_name]);
694 else
695 cleanutent ();
696
697 rxvt_privileges (IGNORE);
698}
699#endif
700 620
701/*----------------------------------------------------------------------*/ 621/*----------------------------------------------------------------------*/
702/* 622/*
703 * window size/position calculcations for XSizeHint and other storage. 623 * window size/position calculcations for XSizeHint and other storage.
704 * if width/height are non-zero then override calculated width/height 624 * if width/height are non-zero then override calculated width/height
705 */ 625 */
706void 626void
707rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 627rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
708{ 628{
709 short recalc_x, recalc_y; 629 short recalc_x, recalc_y;
710 int x, y, sb_w, mb_h, flags; 630 int x, y, sb_w, flags;
711 unsigned int w, h; 631 unsigned int w, h;
712 unsigned int max_width, max_height; 632 unsigned int max_width, max_height;
713 dDisp;
714
715 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
716 ncol, nrow, szHint.width, szHint.height));
717 633
718 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 634 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
719 szHint.win_gravity = NorthWestGravity; 635 szHint.win_gravity = NorthWestGravity;
720 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 636 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
721 637
… …
776 max_width = MAX_COLS * fwidth; 692 max_width = MAX_COLS * fwidth;
777 max_height = MAX_ROWS * fheight; 693 max_height = MAX_ROWS * fheight;
778 694
779 szHint.base_width = szHint.base_height = 2 * int_bwidth; 695 szHint.base_width = szHint.base_height = 2 * int_bwidth;
780 696
781 sb_w = mb_h = 0; 697 sb_w = 0;
782 window_vt_x = window_vt_y = int_bwidth; 698 window_vt_x = window_vt_y = int_bwidth;
783 699
784 if (scrollbar_visible ()) 700 if (scrollBar.state)
785 { 701 {
786 sb_w = scrollbar_TotalWidth (); 702 sb_w = scrollbar_TotalWidth ();
787 szHint.base_width += sb_w; 703 szHint.base_width += sb_w;
704
788 if (!(options & Opt_scrollBar_right)) 705 if (!OPTION (Opt_scrollBar_right))
789 window_vt_x += sb_w; 706 window_vt_x += sb_w;
790 }
791
792 if (menubar_visible ())
793 {
794 mb_h = menuBar_TotalHeight ();
795 szHint.base_height += mb_h;
796 window_vt_y += mb_h;
797 } 707 }
798 708
799 szHint.width_inc = fwidth; 709 szHint.width_inc = fwidth;
800 szHint.height_inc = fheight; 710 szHint.height_inc = fheight;
801 szHint.min_width = szHint.base_width + szHint.width_inc; 711 szHint.min_width = szHint.base_width + szHint.width_inc;
… …
821 { 731 {
822 min_it (height, max_height); 732 min_it (height, max_height);
823 szHint.height = szHint.base_height + height; 733 szHint.height = szHint.base_height + height;
824 } 734 }
825 735
826 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 736 if (scrollBar.state && OPTION (Opt_scrollBar_right))
827 window_sb_x = szHint.width - sb_w; 737 window_sb_x = szHint.width - sb_w;
828 738
829 if (recalc_x) 739 if (recalc_x)
830 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 740 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
741
831 if (recalc_y) 742 if (recalc_y)
832 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 743 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
833 744
834 ncol = width / fwidth; 745 ncol = width / fwidth;
835 nrow = height / fheight; 746 nrow = height / fheight;
836 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
837 ncol, nrow, szHint.width,
838 szHint.height));
839 return;
840} 747}
841 748
842/*----------------------------------------------------------------------*/ 749/*----------------------------------------------------------------------*/
843/* 750/*
844 * Tell the teletype handler what size the window is. 751 * Tell the teletype handler what size the window is.
845 * Called after a window size change. 752 * Called after a window size change.
846 */ 753 */
847void 754void
848rxvt_term::tt_winch () 755rxvt_term::tt_winch ()
849{ 756{
850 if (pty.pty < 0) 757 if (pty->pty < 0)
851 return; 758 return;
852 759
853 struct winsize ws; 760 struct winsize ws;
854 761
855 ws.ws_col = ncol; 762 ws.ws_col = ncol;
856 ws.ws_row = nrow; 763 ws.ws_row = nrow;
857 ws.ws_xpixel = width; 764 ws.ws_xpixel = width;
858 ws.ws_ypixel = height; 765 ws.ws_ypixel = height;
859 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 766 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
860 767
861#if 0 768#if 0
862 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 769 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
863 if (cmd_pid) /* force through to the command */ 770 if (cmd_pid) /* force through to the command */
864 kill (-cmd_pid, SIGWINCH); 771 kill (-cmd_pid, SIGWINCH);
… …
900 prop.height += lineSpace; 807 prop.height += lineSpace;
901 fs->set_prop (prop); 808 fs->set_prop (prop);
902 809
903 fwidth = prop.width; 810 fwidth = prop.width;
904 fheight = prop.height; 811 fheight = prop.height;
905 fbase = (*fs)[1]->ascent; 812 fbase = prop.ascent;
906 813
907 for (int style = 1; style < 4; style++) 814 for (int style = 1; style < 4; style++)
908 { 815 {
909#if ENABLE_STYLES 816#if ENABLE_STYLES
910 const char *res = rs[Rs_font + style]; 817 const char *res = rs[Rs_font + style];
… …
944 return true; 851 return true;
945} 852}
946 853
947void rxvt_term::set_string_property (Atom prop, const char *str, int len) 854void rxvt_term::set_string_property (Atom prop, const char *str, int len)
948{ 855{
949 XChangeProperty (display->display, parent[0], 856 XChangeProperty (xdisp, parent[0],
950 prop, XA_STRING, 8, PropModeReplace, 857 prop, XA_STRING, 8, PropModeReplace,
951 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 858 (const unsigned char *)str, len >= 0 ? len : strlen (str));
952} 859}
953 860
954void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 861void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
955{ 862{
956 wchar_t *ws = rxvt_mbstowcs (str, len); 863 wchar_t *ws = rxvt_mbstowcs (str, len);
957 char *s = rxvt_wcstoutf8 (ws); 864 char *s = rxvt_wcstoutf8 (ws);
958 865
959 XChangeProperty (display->display, parent[0], 866 XChangeProperty (xdisp, parent[0],
960 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
961 (const unsigned char *)s, strlen (s)); 868 (const unsigned char *)s, strlen (s));
962 869
963 free (s); 870 free (s);
964 free (ws); 871 free (ws);
… …
989void 896void
990rxvt_term::set_window_color (int idx, const char *color) 897rxvt_term::set_window_color (int idx, const char *color)
991{ 898{
992 rxvt_color xcol; 899 rxvt_color xcol;
993 int i; 900 int i;
994 901
995 if (color == NULL || *color == '\0') 902 if (color == NULL || *color == '\0')
996 return; 903 return;
904
905 color = strdup (color);
906 allocated.push_back ((void *)color);
907 rs[Rs_color + idx] = color;
997 908
998 /* handle color aliases */ 909 /* handle color aliases */
999 if (isdigit (*color)) 910 if (isdigit (*color))
1000 { 911 {
1001 i = atoi (color); 912 i = atoi (color);
1002 913
1003 if (i >= 8 && i <= 15) 914 if (i >= 8 && i <= 15)
1004 { /* bright colors */ 915 { /* bright colors */
1005 i -= 8; 916 i -= 8;
1006# ifndef NO_BRIGHTCOLOR
1007 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 917 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1008 SET_PIXCOLOR (idx);
1009 goto done; 918 goto done;
1010# endif
1011 } 919 }
1012 920
1013 if (i >= 0 && i <= 7) 921 if (i >= 0 && i <= 7)
1014 { /* normal colors */ 922 { /* normal colors */
1015 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 923 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1016 SET_PIXCOLOR (idx);
1017 goto done; 924 goto done;
1018 } 925 }
1019 } 926 }
1020 927
1021 if (!rXParseAllocColor (&xcol, color)) 928 set_color (xcol, color);
1022 return;
1023
1024 /* XStoreColor (display->display, display->cmap, XColor*); */
1025 929
1026 /* 930 /*
1027 * FIXME: should free colors here, but no idea how to do it so instead, 931 * FIXME: should free colors here, but no idea how to do it so instead,
1028 * so just keep gobbling up the colormap 932 * so just keep gobbling up the colormap
1029 */ 933 */
1030# if 0
1031 for (i = Color_Black; i <= Color_White; i++)
1032 if (pix_colors[idx] == pix_colors[i])
1033 break;
1034 if (i > Color_White)
1035 {
1036 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1037 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1038 DisplayPlanes (display->display, display->screen));
1039 }
1040# endif
1041 934
1042 pix_colors_focused[idx] = xcol; 935 pix_colors_focused[idx] = xcol;
1043 SET_PIXCOLOR (idx);
1044 936
1045 /* XSetWindowAttributes attr; */ 937 /* XSetWindowAttributes attr; */
1046 /* Cursor cursor; */ 938 /* Cursor cursor; */
1047done: 939done:
1048 940
1049#if OFF_FOCUS_FADING 941#if OFF_FOCUS_FADING
1050 if (rs[Rs_fade]) 942 if (rs[Rs_fade])
1051 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 943 {
944 rgba c;
945 pix_colors [Color_fade].get (c);
946 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
947 }
1052#endif 948#endif
1053 949
1054 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
1055 951
1056 recolour_cursor (); 952 recolour_cursor ();
… …
1062#endif /* XTERM_COLOR_CHANGE */ 958#endif /* XTERM_COLOR_CHANGE */
1063 959
1064void 960void
1065rxvt_term::recolour_cursor () 961rxvt_term::recolour_cursor ()
1066{ 962{
1067 XColor xcol[2]; 963 XColor fg, bg;
1068 964
1069 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 965 (ISSET_PIXCOLOR (Color_pointer_fg)
1070 ? pix_colors_focused[Color_pointer_fg] 966 ? pix_colors_focused[Color_pointer_fg]
1071 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg]).get (fg);
968
1072 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 969 (ISSET_PIXCOLOR (Color_pointer_bg)
1073 ? pix_colors_focused[Color_pointer_bg] 970 ? pix_colors_focused[Color_pointer_bg]
1074 : pix_colors_focused[Color_bg]; 971 : pix_colors_focused[Color_bg]).get (bg);
1075 972
1076 XQueryColors (display->display, display->cmap, xcol, 2); 973 XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg);
1077 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1078} 974}
1079 975
1080/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1081/* 977/*
1082 * find if fg/bg matches any of the normal (low-intensity) colors 978 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1086{ 982{
1087 unsigned int i; 983 unsigned int i;
1088 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1089 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1090 986
1091 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1092 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1093 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1094 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1095 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1096 { 991 {
… …
1111 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1112} 1007}
1113 1008
1114/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1115 1010
1116int 1011bool
1117rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::set_color (rxvt_color &color, const char *name)
1118{ 1013{
1119 if (!screen_in_out->set (display, colour)) 1014 if (color.set (this, name))
1120 {
1121 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1122 return false;
1123 }
1124
1125 return true; 1015 return true;
1016
1017 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1018 return false;
1019}
1020
1021void
1022rxvt_term::alias_color (int dst, int src)
1023{
1024 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1126} 1025}
1127 1026
1128/* -------------------------------------------------------------------- * 1027/* -------------------------------------------------------------------- *
1129 * - WINDOW RESIZING - * 1028 * - WINDOW RESIZING - *
1130 * -------------------------------------------------------------------- */ 1029 * -------------------------------------------------------------------- */
1131void 1030void
1132rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1031rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1133{ 1032{
1134 int fix_screen; 1033 int fix_screen;
1135 int old_width = szHint.width, old_height = szHint.height; 1034 int old_width = szHint.width;
1136 dDisp; 1035 int old_height = szHint.height;
1137 1036
1138 window_calc (newwidth, newheight); 1037 window_calc (newwidth, newheight);
1139 XSetWMNormalHints (disp, parent[0], &szHint); 1038 XSetWMNormalHints (xdisp, parent[0], &szHint);
1140 1039
1141 if (!ignoreparent) 1040 if (!ignoreparent)
1142 { 1041 {
1143#ifdef SMART_RESIZE 1042#ifdef SMART_RESIZE
1144 /* 1043 /*
… …
1148 int x, y, x1, y1; 1047 int x, y, x1, y1;
1149 int dx, dy; 1048 int dx, dy;
1150 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1049 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1151 Window unused_cr; 1050 Window unused_cr;
1152 1051
1153 XTranslateCoordinates (disp, parent[0], display->root, 1052 XTranslateCoordinates (xdisp, parent[0], display->root,
1154 0, 0, &x, &y, &unused_cr); 1053 0, 0, &x, &y, &unused_cr);
1155 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1054 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1156 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1055 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1157 /* 1056 /*
1158 * if display->root isn't the parent window, a WM will probably have offset 1057 * if display->root isn't the parent window, a WM will probably have offset
1159 * our position for handles and decorations. Counter it 1058 * our position for handles and decorations. Counter it
1160 */ 1059 */
… …
1162 { 1061 {
1163 x -= x1; 1062 x -= x1;
1164 y -= y1; 1063 y -= y1;
1165 } 1064 }
1166 1065
1167 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1066 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1168 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1067 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1169 dx = old_width - szHint.width; 1068 dx = old_width - szHint.width;
1170 dy = old_height - szHint.height; 1069 dy = old_height - szHint.height;
1171 1070
1172 /* Check position of the center of the window */ 1071 /* Check position of the center of the window */
1173 if (x < x1) /* left half */ 1072 if (x < x1) /* left half */
1174 dx = 0; 1073 dx = 0;
… …
1177 if (y < y1) /* top half */ 1076 if (y < y1) /* top half */
1178 dy = 0; 1077 dy = 0;
1179 else if (y == y1) /* exact center */ 1078 else if (y == y1) /* exact center */
1180 dy /= 2; 1079 dy /= 2;
1181 1080
1182 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1081 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1183 szHint.width, szHint.height); 1082 szHint.width, szHint.height);
1184#else 1083#else
1185 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1084 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1186#endif 1085#endif
1187 } 1086 }
1188 1087
1189 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1088 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1190 1089
1191 if (fix_screen || newwidth != old_width || newheight != old_height) 1090 if (fix_screen || newwidth != old_width || newheight != old_height)
1192 { 1091 {
1193 if (scrollbar_visible ()) 1092 if (scrollBar.state)
1194 { 1093 {
1195 XMoveResizeWindow (disp, scrollBar.win, 1094 XMoveResizeWindow (xdisp, scrollBar.win,
1196 window_sb_x, 0, 1095 window_sb_x, 0,
1197 scrollbar_TotalWidth (), szHint.height); 1096 scrollbar_TotalWidth (), szHint.height);
1198 resize_scrollbar (); 1097 resize_scrollbar ();
1199 } 1098 }
1200 1099
1201 if (menubar_visible ())
1202 XMoveResizeWindow (disp, menuBar.win,
1203 window_vt_x, 0,
1204 TermWin_TotalWidth (), menuBar_TotalHeight ());
1205
1206 XMoveResizeWindow (disp, vt, 1100 XMoveResizeWindow (xdisp, vt,
1207 window_vt_x, window_vt_y, 1101 window_vt_x, window_vt_y,
1208 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1102 width, height);
1209 1103
1210 scr_clear (); 1104 scr_clear ();
1211#ifdef XPM_BACKGROUND 1105#ifdef XPM_BACKGROUND
1212 resize_pixmap (); 1106 resize_pixmap ();
1213#endif 1107#endif
1214 } 1108 }
1215 1109
1216 if (fix_screen || old_height == 0) 1110 if (fix_screen || old_height == 0)
1217 {
1218 int curr_screen = -1;
1219 int old_ncol = prev_ncol;
1220
1221 /* scr_reset only works on the primary screen */
1222 if (old_height) /* this is not the first time through */
1223 {
1224 unsigned int ocol = ncol;
1225 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1226 curr_screen = scr_change_screen (PRIMARY);
1227 ncol = ocol;
1228 }
1229
1230 scr_reset (); 1111 scr_reset ();
1231 1112
1232 if (curr_screen >= 0) /* this is not the first time through */ 1113 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1233 { 1114 //scr_touch (false);
1234 scr_change_screen (curr_screen);
1235 selection_check (old_ncol != ncol ? 4 : 0);
1236 }
1237 }
1238
1239 old_width = szHint.width;
1240 old_height = szHint.height;
1241 1115
1242#ifdef XPM_BACKGROUND 1116#ifdef XPM_BACKGROUND
1243 if (pixmap) 1117 if (pixmap)
1244 scr_touch (false); 1118 scr_touch (false);
1245#endif 1119#endif
… …
1258{ 1132{
1259 XWindowAttributes wattr; 1133 XWindowAttributes wattr;
1260 1134
1261 if (newwidth == 0 || newheight == 0) 1135 if (newwidth == 0 || newheight == 0)
1262 { 1136 {
1263 XGetWindowAttributes (display->display, display->root, &wattr); 1137 XGetWindowAttributes (xdisp, display->root, &wattr);
1264 1138
1265 if (newwidth == 0) 1139 if (newwidth == 0)
1266 newwidth = wattr.width - szHint.base_width; 1140 newwidth = wattr.width - szHint.base_width;
1267 if (newheight == 0) 1141 if (newheight == 0)
1268 newheight = wattr.height - szHint.base_height; 1142 newheight = wattr.height - szHint.base_height;
… …
1282#ifdef USE_XIM 1156#ifdef USE_XIM
1283 1157
1284void 1158void
1285rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1159rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1286{ 1160{
1287 fg = pix_colors[Color_fg]; 1161 fg = pix_colors [Color_fg];
1288 bg = pix_colors[Color_bg]; 1162 bg = pix_colors [Color_bg];
1289} 1163}
1290 1164
1291void 1165void
1292rxvt_term::im_set_size (XRectangle &size) 1166rxvt_term::im_set_size (XRectangle &size)
1293{ 1167{
… …
1330 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1204 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1331 1205
1332 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1206 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1333 *p = '\0'; 1207 *p = '\0';
1334 1208
1335 atom = XInternAtom (display->display, server, False); 1209 atom = XInternAtom (xdisp, server, False);
1336 win = XGetSelectionOwner (display->display, atom); 1210 win = XGetSelectionOwner (xdisp, atom);
1337 1211
1338 if (win != None) 1212 if (win != None)
1339 return True; 1213 return True;
1340 } 1214 }
1341 1215
… …
1348 XPoint nspot; 1222 XPoint nspot;
1349 XVaNestedList preedit_attr; 1223 XVaNestedList preedit_attr;
1350 1224
1351 if (!Input_Context 1225 if (!Input_Context
1352 || !focus 1226 || !focus
1353 || !(input_style & XIMPreeditPosition)) 1227 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1354 return; 1228 return;
1355 1229
1356 im_set_position (nspot); 1230 im_set_position (nspot);
1357 1231
1358 if (nspot.x == spot.x && nspot.y == spot.y) 1232 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1377 input_method = 0; 1251 input_method = 0;
1378 } 1252 }
1379 1253
1380 Input_Context = 0; 1254 Input_Context = 0;
1381} 1255}
1256
1257#ifdef ENABLE_XIM_ONTHESPOT
1258
1259static void
1260xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1261{
1262 ((rxvt_term *)client_data)->make_current ();
1263 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1264}
1265
1266static void
1267xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1268{
1269 ((rxvt_term *)client_data)->make_current ();
1270 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1271}
1272
1273static void
1274xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1275{
1276 rxvt_term *term = (rxvt_term *)client_data;
1277 XIMText *text = call_data->text;
1278
1279 term->make_current ();
1280
1281 if (text)
1282 {
1283 void *str;
1284
1285 if (!text->encoding_is_wchar && text->string.multi_byte)
1286 {
1287 // of course, X makes it ugly again
1288 if (term->rs[Rs_imLocale])
1289 SET_LOCALE (term->rs[Rs_imLocale]);
1290
1291 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1292 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1293
1294 if (term->rs[Rs_imLocale])
1295 SET_LOCALE (term->locale);
1296 }
1297 else
1298 str = (void *)text->string.wide_char;
1299
1300 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1301 DT_INT, call_data->caret,
1302 DT_INT, call_data->chg_first,
1303 DT_INT, call_data->chg_length,
1304 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1305 DT_WCS_LEN, str, str ? (int)text->length : 0,
1306 DT_END));
1307 }
1308 else
1309 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1310 DT_INT, call_data->caret,
1311 DT_INT, call_data->chg_first,
1312 DT_INT, call_data->chg_length,
1313 DT_END));
1314}
1315
1316#if 0
1317static void
1318xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1319{
1320 ((rxvt_term *)client_data)->make_current ();
1321 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1322 DT_INT, call_data->position,
1323 DT_INT, call_data->direction,
1324 DT_INT, call_data->style,
1325 DT_END));
1326}
1327#endif
1328
1329#endif
1382 1330
1383/* 1331/*
1384 * Try to open a XIM with the current modifiers, then see if we can 1332 * Try to open a XIM with the current modifiers, then see if we can
1385 * open a suitable preedit type 1333 * open a suitable preedit type
1386 */ 1334 */
… …
1393 XRectangle rect, status_rect, needed_rect; 1341 XRectangle rect, status_rect, needed_rect;
1394 unsigned long fg, bg; 1342 unsigned long fg, bg;
1395 const char *p; 1343 const char *p;
1396 char **s; 1344 char **s;
1397 XIMStyles *xim_styles; 1345 XIMStyles *xim_styles;
1346#ifdef ENABLE_XIM_ONTHESPOT
1347 XIMCallback xcb[4];
1348#endif
1349
1350 set_environ (envv);
1398 1351
1399 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1352 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1400 return false; 1353 return false;
1401 1354
1402 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1403 input_method = display->get_xim (locale, modifiers); 1355 input_method = display->get_xim (locale, modifiers);
1404 if (input_method == NULL) 1356 if (input_method == NULL)
1405 return false; 1357 return false;
1406 1358
1407 xim = input_method->xim; 1359 xim = input_method->xim;
… …
1427 s = rxvt_splitcommastring (p); 1379 s = rxvt_splitcommastring (p);
1428 1380
1429 for (i = found = 0; !found && s[i]; i++) 1381 for (i = found = 0; !found && s[i]; i++)
1430 { 1382 {
1431 if (!strcmp (s[i], "OverTheSpot")) 1383 if (!strcmp (s[i], "OverTheSpot"))
1432 input_style = (XIMPreeditPosition | XIMStatusNothing); 1384 input_style = XIMPreeditPosition | XIMStatusNothing;
1433 else if (!strcmp (s[i], "OffTheSpot")) 1385 else if (!strcmp (s[i], "OffTheSpot"))
1434 input_style = (XIMPreeditArea | XIMStatusArea); 1386 input_style = XIMPreeditArea | XIMStatusArea;
1435 else if (!strcmp (s[i], "Root")) 1387 else if (!strcmp (s[i], "Root"))
1436 input_style = (XIMPreeditNothing | XIMStatusNothing); 1388 input_style = XIMPreeditNothing | XIMStatusNothing;
1437 else if (!strcmp (s[i], "None")) 1389 else if (!strcmp (s[i], "None"))
1438 input_style = (XIMPreeditNone | XIMStatusNone); 1390 input_style = XIMPreeditNone | XIMStatusNone;
1391#ifdef ENABLE_XIM_ONTHESPOT
1392 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1393 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1394#endif
1395 else
1396 input_style = XIMPreeditNothing | XIMStatusNothing;
1439 1397
1440 for (j = 0; j < xim_styles->count_styles; j++) 1398 for (j = 0; j < xim_styles->count_styles; j++)
1441 if (input_style == xim_styles->supported_styles[j]) 1399 if (input_style == xim_styles->supported_styles[j])
1442 { 1400 {
1443 rxvt_freecommastring (s); 1401 rxvt_freecommastring (s);
… …
1481 "*", 1439 "*",
1482 fheight, 1440 fheight,
1483 fheight + 1, fheight - 1, 1441 fheight + 1, fheight - 1,
1484 fheight - 2, fheight + 2); 1442 fheight - 2, fheight + 2);
1485 1443
1486 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1444 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1487 &missing_charset_list, &missing_charset_count, &def_string); 1445 &missing_charset_list, &missing_charset_count, &def_string);
1488 1446
1489 if (missing_charset_list) 1447 if (missing_charset_list)
1490 XFreeStringList (missing_charset_list); 1448 XFreeStringList (missing_charset_list);
1491 1449
… …
1532 XNBackground, bg, 1490 XNBackground, bg,
1533 XNArea, &status_rect, 1491 XNArea, &status_rect,
1534 XNFontSet, fs, 1492 XNFontSet, fs,
1535 NULL); 1493 NULL);
1536 } 1494 }
1495#if ENABLE_XIM_ONTHESPOT
1496 else if (input_style & XIMPreeditCallbacks)
1497 {
1498 im_set_position (spot);
1499
1500 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1501 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1502 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1503# if 0
1504 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1505# endif
1506
1507 preedit_attr = XVaCreateNestedList (0,
1508 XNSpotLocation, &spot,
1509 XNPreeditStartCallback, &xcb[0],
1510 XNPreeditDoneCallback , &xcb[1],
1511 XNPreeditDrawCallback , &xcb[2],
1512# if 0
1513 XNPreeditCaretCallback, &xcb[3],
1514# endif
1515 NULL);
1516 }
1517#endif
1537 1518
1538 Input_Context = XCreateIC (xim, 1519 Input_Context = XCreateIC (xim,
1539 XNInputStyle, input_style, 1520 XNInputStyle, input_style,
1540 XNClientWindow, vt, 1521 XNClientWindow, vt,
1541 XNFocusWindow, parent[0], 1522 XNFocusWindow, parent[0],
… …
1544 status_attr ? XNStatusAttributes : NULL, 1525 status_attr ? XNStatusAttributes : NULL,
1545 status_attr, NULL); 1526 status_attr, NULL);
1546 1527
1547 if (preedit_attr) XFree (preedit_attr); 1528 if (preedit_attr) XFree (preedit_attr);
1548 if (status_attr) XFree (status_attr); 1529 if (status_attr) XFree (status_attr);
1549 if (fs) XFreeFontSet (display->display, fs); 1530 if (fs) XFreeFontSet (xdisp, fs);
1550 1531
1551 if (Input_Context == NULL) 1532 if (Input_Context == NULL)
1552 { 1533 {
1553 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1534 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1554 im_destroy (); 1535 im_destroy ();
1555 return false; 1536 return false;
1556 } 1537 }
1557 1538
1539#if 0
1540 // unfortunately, only the focus window is used by XIM, hard to fix
1541 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1542 vt_select_input ();
1543#endif
1544
1558 if (input_style & XIMPreeditArea) 1545 if (input_style & XIMPreeditArea)
1559 IMSetStatusPosition (); 1546 IMSetStatusPosition ();
1560 1547
1561 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1562 return true; 1548 return true;
1563} 1549}
1564 1550
1565void 1551void
1566rxvt_term::im_cb () 1552rxvt_term::im_cb ()
… …
1568 int i; 1554 int i;
1569 const char *p; 1555 const char *p;
1570 char **s; 1556 char **s;
1571 char buf[IMBUFSIZ]; 1557 char buf[IMBUFSIZ];
1572 1558
1573 SET_R (this); 1559 make_current ();
1574 1560
1575 im_destroy (); 1561 im_destroy ();
1576 1562
1577 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1578 if (Input_Context) 1563 if (Input_Context)
1579 return; 1564 return;
1580 1565
1581#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1566#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1582 if (rs[Rs_imLocale]) 1567 if (rs[Rs_imLocale])
… …
1655 XFree (preedit_attr); 1640 XFree (preedit_attr);
1656 XFree (status_attr); 1641 XFree (status_attr);
1657} 1642}
1658#endif /* USE_XIM */ 1643#endif /* USE_XIM */
1659 1644
1660/*----------------------------------------------------------------------*/
1661rxvt_t rxvt_current_term;
1662
1663/*----------------------- end-of-file (C source) -----------------------*/ 1645/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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