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.155 by root, Mon Jan 2 15:35:43 2006 UTC vs.
Revision 1.210 by root, Tue Jan 31 16:19:16 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.
… …
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 50
51vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
52 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
53static char curlocale[128]; 56static char curlocale[128], savelocale[128];
54 57
55bool 58bool
56rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
57{ 60{
58 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
59 return false; 62 return false;
60 63
61 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
63 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);
64} 80}
65 81
66#if ENABLE_COMBINING 82#if ENABLE_COMBINING
67class rxvt_composite_vec rxvt_composite; 83class rxvt_composite_vec rxvt_composite;
68 84
… …
133 rootwin_ev (this, &rxvt_term::rootwin_cb), 149 rootwin_ev (this, &rxvt_term::rootwin_cb),
134#endif 150#endif
135#ifdef HAVE_SCROLLBARS 151#ifdef HAVE_SCROLLBARS
136 scrollbar_ev (this, &rxvt_term::x_cb), 152 scrollbar_ev (this, &rxvt_term::x_cb),
137#endif 153#endif
138#ifdef MENUBAR
139 menubar_ev (this, &rxvt_term::x_cb),
140#endif
141#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
142 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
143#endif 156#endif
144#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
145 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
157 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
158#endif 171#endif
159#ifdef USE_XIM 172#ifdef USE_XIM
160 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
161#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
162 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
163 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
164 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
165 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
166 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
167 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
168 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
171 188
172 termlist.push_back (this); 189 termlist.push_back (this);
173 190
174#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
175 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
176
177 if (!keyboard)
178 rxvt_fatal ("out of memory, aborting.\n");
179#endif 193#endif
180} 194}
181 195
182// 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.
183// for use before an emergency exit 197// for use before an emergency exit
184void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
185{ 199{
186 if (cmd_pid) 200 if (cmd_pid)
187 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
188 202
189#ifdef UTMP_SUPPORT 203 delete pty; pty = 0;
190 privileged_utmp (RESTORE);
191#endif
192
193 pty.put ();
194} 204}
195 205
196rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
197{ 207{
198 PERL_INVOKE ((this, HOOK_DESTROY, DT_END));
199
200 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
201 209
202 emergency_cleanup (); 210 emergency_cleanup ();
203 211
204#if ENABLE_STYLES 212#if ENABLE_STYLES
… …
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]);
256
257 clear ();
258 } 258 }
259 259
260 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
261
262 delete pix_colors_focused; 261 delete pix_colors_focused;
263#if OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
264 delete pix_colors_unfocused; 263 delete pix_colors_unfocused;
265#endif 264#endif
266 265
… …
272 for (int i = 0; i < allocated.size (); i++) 271 for (int i = 0; i < allocated.size (); i++)
273 free (allocated [i]); 272 free (allocated [i]);
274 273
275 free (selection.text); 274 free (selection.text);
276 // TODO: manage env vars in child only(!) 275 // TODO: manage env vars in child only(!)
277 free (env_windowid);
278 free (env_display); 276 free (env_display);
279 free (env_term); 277 free (env_term);
280 free (env_colorfgbg);
281 free (locale); 278 free (locale);
282 free (v_buffer); 279 free (v_buffer);
283 free (incr_buf); 280 free (incr_buf);
284 281
285 delete envv; 282 delete envv;
… …
288#ifdef KEYSYM_RESOURCE 285#ifdef KEYSYM_RESOURCE
289 delete keyboard; 286 delete keyboard;
290#endif 287#endif
291} 288}
292 289
290// child has exited, usually destroys
293void 291void
294rxvt_term::child_exit () 292rxvt_term::child_cb (child_watcher &w, int status)
295{ 293{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295
296 cmd_pid = 0; 296 cmd_pid = 0;
297 297
298 if (!OPTION (Opt_hold)) 298 if (!OPTION (Opt_hold))
299 destroy (); 299 destroy ();
300} 300}
… …
303rxvt_term::destroy () 303rxvt_term::destroy ()
304{ 304{
305 if (destroy_ev.active) 305 if (destroy_ev.active)
306 return; 306 return;
307 307
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
309
308#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
309 scr_overlay_off (); 311 scr_overlay_off ();
310#endif 312#endif
311 313
312 if (display) 314 if (display)
… …
314#if USE_XIM 316#if USE_XIM
315 im_ev.stop (display); 317 im_ev.stop (display);
316#endif 318#endif
317#if HAVE_SCROLLBARS 319#if HAVE_SCROLLBARS
318 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
319#endif
320#if MENUBAR
321 menubar_ev.stop (display);
322#endif 321#endif
323#if TRANSPARENT 322#if TRANSPARENT
324 rootwin_ev.stop (display); 323 rootwin_ev.stop (display);
325#endif 324#endif
326 incr_ev.stop (); 325 incr_ev.stop ();
… …
350} 349}
351 350
352void 351void
353rxvt_term::destroy_cb (time_watcher &w) 352rxvt_term::destroy_cb (time_watcher &w)
354{ 353{
355 SET_R (this); 354 make_current ();
356 355
357 delete this; 356 delete this;
358} 357}
359 358
360/*----------------------------------------------------------------------*/ 359/*----------------------------------------------------------------------*/
… …
369{ 368{
370 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
371 (*t)->emergency_cleanup (); 370 (*t)->emergency_cleanup ();
372} 371}
373 372
374#if ENABLE_FRILLS 373#if !ENABLE_MINIMAL
375static void 374static void
376print_x_error (Display *dpy, XErrorEvent *event) 375print_x_error (Display *dpy, XErrorEvent *event)
377{ 376{
378 char buffer[BUFSIZ]; 377 char buffer[BUFSIZ];
379 char mesg[BUFSIZ]; 378 char mesg[BUFSIZ];
… …
427 GET_R->allowedxerror = event->error_code; 426 GET_R->allowedxerror = event->error_code;
428 else 427 else
429 { 428 {
430 // GET_R is most likely not the terminal which caused the error, 429 // GET_R is most likely not the terminal which caused the error,
431 // so just output the error and continue 430 // so just output the error and continue
432#if ENABLE_FRILLS 431#if ENABLE_MINIMAL
432 old_xerror_handler (display, event);
433#else
433 print_x_error (display, event); 434 print_x_error (display, event);
434#else
435 old_xerror_handler (display, event);
436#endif 435#endif
437 } 436 }
438 437
439 return 0; 438 return 0;
440} 439}
… …
448 _exit (EXIT_FAILURE); 447 _exit (EXIT_FAILURE);
449} 448}
450 449
451/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
452bool 451bool
453rxvt_term::init (int argc, const char *const *argv) 452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
454{ 453{
454 this->envv = envv;
455
455 SET_R (this); 456 SET_R (this);
456
457 set_locale (""); 457 set_locale ("");
458 set_environ (envv); // few things in X do not call setlocale :(
458 459
459 if (!init_vars ()) 460 if (!init_vars ())
460 return false; 461 return false;
461 462
462 init_secondary (); 463 init_secondary ();
… …
465 466
466#ifdef KEYSYM_RESOURCE 467#ifdef KEYSYM_RESOURCE
467 keyboard->register_done (); 468 keyboard->register_done ();
468#endif 469#endif
469 470
470#if MENUBAR_MAX
471 menubar_read (rs[Rs_menu]);
472#endif
473#ifdef HAVE_SCROLLBARS 471#ifdef HAVE_SCROLLBARS
474 if (OPTION (Opt_scrollBar)) 472 if (OPTION (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */ 473 scrollBar.setIdle (); /* set existence for size calculations */
476#endif 474#endif
477 475
478#if ENABLE_PERL 476 pty = ptytty::create ();
479 rxvt_perl.init ();
480#endif
481
482 PERL_INVOKE ((this, HOOK_INIT, DT_END));
483 477
484 create_windows (argc, argv); 478 create_windows (argc, argv);
485 479
486 dDisp;
487
488 init_xlocale (); 480 init_xlocale ();
489 481
490 scr_reset (); /* initialize screen */ 482 scr_reset (); // initialize screen
491 483
492#if 0 484#if 0
493 XSynchronize (disp, True); 485 XSynchronize (xdisp, True);
494#endif 486#endif
495 487
496#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
497 if (OPTION (Opt_scrollBar)) 489 if (OPTION (Opt_scrollBar))
498 resize_scrollbar (); /* create and map scrollbar */ 490 resize_scrollbar (); /* create and map scrollbar */
499#endif 491#endif
500#if (MENUBAR_MAX)
501 if (menubar_visible ())
502 XMapWindow (disp, menuBar.win);
503#endif
504#ifdef TRANSPARENT 492#ifdef TRANSPARENT
505 if (OPTION (Opt_transparent)) 493 if (OPTION (Opt_transparent))
506 { 494 {
507 XSelectInput (disp, display->root, PropertyChangeMask); 495 XSelectInput (xdisp, display->root, PropertyChangeMask);
508 check_our_parents (); 496 check_our_parents ();
509 rootwin_ev.start (display, display->root); 497 rootwin_ev.start (display, display->root);
510 } 498 }
511#endif 499#endif
512 500
513 XMapWindow (disp, vt);
514 XMapWindow (disp, parent[0]);
515
516 set_colorfgbg (); 501 set_colorfgbg ();
517 502
518 init_command (cmd_argv); 503 init_command (cmd_argv);
519 504
520 free (cmd_argv); 505 free (cmd_argv);
521 506
507 if (pty->pty >= 0)
522 pty_ev.start (pty.pty, EVENT_READ); 508 pty_ev.start (pty->pty, EVENT_READ);
523 509
524 check_ev.start (); 510 check_ev.start ();
525 511
526 PERL_INVOKE ((this, HOOK_START, DT_END)); 512 HOOK_INVOKE ((this, HOOK_START, DT_END));
513
514#if ENABLE_XEMBED
515 if (rs[Rs_embed])
516 {
517 long info[2] = { 0, XEMBED_MAPPED };
518
519 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2);
521 }
522#endif
523
524 XMapWindow (xdisp, vt);
525 XMapWindow (xdisp, parent[0]);
527 526
528 return true; 527 return true;
529} 528}
530 529
531static struct sig_handlers 530static struct sig_handlers
532{ 531{
533 sig_watcher sw_chld, sw_term, sw_int; 532 sig_watcher sw_term, sw_int;
534 533
535 void sig_chld (sig_watcher &w)
536 {
537 // we are being called for every SIGCHLD, find the corresponding term
538 int pid;
539
540 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
541 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
542 if (pid == (*t)->cmd_pid)
543 {
544 (*t)->child_exit ();
545 break;
546 }
547 }
548
549 /* 534 /*
550 * Catch a fatal signal and tidy up before quitting 535 * Catch a fatal signal and tidy up before quitting
551 */ 536 */
552 void 537 void
553 sig_term (sig_watcher &w) 538 sig_term (sig_watcher &w)
554 { 539 {
555#ifdef DEBUG_CMD
556 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
557#endif
558 rxvt_emergency_cleanup (); 540 rxvt_emergency_cleanup ();
559 signal (w.signum, SIG_DFL); 541 signal (w.signum, SIG_DFL);
560 kill (getpid (), w.signum); 542 kill (getpid (), w.signum);
561 } 543 }
562 544
563 sig_handlers () 545 sig_handlers ()
564 : sw_chld (this, &sig_handlers::sig_chld),
565 sw_term (this, &sig_handlers::sig_term), 546 : sw_term (this, &sig_handlers::sig_term),
566 sw_int (this, &sig_handlers::sig_term) 547 sw_int (this, &sig_handlers::sig_term)
567 { 548 {
568 } 549 }
569} sig_handlers; 550} sig_handlers;
570 551
552char **rxvt_environ; // startup environment
553
571void 554void
572rxvt_init () 555rxvt_init ()
573{ 556{
574 /* 557 ptytty::init ();
575 * Save and then give up any super-user privileges 558
576 * If we need privileges in any area then we must specifically request it. 559 rxvt_environ = environ;
577 * We should only need to be root in these cases:
578 * 1. write utmp entries on some systems
579 * 2. chown tty on some systems
580 */
581 rxvt_privileges (SAVE);
582 rxvt_privileges (IGNORE);
583 560
584 signal (SIGHUP, SIG_IGN); 561 signal (SIGHUP, SIG_IGN);
585 signal (SIGPIPE, SIG_IGN); 562 signal (SIGPIPE, SIG_IGN);
586 563
587 sig_handlers.sw_chld.start (SIGCHLD);
588 sig_handlers.sw_term.start (SIGTERM); 564 sig_handlers.sw_term.start (SIGTERM);
589 sig_handlers.sw_int.start (SIGINT); 565 sig_handlers.sw_int.start (SIGINT);
590 566
591 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 567 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
592 /* signal (SIGURG, SIG_DFL); */ 568 /* signal (SIGURG, SIG_DFL); */
593 569
594 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 570 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
595 // TODO: handle this with exceptions and tolerate the memory loss 571 // TODO: handle this with exceptions and tolerate the memory loss
596 XSetIOErrorHandler (rxvt_xioerror_handler); 572 XSetIOErrorHandler (rxvt_xioerror_handler);
573
574 XrmInitialize ();
597} 575}
598 576
599/* ------------------------------------------------------------------------- * 577/* ------------------------------------------------------------------------- *
600 * MEMORY ALLOCATION WRAPPERS * 578 * MEMORY ALLOCATION WRAPPERS *
601 * ------------------------------------------------------------------------- */ 579 * ------------------------------------------------------------------------- */
… …
619 rxvt_fatal ("memory allocation failure. aborting.\n"); 597 rxvt_fatal ("memory allocation failure. aborting.\n");
620 598
621 return p; 599 return p;
622} 600}
623 601
624void * 602void *
625rxvt_realloc (void *ptr, size_t size) 603rxvt_realloc (void *ptr, size_t size)
626{ 604{
627 void *p = realloc (ptr, size); 605 void *p = realloc (ptr, size);
628 606
629 if (!p) 607 if (!p)
630 rxvt_fatal ("memory allocation failure. aborting.\n"); 608 rxvt_fatal ("memory allocation failure. aborting.\n");
631 609
632 return p; 610 return p;
633} 611}
634
635/* ------------------------------------------------------------------------- *
636 * PRIVILEGED OPERATIONS *
637 * ------------------------------------------------------------------------- */
638/* take care of suid/sgid super-user (root) privileges */
639void
640rxvt_privileges (rxvt_privaction action)
641{
642#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
643 static uid_t euid;
644 static gid_t egid;
645#endif
646
647#if ! defined(__CYGWIN32__)
648# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
649 /* setreuid () is the poor man's setuid (), seteuid () */
650# define seteuid(a) setreuid(-1, (a))
651# define setegid(a) setregid(-1, (a))
652# define HAVE_SETEUID
653# endif
654# ifdef HAVE_SETEUID
655 switch (action)
656 {
657 case IGNORE:
658 /*
659 * change effective uid/gid - not real uid/gid - so we can switch
660 * back to root later, as required
661 */
662 seteuid (getuid ());
663 setegid (getgid ());
664 break;
665 case SAVE:
666 euid = geteuid ();
667 egid = getegid ();
668 break;
669 case RESTORE:
670 seteuid (euid);
671 setegid (egid);
672 break;
673 }
674# else
675 switch (action)
676 {
677 case IGNORE:
678 setuid (getuid ());
679 setgid (getgid ());
680 /* FALLTHROUGH */
681 case SAVE:
682 /* FALLTHROUGH */
683 case RESTORE:
684 break;
685 }
686# endif
687#endif
688}
689
690#ifdef UTMP_SUPPORT
691void
692rxvt_term::privileged_utmp (rxvt_privaction action)
693{
694 if (OPTION (Opt_utmpInhibit)
695 || !pty.name || !*pty.name)
696 return;
697
698 rxvt_privileges (RESTORE);
699
700 if (action == SAVE)
701 makeutent (pty.name, rs[Rs_display_name]);
702 else
703 cleanutent ();
704
705 rxvt_privileges (IGNORE);
706}
707#endif
708 612
709/*----------------------------------------------------------------------*/ 613/*----------------------------------------------------------------------*/
710/* 614/*
711 * window size/position calculcations for XSizeHint and other storage. 615 * window size/position calculcations for XSizeHint and other storage.
712 * if width/height are non-zero then override calculated width/height 616 * if width/height are non-zero then override calculated width/height
713 */ 617 */
714void 618void
715rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 619rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
716{ 620{
717 short recalc_x, recalc_y; 621 short recalc_x, recalc_y;
718 int x, y, sb_w, mb_h, flags; 622 int x, y, sb_w, flags;
719 unsigned int w, h; 623 unsigned int w, h;
720 unsigned int max_width, max_height; 624 unsigned int max_width, max_height;
721 dDisp;
722
723 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
724 ncol, nrow, szHint.width, szHint.height));
725 625
726 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
727 szHint.win_gravity = NorthWestGravity; 627 szHint.win_gravity = NorthWestGravity;
728 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 628 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
729 629
… …
784 max_width = MAX_COLS * fwidth; 684 max_width = MAX_COLS * fwidth;
785 max_height = MAX_ROWS * fheight; 685 max_height = MAX_ROWS * fheight;
786 686
787 szHint.base_width = szHint.base_height = 2 * int_bwidth; 687 szHint.base_width = szHint.base_height = 2 * int_bwidth;
788 688
789 sb_w = mb_h = 0; 689 sb_w = 0;
790 window_vt_x = window_vt_y = int_bwidth; 690 window_vt_x = window_vt_y = int_bwidth;
791 691
792 if (scrollbar_visible ()) 692 if (scrollBar.state)
793 { 693 {
794 sb_w = scrollbar_TotalWidth (); 694 sb_w = scrollbar_TotalWidth ();
795 szHint.base_width += sb_w; 695 szHint.base_width += sb_w;
796 if (!OPTION (Opt_scrollBar_right)) 696 if (!OPTION (Opt_scrollBar_right))
797 window_vt_x += sb_w; 697 window_vt_x += sb_w;
798 } 698 }
799 699
800 if (menubar_visible ())
801 {
802 mb_h = menuBar_TotalHeight ();
803 szHint.base_height += mb_h;
804 window_vt_y += mb_h;
805 }
806
807 szHint.width_inc = fwidth; 700 szHint.width_inc = fwidth;
808 szHint.height_inc = fheight; 701 szHint.height_inc = fheight;
809 szHint.min_width = szHint.base_width + szHint.width_inc; 702 szHint.min_width = szHint.base_width + szHint.width_inc;
810 szHint.min_height = szHint.base_height + szHint.height_inc; 703 szHint.min_height = szHint.base_height + szHint.height_inc;
811 704
… …
829 { 722 {
830 min_it (height, max_height); 723 min_it (height, max_height);
831 szHint.height = szHint.base_height + height; 724 szHint.height = szHint.base_height + height;
832 } 725 }
833 726
834 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 727 if (scrollBar.state && OPTION (Opt_scrollBar_right))
835 window_sb_x = szHint.width - sb_w; 728 window_sb_x = szHint.width - sb_w;
836 729
837 if (recalc_x) 730 if (recalc_x)
838 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
732
839 if (recalc_y) 733 if (recalc_y)
840 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
841 735
842 ncol = width / fwidth; 736 ncol = width / fwidth;
843 nrow = height / fheight; 737 nrow = height / fheight;
844 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
845 ncol, nrow, szHint.width,
846 szHint.height));
847 return;
848} 738}
849 739
850/*----------------------------------------------------------------------*/ 740/*----------------------------------------------------------------------*/
851/* 741/*
852 * Tell the teletype handler what size the window is. 742 * Tell the teletype handler what size the window is.
853 * Called after a window size change. 743 * Called after a window size change.
854 */ 744 */
855void 745void
856rxvt_term::tt_winch () 746rxvt_term::tt_winch ()
857{ 747{
858 if (pty.pty < 0) 748 if (pty->pty < 0)
859 return; 749 return;
860 750
861 struct winsize ws; 751 struct winsize ws;
862 752
863 ws.ws_col = ncol; 753 ws.ws_col = ncol;
864 ws.ws_row = nrow; 754 ws.ws_row = nrow;
865 ws.ws_xpixel = width; 755 ws.ws_xpixel = width;
866 ws.ws_ypixel = height; 756 ws.ws_ypixel = height;
867 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 757 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
868 758
869#if 0 759#if 0
870 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 760 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
871 if (cmd_pid) /* force through to the command */ 761 if (cmd_pid) /* force through to the command */
872 kill (-cmd_pid, SIGWINCH); 762 kill (-cmd_pid, SIGWINCH);
… …
908 prop.height += lineSpace; 798 prop.height += lineSpace;
909 fs->set_prop (prop); 799 fs->set_prop (prop);
910 800
911 fwidth = prop.width; 801 fwidth = prop.width;
912 fheight = prop.height; 802 fheight = prop.height;
913 fbase = (*fs)[1]->ascent; 803 fbase = prop.ascent;
914 804
915 for (int style = 1; style < 4; style++) 805 for (int style = 1; style < 4; style++)
916 { 806 {
917#if ENABLE_STYLES 807#if ENABLE_STYLES
918 const char *res = rs[Rs_font + style]; 808 const char *res = rs[Rs_font + style];
… …
952 return true; 842 return true;
953} 843}
954 844
955void rxvt_term::set_string_property (Atom prop, const char *str, int len) 845void rxvt_term::set_string_property (Atom prop, const char *str, int len)
956{ 846{
957 XChangeProperty (display->display, parent[0], 847 XChangeProperty (xdisp, parent[0],
958 prop, XA_STRING, 8, PropModeReplace, 848 prop, XA_STRING, 8, PropModeReplace,
959 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 849 (const unsigned char *)str, len >= 0 ? len : strlen (str));
960} 850}
961 851
962void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 852void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
963{ 853{
964 wchar_t *ws = rxvt_mbstowcs (str, len); 854 wchar_t *ws = rxvt_mbstowcs (str, len);
965 char *s = rxvt_wcstoutf8 (ws); 855 char *s = rxvt_wcstoutf8 (ws);
966 856
967 XChangeProperty (display->display, parent[0], 857 XChangeProperty (xdisp, parent[0],
968 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
969 (const unsigned char *)s, strlen (s)); 859 (const unsigned char *)s, strlen (s));
970 860
971 free (s); 861 free (s);
972 free (ws); 862 free (ws);
… …
1009 i = atoi (color); 899 i = atoi (color);
1010 900
1011 if (i >= 8 && i <= 15) 901 if (i >= 8 && i <= 15)
1012 { /* bright colors */ 902 { /* bright colors */
1013 i -= 8; 903 i -= 8;
1014# ifndef NO_BRIGHTCOLOR
1015 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 904 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1016 SET_PIXCOLOR (idx); 905 SET_PIXCOLOR (idx);
1017 goto done; 906 goto done;
1018# endif
1019 } 907 }
1020 908
1021 if (i >= 0 && i <= 7) 909 if (i >= 0 && i <= 7)
1022 { /* normal colors */ 910 { /* normal colors */
1023 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 911 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1024 SET_PIXCOLOR (idx); 912 SET_PIXCOLOR (idx);
1025 goto done; 913 goto done;
1026 } 914 }
1027 } 915 }
1028 916
1029 if (!rXParseAllocColor (&xcol, color)) 917 if (!set_color (xcol, color))
1030 return; 918 return;
1031 919
1032 /* XStoreColor (display->display, display->cmap, XColor*); */ 920 /* XStoreColor (xdisp, display->cmap, XColor*); */
1033 921
1034 /* 922 /*
1035 * FIXME: should free colors here, but no idea how to do it so instead, 923 * FIXME: should free colors here, but no idea how to do it so instead,
1036 * so just keep gobbling up the colormap 924 * so just keep gobbling up the colormap
1037 */ 925 */
… …
1040 if (pix_colors[idx] == pix_colors[i]) 928 if (pix_colors[idx] == pix_colors[i])
1041 break; 929 break;
1042 if (i > Color_White) 930 if (i > Color_White)
1043 { 931 {
1044 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */ 932 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1045 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1, 933 XFreeColors (xdisp, display->cmap, (pix_colors + idx), 1,
1046 DisplayPlanes (display->display, display->screen)); 934 DisplayPlanes (xdisp, display->screen));
1047 } 935 }
1048# endif 936# endif
1049 937
1050 pix_colors_focused[idx] = xcol; 938 pix_colors_focused[idx] = xcol;
1051 SET_PIXCOLOR (idx); 939 SET_PIXCOLOR (idx);
… …
1054 /* Cursor cursor; */ 942 /* Cursor cursor; */
1055done: 943done:
1056 944
1057#if OFF_FOCUS_FADING 945#if OFF_FOCUS_FADING
1058 if (rs[Rs_fade]) 946 if (rs[Rs_fade])
947 {
948 rxvt_rgba c;
949 pix_colors [Color_fade].get (this, c);
1059 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 950 pix_colors_unfocused [idx] = pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), c);
951 }
1060#endif 952#endif
1061 953
1062 /*TODO: handle Color_BD, scrollbar background, etc. */ 954 /*TODO: handle Color_BD, scrollbar background, etc. */
1063 955
1064 recolour_cursor (); 956 recolour_cursor ();
… …
1079 : pix_colors_focused[Color_fg]; 971 : pix_colors_focused[Color_fg];
1080 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 972 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1081 ? pix_colors_focused[Color_pointer_bg] 973 ? pix_colors_focused[Color_pointer_bg]
1082 : pix_colors_focused[Color_bg]; 974 : pix_colors_focused[Color_bg];
1083 975
1084 XQueryColors (display->display, display->cmap, xcol, 2); 976 XQueryColors (xdisp, cmap, xcol, 2);
1085 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 977 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1);
1086} 978}
1087 979
1088/*----------------------------------------------------------------------*/ 980/*----------------------------------------------------------------------*/
1089/* 981/*
1090 * find if fg/bg matches any of the normal (low-intensity) colors 982 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1094{ 986{
1095 unsigned int i; 987 unsigned int i;
1096 const char *xpmb = "\0"; 988 const char *xpmb = "\0";
1097 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 989 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1098 990
1099 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1100 strcpy (fstr, "default"); 991 strcpy (fstr, "default");
1101 strcpy (bstr, "default"); 992 strcpy (bstr, "default");
1102 for (i = Color_Black; i <= Color_White; i++) 993 for (i = Color_Black; i <= Color_White; i++)
1103 if (pix_colors[Color_fg] == pix_colors[i]) 994 if (pix_colors[Color_fg] == pix_colors[i])
1104 { 995 {
… …
1119 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1010 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1120} 1011}
1121 1012
1122/*----------------------------------------------------------------------*/ 1013/*----------------------------------------------------------------------*/
1123 1014
1124int 1015bool
1125rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1016rxvt_term::set_color (rxvt_color &color, const char *name)
1126{ 1017{
1127 if (!screen_in_out->set (display, colour)) 1018 if (color.set (this, name))
1128 {
1129 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1130 return false;
1131 }
1132
1133 return true; 1019 return true;
1020
1021 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1022 return false;
1134} 1023}
1135 1024
1136/* -------------------------------------------------------------------- * 1025/* -------------------------------------------------------------------- *
1137 * - WINDOW RESIZING - * 1026 * - WINDOW RESIZING - *
1138 * -------------------------------------------------------------------- */ 1027 * -------------------------------------------------------------------- */
1139void 1028void
1140rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1029rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1141{ 1030{
1142 int fix_screen; 1031 int fix_screen;
1143 int old_width = szHint.width, old_height = szHint.height; 1032 int old_width = szHint.width;
1144 dDisp; 1033 int old_height = szHint.height;
1145 1034
1146 window_calc (newwidth, newheight); 1035 window_calc (newwidth, newheight);
1147 XSetWMNormalHints (disp, parent[0], &szHint); 1036 XSetWMNormalHints (xdisp, parent[0], &szHint);
1148 1037
1149 if (!ignoreparent) 1038 if (!ignoreparent)
1150 { 1039 {
1151#ifdef SMART_RESIZE 1040#ifdef SMART_RESIZE
1152 /* 1041 /*
… …
1156 int x, y, x1, y1; 1045 int x, y, x1, y1;
1157 int dx, dy; 1046 int dx, dy;
1158 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1047 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1159 Window unused_cr; 1048 Window unused_cr;
1160 1049
1161 XTranslateCoordinates (disp, parent[0], display->root, 1050 XTranslateCoordinates (xdisp, parent[0], display->root,
1162 0, 0, &x, &y, &unused_cr); 1051 0, 0, &x, &y, &unused_cr);
1163 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1052 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1164 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1053 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1165 /* 1054 /*
1166 * if display->root isn't the parent window, a WM will probably have offset 1055 * if display->root isn't the parent window, a WM will probably have offset
1167 * our position for handles and decorations. Counter it 1056 * our position for handles and decorations. Counter it
1168 */ 1057 */
… …
1170 { 1059 {
1171 x -= x1; 1060 x -= x1;
1172 y -= y1; 1061 y -= y1;
1173 } 1062 }
1174 1063
1175 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1064 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1176 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1065 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1177 dx = old_width - szHint.width; 1066 dx = old_width - szHint.width;
1178 dy = old_height - szHint.height; 1067 dy = old_height - szHint.height;
1179 1068
1180 /* Check position of the center of the window */ 1069 /* Check position of the center of the window */
1181 if (x < x1) /* left half */ 1070 if (x < x1) /* left half */
1182 dx = 0; 1071 dx = 0;
… …
1185 if (y < y1) /* top half */ 1074 if (y < y1) /* top half */
1186 dy = 0; 1075 dy = 0;
1187 else if (y == y1) /* exact center */ 1076 else if (y == y1) /* exact center */
1188 dy /= 2; 1077 dy /= 2;
1189 1078
1190 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1079 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1191 szHint.width, szHint.height); 1080 szHint.width, szHint.height);
1192#else 1081#else
1193 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1082 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1194#endif 1083#endif
1195 } 1084 }
1196 1085
1197 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1086 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1198 1087
1199 if (fix_screen || newwidth != old_width || newheight != old_height) 1088 if (fix_screen || newwidth != old_width || newheight != old_height)
1200 { 1089 {
1201 if (scrollbar_visible ()) 1090 if (scrollBar.state)
1202 { 1091 {
1203 XMoveResizeWindow (disp, scrollBar.win, 1092 XMoveResizeWindow (xdisp, scrollBar.win,
1204 window_sb_x, 0, 1093 window_sb_x, 0,
1205 scrollbar_TotalWidth (), szHint.height); 1094 scrollbar_TotalWidth (), szHint.height);
1206 resize_scrollbar (); 1095 resize_scrollbar ();
1207 } 1096 }
1208 1097
1209 if (menubar_visible ())
1210 XMoveResizeWindow (disp, menuBar.win,
1211 window_vt_x, 0,
1212 TermWin_TotalWidth (), menuBar_TotalHeight ());
1213
1214 XMoveResizeWindow (disp, vt, 1098 XMoveResizeWindow (xdisp, vt,
1215 window_vt_x, window_vt_y, 1099 window_vt_x, window_vt_y,
1216 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1100 width, height);
1217 1101
1218 scr_clear (); 1102 scr_clear ();
1219#ifdef XPM_BACKGROUND 1103#ifdef XPM_BACKGROUND
1220 resize_pixmap (); 1104 resize_pixmap ();
1221#endif 1105#endif
1222 } 1106 }
1223 1107
1224 if (fix_screen || old_height == 0) 1108 if (fix_screen || old_height == 0)
1225 {
1226 int curr_screen = -1;
1227 int old_ncol = prev_ncol;
1228
1229 /* scr_reset only works on the primary screen */
1230 if (old_height) /* this is not the first time through */
1231 {
1232 unsigned int ocol = ncol;
1233 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1234 curr_screen = scr_change_screen (PRIMARY);
1235 ncol = ocol;
1236 }
1237
1238 scr_reset (); 1109 scr_reset ();
1239
1240 if (curr_screen >= 0) /* this is not the first time through */
1241 {
1242 scr_change_screen (curr_screen);
1243 selection_check (old_ncol != ncol ? 4 : 0);
1244 }
1245 }
1246
1247 old_width = szHint.width;
1248 old_height = szHint.height;
1249 1110
1250#ifdef XPM_BACKGROUND 1111#ifdef XPM_BACKGROUND
1251 if (pixmap) 1112 if (pixmap)
1252 scr_touch (false); 1113 scr_touch (false);
1253#endif 1114#endif
… …
1266{ 1127{
1267 XWindowAttributes wattr; 1128 XWindowAttributes wattr;
1268 1129
1269 if (newwidth == 0 || newheight == 0) 1130 if (newwidth == 0 || newheight == 0)
1270 { 1131 {
1271 XGetWindowAttributes (display->display, display->root, &wattr); 1132 XGetWindowAttributes (xdisp, display->root, &wattr);
1272 1133
1273 if (newwidth == 0) 1134 if (newwidth == 0)
1274 newwidth = wattr.width - szHint.base_width; 1135 newwidth = wattr.width - szHint.base_width;
1275 if (newheight == 0) 1136 if (newheight == 0)
1276 newheight = wattr.height - szHint.base_height; 1137 newheight = wattr.height - szHint.base_height;
… …
1338 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1199 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1339 1200
1340 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1201 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1341 *p = '\0'; 1202 *p = '\0';
1342 1203
1343 atom = XInternAtom (display->display, server, False); 1204 atom = XInternAtom (xdisp, server, False);
1344 win = XGetSelectionOwner (display->display, atom); 1205 win = XGetSelectionOwner (xdisp, atom);
1345 1206
1346 if (win != None) 1207 if (win != None)
1347 return True; 1208 return True;
1348 } 1209 }
1349 1210
… …
1356 XPoint nspot; 1217 XPoint nspot;
1357 XVaNestedList preedit_attr; 1218 XVaNestedList preedit_attr;
1358 1219
1359 if (!Input_Context 1220 if (!Input_Context
1360 || !focus 1221 || !focus
1361 || !(input_style & XIMPreeditPosition)) 1222 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1362 return; 1223 return;
1363 1224
1364 im_set_position (nspot); 1225 im_set_position (nspot);
1365 1226
1366 if (nspot.x == spot.x && nspot.y == spot.y) 1227 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1385 input_method = 0; 1246 input_method = 0;
1386 } 1247 }
1387 1248
1388 Input_Context = 0; 1249 Input_Context = 0;
1389} 1250}
1251
1252#ifdef ENABLE_XIM_ONTHESPOT
1253
1254static void
1255xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1256{
1257 ((rxvt_term *)client_data)->make_current ();
1258 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1259}
1260
1261static void
1262xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1263{
1264 ((rxvt_term *)client_data)->make_current ();
1265 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1266}
1267
1268static void
1269xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1270{
1271 rxvt_term *term = (rxvt_term *)client_data;
1272 XIMText *text = call_data->text;
1273
1274 term->make_current ();
1275
1276 if (text)
1277 {
1278 void *str;
1279
1280 if (!text->encoding_is_wchar && text->string.multi_byte)
1281 {
1282 // of course, X makes it ugly again
1283 if (term->rs[Rs_imLocale])
1284 SET_LOCALE (term->rs[Rs_imLocale]);
1285
1286 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1287 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1288
1289 if (term->rs[Rs_imLocale])
1290 SET_LOCALE (term->locale);
1291 }
1292 else
1293 str = (void *)text->string.wide_char;
1294
1295 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1296 DT_INT, call_data->caret,
1297 DT_INT, call_data->chg_first,
1298 DT_INT, call_data->chg_length,
1299 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1300 DT_WCS_LEN, str, str ? (int)text->length : 0,
1301 DT_END));
1302 }
1303 else
1304 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1305 DT_INT, call_data->caret,
1306 DT_INT, call_data->chg_first,
1307 DT_INT, call_data->chg_length,
1308 DT_END));
1309}
1310
1311#if 0
1312static void
1313xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1314{
1315 ((rxvt_term *)client_data)->make_current ();
1316 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1317 DT_INT, call_data->position,
1318 DT_INT, call_data->direction,
1319 DT_INT, call_data->style,
1320 DT_END));
1321}
1322#endif
1323
1324#endif
1390 1325
1391/* 1326/*
1392 * Try to open a XIM with the current modifiers, then see if we can 1327 * Try to open a XIM with the current modifiers, then see if we can
1393 * open a suitable preedit type 1328 * open a suitable preedit type
1394 */ 1329 */
… …
1401 XRectangle rect, status_rect, needed_rect; 1336 XRectangle rect, status_rect, needed_rect;
1402 unsigned long fg, bg; 1337 unsigned long fg, bg;
1403 const char *p; 1338 const char *p;
1404 char **s; 1339 char **s;
1405 XIMStyles *xim_styles; 1340 XIMStyles *xim_styles;
1341#ifdef ENABLE_XIM_ONTHESPOT
1342 XIMCallback xcb[4];
1343#endif
1344
1345 set_environ (envv);
1406 1346
1407 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1347 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1408 return false; 1348 return false;
1409 1349
1410 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1411 input_method = display->get_xim (locale, modifiers); 1350 input_method = display->get_xim (locale, modifiers);
1412 if (input_method == NULL) 1351 if (input_method == NULL)
1413 return false; 1352 return false;
1414 1353
1415 xim = input_method->xim; 1354 xim = input_method->xim;
… …
1435 s = rxvt_splitcommastring (p); 1374 s = rxvt_splitcommastring (p);
1436 1375
1437 for (i = found = 0; !found && s[i]; i++) 1376 for (i = found = 0; !found && s[i]; i++)
1438 { 1377 {
1439 if (!strcmp (s[i], "OverTheSpot")) 1378 if (!strcmp (s[i], "OverTheSpot"))
1440 input_style = (XIMPreeditPosition | XIMStatusNothing); 1379 input_style = XIMPreeditPosition | XIMStatusNothing;
1441 else if (!strcmp (s[i], "OffTheSpot")) 1380 else if (!strcmp (s[i], "OffTheSpot"))
1442 input_style = (XIMPreeditArea | XIMStatusArea); 1381 input_style = XIMPreeditArea | XIMStatusArea;
1443 else if (!strcmp (s[i], "Root")) 1382 else if (!strcmp (s[i], "Root"))
1444 input_style = (XIMPreeditNothing | XIMStatusNothing); 1383 input_style = XIMPreeditNothing | XIMStatusNothing;
1445 else if (!strcmp (s[i], "None")) 1384 else if (!strcmp (s[i], "None"))
1446 input_style = (XIMPreeditNone | XIMStatusNone); 1385 input_style = XIMPreeditNone | XIMStatusNone;
1386#ifdef ENABLE_XIM_ONTHESPOT
1387 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1388 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1389#endif
1390 else
1391 input_style = XIMPreeditNothing | XIMStatusNothing;
1447 1392
1448 for (j = 0; j < xim_styles->count_styles; j++) 1393 for (j = 0; j < xim_styles->count_styles; j++)
1449 if (input_style == xim_styles->supported_styles[j]) 1394 if (input_style == xim_styles->supported_styles[j])
1450 { 1395 {
1451 rxvt_freecommastring (s); 1396 rxvt_freecommastring (s);
… …
1489 "*", 1434 "*",
1490 fheight, 1435 fheight,
1491 fheight + 1, fheight - 1, 1436 fheight + 1, fheight - 1,
1492 fheight - 2, fheight + 2); 1437 fheight - 2, fheight + 2);
1493 1438
1494 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1439 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1495 &missing_charset_list, &missing_charset_count, &def_string); 1440 &missing_charset_list, &missing_charset_count, &def_string);
1496 1441
1497 if (missing_charset_list) 1442 if (missing_charset_list)
1498 XFreeStringList (missing_charset_list); 1443 XFreeStringList (missing_charset_list);
1499 1444
… …
1540 XNBackground, bg, 1485 XNBackground, bg,
1541 XNArea, &status_rect, 1486 XNArea, &status_rect,
1542 XNFontSet, fs, 1487 XNFontSet, fs,
1543 NULL); 1488 NULL);
1544 } 1489 }
1490#if ENABLE_XIM_ONTHESPOT
1491 else if (input_style & XIMPreeditCallbacks)
1492 {
1493 im_set_position (spot);
1494
1495 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1496 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1497 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1498# if 0
1499 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1500# endif
1501
1502 preedit_attr = XVaCreateNestedList (0,
1503 XNSpotLocation, &spot,
1504 XNPreeditStartCallback, &xcb[0],
1505 XNPreeditDoneCallback , &xcb[1],
1506 XNPreeditDrawCallback , &xcb[2],
1507# if 0
1508 XNPreeditCaretCallback, &xcb[3],
1509# endif
1510 NULL);
1511 }
1512#endif
1545 1513
1546 Input_Context = XCreateIC (xim, 1514 Input_Context = XCreateIC (xim,
1547 XNInputStyle, input_style, 1515 XNInputStyle, input_style,
1548 XNClientWindow, vt, 1516 XNClientWindow, vt,
1549 XNFocusWindow, parent[0], 1517 XNFocusWindow, parent[0],
… …
1552 status_attr ? XNStatusAttributes : NULL, 1520 status_attr ? XNStatusAttributes : NULL,
1553 status_attr, NULL); 1521 status_attr, NULL);
1554 1522
1555 if (preedit_attr) XFree (preedit_attr); 1523 if (preedit_attr) XFree (preedit_attr);
1556 if (status_attr) XFree (status_attr); 1524 if (status_attr) XFree (status_attr);
1557 if (fs) XFreeFontSet (display->display, fs); 1525 if (fs) XFreeFontSet (xdisp, fs);
1558 1526
1559 if (Input_Context == NULL) 1527 if (Input_Context == NULL)
1560 { 1528 {
1561 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1529 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1562 im_destroy (); 1530 im_destroy ();
1563 return false; 1531 return false;
1564 } 1532 }
1565 1533
1534#if 0
1535 // unfortunately, only the focus window is used by XIM, hard to fix
1536 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1537 vt_select_input ();
1538#endif
1539
1566 if (input_style & XIMPreeditArea) 1540 if (input_style & XIMPreeditArea)
1567 IMSetStatusPosition (); 1541 IMSetStatusPosition ();
1568 1542
1569 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1570 return true; 1543 return true;
1571} 1544}
1572 1545
1573void 1546void
1574rxvt_term::im_cb () 1547rxvt_term::im_cb ()
… …
1576 int i; 1549 int i;
1577 const char *p; 1550 const char *p;
1578 char **s; 1551 char **s;
1579 char buf[IMBUFSIZ]; 1552 char buf[IMBUFSIZ];
1580 1553
1581 SET_R (this); 1554 make_current ();
1582 1555
1583 im_destroy (); 1556 im_destroy ();
1584 1557
1585 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1586 if (Input_Context) 1558 if (Input_Context)
1587 return; 1559 return;
1588 1560
1589#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1561#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1590 if (rs[Rs_imLocale]) 1562 if (rs[Rs_imLocale])
… …
1663 XFree (preedit_attr); 1635 XFree (preedit_attr);
1664 XFree (status_attr); 1636 XFree (status_attr);
1665} 1637}
1666#endif /* USE_XIM */ 1638#endif /* USE_XIM */
1667 1639
1668/*----------------------------------------------------------------------*/
1669rxvt_t rxvt_current_term;
1670
1671/*----------------------- end-of-file (C source) -----------------------*/ 1640/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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