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

Diff Legend

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