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.51 by pcg, Sat Mar 6 00:05:01 2004 UTC vs.
Revision 1.94 by root, Sun Aug 15 22:09:24 2004 UTC

1/*--------------------------------*-C-*---------------------------------*; 1/*--------------------------------*-C-*---------------------------------*
2 * File: main.c 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47#include <cstring> 47#include <cstring>
48 48
49vector<rxvt_term *> rxvt_term::termlist;
50
49static char curlocale[128]; 51static char curlocale[128];
50 52
51void 53bool
52rxvt_set_locale (const char *locale) 54rxvt_set_locale (const char *locale)
53{ 55{
54 if (locale && STRNCMP (locale, curlocale, 128)) 56 if (!locale || !strncmp (locale, curlocale, 128))
55 { 57 return false;
58
56 STRNCPY (curlocale, locale, 128); 59 strncpy (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale); 60 setlocale (LC_CTYPE, curlocale);
58 } 61 return true;
59} 62}
60 63
64#if ENABLE_COMBINING
61class rxvt_composite_vec rxvt_composite; 65class rxvt_composite_vec rxvt_composite;
62 66
63text_t rxvt_composite_vec::compose (uint32_t c1, uint32_t c2) 67text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
64{ 68{
65 compose_char *cc; 69 compose_char *cc;
66 70
67 // break compose chains, as stupid readline really likes to duplicate 71 // break compose chains, as stupid readline really likes to duplicate
68 // composing characters for some reason near the end of a line. 72 // composing characters for some reason near the end of a line.
… …
94 v.push_back (compose_char (c1, c2)); 98 v.push_back (compose_char (c1, c2));
95 99
96 return v.size () - 1 + COMPOSE_LO; 100 return v.size () - 1 + COMPOSE_LO;
97} 101}
98 102
99int rxvt_composite_vec::expand (uint32_t c, wchar_t *r) 103int rxvt_composite_vec::expand (unicode_t c, wchar_t *r)
100{ 104{
101 compose_char *cc = (*this)[c]; 105 compose_char *cc = (*this)[c];
102 106
103 if (!cc) 107 if (!cc)
104 { 108 {
… …
117 } 121 }
118 122
119 return len; 123 return len;
120 124
121} 125}
126#endif
122 127
123extern struct rxvt_composite_vec rxvt_composite;
124void * 128void *
125rxvt_term::operator new (size_t s) 129rxvt_term::operator new (size_t s)
126{ 130{
127 void *p = malloc (s); 131 void *p = malloc (s);
128 132
129 MEMSET (p, 0, s); 133 memset (p, 0, s);
130 return p; 134 return p;
131} 135}
132 136
133void 137void
134rxvt_term::operator delete (void *p, size_t s) 138rxvt_term::operator delete (void *p, size_t s)
… …
136 free (p); 140 free (p);
137} 141}
138 142
139rxvt_term::rxvt_term () 143rxvt_term::rxvt_term ()
140 : 144 :
145#if TRANSPARENT
141 rootwin_ev (this, &rxvt_term::rootwin_cb), 146 rootwin_ev (this, &rxvt_term::rootwin_cb),
147#endif
148#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif
154#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif
157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb),
159#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162#endif
163#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168#endif
169#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
142 termwin_ev (this, &rxvt_term::x_cb), 175 termwin_ev (this, &rxvt_term::x_cb),
143 vt_ev (this, &rxvt_term::x_cb), 176 vt_ev (this, &rxvt_term::x_cb),
144#ifdef HAVE_SCROLLBARS
145 scrollbar_ev (this, &rxvt_term::x_cb),
146#endif
147#ifdef MENUBAR
148 menubar_ev (this, &rxvt_term::x_cb),
149#endif
150#ifdef CURSOR_BLINK
151 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
152#endif
153#ifdef TEXT_BLINK
154 text_blink_ev (this, &rxvt_term::text_blink_cb),
155#endif
156#ifdef POINTER_BLANK
157 pointer_ev (this, &rxvt_term::pointer_cb),
158#endif
159#ifdef USE_XIM
160 im_ev (this, &rxvt_term::im_cb),
161#endif
162 check_ev (this, &rxvt_term::check_cb), 177 check_ev (this, &rxvt_term::check_cb),
178 flush_ev (this, &rxvt_term::flush_cb),
163 destroy_ev (this, &rxvt_term::destroy_cb), 179 destroy_ev (this, &rxvt_term::destroy_cb),
164 pty_ev (this, &rxvt_term::pty_cb), 180 pty_ev (this, &rxvt_term::pty_cb),
165 incr_ev (this, &rxvt_term::incr_cb) 181 incr_ev (this, &rxvt_term::incr_cb)
166{ 182{
167 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 183 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
184
185 termlist.push_back (this);
168} 186}
169 187
170rxvt_term::~rxvt_term () 188rxvt_term::~rxvt_term ()
171{ 189{
190 termlist.erase (find (termlist.begin (), termlist.end(), this));
191
172 if (cmd_fd >= 0) 192 if (cmd_pid)
173 close (cmd_fd); 193 kill (-cmd_pid, SIGHUP);
174 194
175#ifndef NO_SETOWNER_TTYDEV 195 pty.put ();
176 privileged_ttydev (RESTORE); 196
177#endif
178#ifdef UTMP_SUPPORT 197#ifdef UTMP_SUPPORT
179 privileged_utmp (RESTORE); 198 privileged_utmp (RESTORE);
180#endif 199#endif
181 200
182 delete TermWin.fontset; 201 delete TermWin.fontset;
183 202
184 if (display) 203 if (display)
185 { 204 {
205 selection_clear ();
206
207#ifdef USE_XIM
208 im_destroy ();
209#endif
210#ifdef MENUBAR
211 if (menubarGC) XFreeGC (display->display, menubarGC);
212#endif
213#ifdef XTERM_SCROLLBAR
214 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
215 if (ShadowGC) XFreeGC (display->display, ShadowGC);
216#endif
217#ifdef PLAIN_SCROLLBAR
218 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC);
219#endif
220#ifdef NEXT_SCROLLBAR
221 if (blackGC) XFreeGC (display->display, blackGC);
222 if (whiteGC) XFreeGC (display->display, whiteGC);
223 if (grayGC) XFreeGC (display->display, grayGC);
224 if (darkGC) XFreeGC (display->display, darkGC);
225 if (stippleGC) XFreeGC (display->display, stippleGC);
226 if (dimple) XFreePixmap (display->display, dimple);
227 if (upArrow) XFreePixmap (display->display, upArrow);
228 if (downArrow) XFreePixmap (display->display, downArrow);
229 if (upArrowHi) XFreePixmap (display->display, upArrowHi);
230 if (downArrowHi) XFreePixmap (display->display, downArrowHi);
231#endif
232#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
233 if (topShadowGC) XFreeGC (display->display, topShadowGC);
234 if (botShadowGC) XFreeGC (display->display, botShadowGC);
235 if (scrollbarGC) XFreeGC (display->display, scrollbarGC);
236#endif
237 if (TermWin.gc) XFreeGC (display->display, TermWin.gc);
238
186#if defined(MENUBAR) && (MENUBAR_MAX > 1) 239#if defined(MENUBAR) && (MENUBAR_MAX > 1)
187 delete menuBar.drawable; 240 delete menuBar.drawable;
188 //if (menuBar.win) 241 //if (menuBar.win)
189 // XDestroyWindow (display->display, menuBar.win); 242 // XDestroyWindow (display->display, menuBar.win);
190#endif 243#endif
… …
194 XDestroyWindow (display->display, TermWin.parent[0]); 247 XDestroyWindow (display->display, TermWin.parent[0]);
195 } 248 }
196 249
197 // TODO: free pixcolours, colours should become part of rxvt_display 250 // TODO: free pixcolours, colours should become part of rxvt_display
198 251
199 delete PixColors; 252 delete pix_colors_focused;
253#ifdef OFF_FOCUS_FADING
254 delete pix_colors_unfocused;
255#endif
200 256
201 displays.put (display); 257 displays.put (display);
202 258
203 scr_release (); 259 scr_release ();
204 260
261 /* clear all resources */
262 for (int i = 0; i < allocated.size (); i++)
263 free (allocated[i]);
264
265 free (selection.text);
266 // TODO: manage env vars in child only(!)
205 free (env_windowid); 267 free (env_windowid);
206 free (env_display); 268 free (env_display);
207 free (env_term); 269 free (env_term);
208 free (env_colorfgbg); 270 free (env_colorfgbg);
209 free (locale); 271 free (locale);
272#if 0
210 free (codeset); 273 free (codeset);
274#endif
211 275
212 delete envv; 276 delete envv;
213 delete argv; 277 delete argv;
214} 278}
215 279
216void 280void
217rxvt_term::destroy () 281rxvt_term::destroy ()
218{ 282{
283 if (destroy_ev.active)
284 return;
285
286#if ENABLE_OVERLAY
287 scr_overlay_off ();
288#endif
289
219 if (display) 290 if (display)
220 { 291 {
292#if USE_XIM
293 im_ev.stop (display);
294#endif
295#if HAVE_SCROLLBARS
296 scrollbar_ev.stop (display);
297#endif
298#if MENUBAR
299 menubar_ev.stop (display);
300#endif
301#if TRANSPARENT
221 rootwin_ev.stop (display); 302 rootwin_ev.stop (display);
303#endif
304 incr_ev.stop ();
222 termwin_ev.stop (display); 305 termwin_ev.stop (display);
223 vt_ev.stop (display); 306 vt_ev.stop (display);
224#ifdef USE_XIM
225 im_destroy ();
226 im_ev.stop (display);
227#endif
228#ifdef HAVE_SCROLLBARS
229 scrollbar_ev.stop (display);
230#endif
231#ifdef MENUBAR
232 menubar_ev.stop (display);
233#endif
234 } 307 }
235 308
236 check_ev.stop (); 309 check_ev.stop ();
237 pty_ev.stop (); 310 pty_ev.stop ();
238#ifdef CURSOR_BLINK 311#ifdef CURSOR_BLINK
239 cursor_blink_ev.stop (); 312 cursor_blink_ev.stop ();
240#endif 313#endif
241#ifdef TEXT_BLINK 314#ifdef TEXT_BLINK
242 text_blink_ev.stop (); 315 text_blink_ev.stop ();
243#endif 316#endif
317#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
318 cont_scroll_ev.stop ();
319#endif
320#ifdef SELECTION_SCROLLING
321 sel_scroll_ev.stop ();
322#endif
244#ifdef POINTER_BLANK 323#ifdef POINTER_BLANK
245 pointer_ev.stop (); 324 pointer_ev.stop ();
246#endif 325#endif
247 326
248 destroy_ev.start (0); 327 destroy_ev.start (0);
… …
256 delete this; 335 delete this;
257} 336}
258 337
259/*----------------------------------------------------------------------*/ 338/*----------------------------------------------------------------------*/
260/* rxvt_init () */ 339/* rxvt_init () */
261/* LIBPROTO */ 340bool
262rxvt_t
263rxvt_init (int argc, const char *const *argv) 341rxvt_term::init (int argc, const char *const *argv)
264{ 342{
265 SET_R (new rxvt_term); 343 SET_R (this);
266 344
267 if (!GET_R->init_vars () || !GET_R->init (argc, argv)) 345 if (!init_vars ())
268 { 346 return false;
269 delete GET_R; 347
270 SET_R (0); 348 init_secondary ();
349
350 const char **cmd_argv = init_resources (argc, argv);
351
352 set_locale ("");
353
354#if MENUBAR_MAX
355 menubar_read (rs[Rs_menu]);
356#endif
357#ifdef HAVE_SCROLLBARS
358 if (options & Opt_scrollBar)
359 scrollBar.setIdle (); /* set existence for size calculations */
360#endif
361
362 create_windows (argc, argv);
363
364 init_xlocale ();
365
366 scr_reset (); /* initialize screen */
367
368#if 0
369 XSynchronize (display->display, True);
370#endif
371
372#ifdef HAVE_SCROLLBARS
373 if (options & Opt_scrollBar)
374 resize_scrollbar (); /* create and map scrollbar */
375#endif
376#if (MENUBAR_MAX)
377 if (menubar_visible ())
378 XMapWindow (display->display, menuBar.win);
379#endif
380#ifdef TRANSPARENT
381 if (options & Opt_transparent)
271 } 382 {
383 XSelectInput (display->display, display->root, PropertyChangeMask);
384 check_our_parents ();
385 rootwin_ev.start (display, display->root);
386 }
387#endif
272 388
273 return GET_R; 389 XMapWindow (display->display, TermWin.vt);
390 XMapWindow (display->display, TermWin.parent[0]);
391
392 init_command (cmd_argv);
393
394 pty_ev.start (pty.pty, EVENT_READ);
395
396 check_ev.start ();
397
398 return true;
274} 399}
275 400
276static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event); 401static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
277 402
278void 403void
279rxvt_init_signals () 404rxvt_init ()
280{ 405{
281 /* install exit handler for cleanup */ 406 /* install exit handler for cleanup */
282#if 0 407#if 0
283#ifdef HAVE_ATEXIT 408#ifdef HAVE_ATEXIT
284 atexit (rxvt_clean_exit); 409 atexit (rxvt_clean_exit);
285#else 410#else
286#endif 411#endif
287#endif 412#endif
413 /*
414 * Save and then give up any super-user privileges
415 * If we need privileges in any area then we must specifically request it.
416 * We should only need to be root in these cases:
417 * 1. write utmp entries on some systems
418 * 2. chown tty on some systems
419 */
420 rxvt_privileges (SAVE);
421 rxvt_privileges (IGNORE);
288 422
289 struct sigaction sa; 423 struct sigaction sa;
290 424
291 sigfillset (&sa.sa_mask); 425 sigfillset (&sa.sa_mask);
292 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART; 426 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
… …
302 436
303 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 437 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
304 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 438 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
305} 439}
306 440
307bool
308rxvt_term::init (int argc, const char *const *argv)
309{
310 /*
311 * Save and then give up any super-user privileges
312 * If we need privileges in any area then we must specifically request it.
313 * We should only need to be root in these cases:
314 * 1. write utmp entries on some systems
315 * 2. chown tty on some systems
316 */
317 privileges (SAVE);
318 privileges (IGNORE);
319
320 init_secondary ();
321
322 const char **cmd_argv = init_resources (argc, argv);
323
324 set_locale ("");
325
326#if MENUBAR_MAX
327 menubar_read (rs[Rs_menu]);
328#endif
329#ifdef HAVE_SCROLLBARS
330 if (Options & Opt_scrollBar)
331 scrollBar.setIdle (); /* set existence for size calculations */
332#endif
333
334 create_windows (argc, argv);
335
336 init_xlocale ();
337
338 scr_reset (); /* initialize screen */
339
340#if 0
341 XSynchronize (display->display, True);
342#endif
343
344#ifdef HAVE_SCROLLBARS
345 if (Options & Opt_scrollBar)
346 resize_scrollbar (); /* create and map scrollbar */
347#endif
348#if (MENUBAR_MAX)
349 if (menubar_visible ())
350 XMapWindow (display->display, menuBar.win);
351#endif
352#ifdef TRANSPARENT
353 if (Options & Opt_transparent)
354 {
355 XSelectInput (display->display, display->root, PropertyChangeMask);
356 check_our_parents ();
357 }
358#endif
359
360 rootwin_ev.start (display, display->root);
361
362 XMapWindow (display->display, TermWin.vt);
363 XMapWindow (display->display, TermWin.parent[0]);
364
365 init_command (cmd_argv);
366
367 pty_ev.start (cmd_fd, EVENT_READ);
368
369 check_ev.start ();
370
371 return true;
372}
373
374/* ------------------------------------------------------------------------- * 441/* ------------------------------------------------------------------------- *
375 * SIGNAL HANDLING & EXIT HANDLER * 442 * SIGNAL HANDLING & EXIT HANDLER *
376 * ------------------------------------------------------------------------- */ 443 * ------------------------------------------------------------------------- */
377/* 444/*
378 * Catch a SIGCHLD signal and exit if the direct child has died 445 * Catch a SIGCHLD signal and exit if the direct child has died
379 */ 446 */
447
448void rxvt_term::child_exited (int pid)
449{
450 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
451 if (pid == (*t)->cmd_pid)
452 {
453 (*t)->destroy ();
454 break;
455 }
456}
457
380/* ARGSUSED */ 458/* ARGSUSED */
381/* EXTPROTO */ 459/* INTPROTO */
382RETSIGTYPE 460RETSIGTYPE
383rxvt_Child_signal (int sig __attribute__ ((unused))) 461rxvt_Child_signal (int sig __attribute__ ((unused)))
384{ 462{
385 int pid, save_errno = errno; 463 int pid, save_errno = errno;
464
386 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 465 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
387 ; 466 rxvt_term::child_exited (pid);
467
388 errno = save_errno; 468 errno = save_errno;
389
390#if 0
391 if (pid == cmd_pid)
392 exit (EXIT_SUCCESS);
393#endif
394} 469}
395 470
396/* 471/*
397 * Catch a fatal signal and tidy up before quitting 472 * Catch a fatal signal and tidy up before quitting
398 */ 473 */
399/* EXTPROTO */ 474/* INTPROTO */
400RETSIGTYPE 475RETSIGTYPE
401rxvt_Exit_signal (int sig) 476rxvt_Exit_signal (int sig)
402{ 477{
403 signal (sig, SIG_DFL); 478 signal (sig, SIG_DFL);
404#ifdef DEBUG_CMD 479#ifdef DEBUG_CMD
405 rxvt_print_error ("signal %d", sig); 480 rxvt_warn ("caught signal %d, exiting.\n", sig);
406#endif 481#endif
407 rxvt_clean_exit (); 482 rxvt_clean_exit ();
408 kill (getpid (), sig); 483 kill (getpid (), sig);
409} 484}
410 485
… …
426/*----------------------------------------------------------------------*/ 501/*----------------------------------------------------------------------*/
427/* 502/*
428 * Exit gracefully, clearing the utmp entry and restoring tty attributes 503 * Exit gracefully, clearing the utmp entry and restoring tty attributes
429 * TODO: if debugging, this should free up any known resources if we can 504 * TODO: if debugging, this should free up any known resources if we can
430 */ 505 */
431/* EXTPROTO */ 506/* INTPROTO */
432void 507void
433rxvt_clean_exit () 508rxvt_clean_exit ()
434{ 509{
435 // TODO: rxvtd should clean up all ressources 510 // TODO: rxvtd should clean up all ressources
436 if (GET_R) 511 if (GET_R)
… …
438} 513}
439 514
440/* ------------------------------------------------------------------------- * 515/* ------------------------------------------------------------------------- *
441 * MEMORY ALLOCATION WRAPPERS * 516 * MEMORY ALLOCATION WRAPPERS *
442 * ------------------------------------------------------------------------- */ 517 * ------------------------------------------------------------------------- */
443/* EXTPROTO */ 518/* INTPROTO */
444void * 519void *
445rxvt_malloc (size_t size) 520rxvt_malloc (size_t size)
446{ 521{
447 void *p; 522 void *p;
448 523
449 p = malloc (size); 524 p = malloc (size);
450 if (p) 525 if (p)
451 return p; 526 return p;
452 527
453 fprintf (stderr, RESNAME ": memory allocation failure. Aborting"); 528 rxvt_fatal ("memory allocation failure. aborting.\n");
454 rxvt_clean_exit ();
455 exit (EXIT_FAILURE);
456 /* NOTREACHED */ 529 /* NOTREACHED */
457} 530}
458 531
459/* EXTPROTO */ 532/* INTPROTO */
460void * 533void *
461rxvt_calloc (size_t number, size_t size) 534rxvt_calloc (size_t number, size_t size)
462{ 535{
463 void *p; 536 void *p;
464 537
465 p = calloc (number, size); 538 p = calloc (number, size);
466 if (p) 539 if (p)
467 return p; 540 return p;
468 541
469 fprintf (stderr, RESNAME ": memory allocation failure. Aborting"); 542 rxvt_fatal ("memory allocation failure. aborting.\n");
470 rxvt_clean_exit ();
471 exit (EXIT_FAILURE);
472 /* NOTREACHED */ 543 /* NOTREACHED */
473} 544}
474 545
475/* EXTPROTO */ 546/* INTPROTO */
476void * 547void *
477rxvt_realloc (void *ptr, size_t size) 548rxvt_realloc (void *ptr, size_t size)
478{ 549{
479 void *p; 550 void *p;
480 551
481 if (ptr) 552 if (ptr)
482 p = realloc (ptr, size); 553 p = realloc (ptr, size);
483 else 554 else
484 p = malloc (size); 555 p = malloc (size);
556
485 if (p) 557 if (p)
486 return p; 558 return p;
487 559
488 fprintf (stderr, RESNAME ": memory allocation failure. Aborting"); 560 rxvt_fatal ("memory allocation failure. aborting.\n");
489 rxvt_clean_exit ();
490 exit (EXIT_FAILURE);
491 /* NOTREACHED */ 561 /* NOTREACHED */
492} 562}
493 563
494/* ------------------------------------------------------------------------- * 564/* ------------------------------------------------------------------------- *
495 * PRIVILEGED OPERATIONS * 565 * PRIVILEGED OPERATIONS *
496 * ------------------------------------------------------------------------- */ 566 * ------------------------------------------------------------------------- */
497/* take care of suid/sgid super-user (root) privileges */ 567/* take care of suid/sgid super-user (root) privileges */
498void 568void
499rxvt_term::privileges (int mode) 569rxvt_privileges (rxvt_privaction action)
500{ 570{
571#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
572 static uid_t euid;
573 static gid_t egid;
574#endif
575
501#if ! defined(__CYGWIN32__) 576#if ! defined(__CYGWIN32__)
502# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 577# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
503 /* setreuid () is the poor man's setuid (), seteuid () */ 578 /* setreuid () is the poor man's setuid (), seteuid () */
504# define seteuid(a) setreuid(-1, (a)) 579# define seteuid(a) setreuid(-1, (a))
505# define setegid(a) setregid(-1, (a)) 580# define setegid(a) setregid(-1, (a))
506# define HAVE_SETEUID 581# define HAVE_SETEUID
507# endif 582# endif
508# ifdef HAVE_SETEUID 583# ifdef HAVE_SETEUID
509 switch (mode) 584 switch (action)
510 { 585 {
511 case IGNORE: 586 case IGNORE:
512 /* 587 /*
513 * change effective uid/gid - not real uid/gid - so we can switch 588 * change effective uid/gid - not real uid/gid - so we can switch
514 * back to root later, as required 589 * back to root later, as required
… …
524 seteuid (euid); 599 seteuid (euid);
525 setegid (egid); 600 setegid (egid);
526 break; 601 break;
527 } 602 }
528# else 603# else
529 switch (mode) 604 switch (action)
530 { 605 {
531 case IGNORE: 606 case IGNORE:
532 setuid (getuid ()); 607 setuid (getuid ());
533 setgid (getgid ()); 608 setgid (getgid ());
534 /* FALLTHROUGH */ 609 /* FALLTHROUGH */
… …
541#endif 616#endif
542} 617}
543 618
544#ifdef UTMP_SUPPORT 619#ifdef UTMP_SUPPORT
545void 620void
546rxvt_term::privileged_utmp (char action) 621rxvt_term::privileged_utmp (rxvt_privaction action)
547{ 622{
548 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
549 action, next_utmp_action, getpid ()));
550 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
551 || (Options & Opt_utmpInhibit) 623 if ((options & Opt_utmpInhibit)
552 || ttydev == NULL || *ttydev == '\0') 624 || !pty.name || !*pty.name)
553 return; 625 return;
554 626
555 privileges (RESTORE); 627 rxvt_privileges (RESTORE);
628
556 if (action == SAVE) 629 if (action == SAVE)
557 {
558 next_utmp_action = RESTORE;
559 makeutent (ttydev, rs[Rs_display_name]); 630 makeutent (pty.name, rs[Rs_display_name]);
560 }
561 else 631 else
562 { /* action == RESTORE */
563 next_utmp_action = IGNORE;
564 cleanutent (); 632 cleanutent ();
565 } 633
566 privileges (IGNORE); 634 rxvt_privileges (IGNORE);
567}
568#endif
569
570#ifndef NO_SETOWNER_TTYDEV
571void
572rxvt_term::privileged_ttydev (char action)
573{
574 D_MAIN ((stderr,
575 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
576 action, next_tty_action, getpid ()));
577 if (next_tty_action != action || (action != SAVE && action != RESTORE)
578 || ttydev == NULL || *ttydev == '\0')
579 return;
580
581 privileges (RESTORE);
582
583 if (action == SAVE)
584 {
585 next_tty_action = RESTORE;
586# ifndef RESET_TTY_TO_COMMON_DEFAULTS
587 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
588 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
589 next_tty_action = IGNORE;
590 else
591# endif
592
593 {
594 chown (ttydev, getuid (), ttygid); /* fail silently */
595 chmod (ttydev, ttymode);
596# ifdef HAVE_REVOKE
597 revoke (ttydev);
598# endif
599
600 }
601 }
602 else
603 { /* action == RESTORE */
604 next_tty_action = IGNORE;
605# ifndef RESET_TTY_TO_COMMON_DEFAULTS
606 chmod (ttydev, ttyfd_stat.st_mode);
607 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
608# else
609 chmod (ttydev,
610 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
611 chown (ttydev, 0, 0);
612# endif
613
614 }
615
616 privileges (IGNORE);
617
618# ifndef RESET_TTY_TO_COMMON_DEFAULTS
619 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
620 action == RESTORE ? "Restoring" : (action ==
621 SAVE ? "Saving" :
622 "UNKNOWN ERROR for"), ttydev,
623 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
624 ttyfd_stat.st_gid));
625# endif
626} 635}
627#endif 636#endif
628 637
629/*----------------------------------------------------------------------*/ 638/*----------------------------------------------------------------------*/
630/* 639/*
… …
685 else 694 else
686 szHint.win_gravity = SouthWestGravity; 695 szHint.win_gravity = SouthWestGravity;
687 } 696 }
688 } 697 }
689 } 698 }
699
690 /* TODO: BOUNDS */ 700 /* TODO: BOUNDS */
691 TermWin.width = TermWin.ncol * TermWin.fwidth; 701 TermWin.width = TermWin.ncol * TermWin.fwidth;
692 TermWin.height = TermWin.nrow * TermWin.fheight; 702 TermWin.height = TermWin.nrow * TermWin.fheight;
693 max_width = MAX_COLS * TermWin.fwidth; 703 max_width = MAX_COLS * TermWin.fwidth;
694 max_height = MAX_ROWS * TermWin.fheight; 704 max_height = MAX_ROWS * TermWin.fheight;
695 705
696 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 706 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
697 707
698 sb_w = mb_h = 0; 708 sb_w = mb_h = 0;
699 window_vt_x = window_vt_y = 0; 709 window_vt_x = window_vt_y = TermWin.int_bwidth;
710
700 if (scrollbar_visible ()) 711 if (scrollbar_visible ())
701 { 712 {
702 sb_w = scrollbar_TotalWidth (); 713 sb_w = scrollbar_TotalWidth ();
703 szHint.base_width += sb_w; 714 szHint.base_width += sb_w;
704 if (! (Options & Opt_scrollBar_right)) 715 if (!(options & Opt_scrollBar_right))
705 window_vt_x = sb_w; 716 window_vt_x += sb_w;
706 } 717 }
718
707 if (menubar_visible ()) 719 if (menubar_visible ())
708 { 720 {
709 mb_h = menuBar_TotalHeight (); 721 mb_h = menuBar_TotalHeight ();
710 szHint.base_height += mb_h; 722 szHint.base_height += mb_h;
711 window_vt_y = mb_h; 723 window_vt_y += mb_h;
712 } 724 }
725
713 szHint.width_inc = TermWin.fwidth; 726 szHint.width_inc = TermWin.fwidth;
714 szHint.height_inc = TermWin.fheight; 727 szHint.height_inc = TermWin.fheight;
715 szHint.min_width = szHint.base_width + szHint.width_inc; 728 szHint.min_width = szHint.base_width + szHint.width_inc;
716 szHint.min_height = szHint.base_height + szHint.height_inc; 729 szHint.min_height = szHint.base_height + szHint.height_inc;
717 730
… …
723 else 736 else
724 { 737 {
725 MIN_IT (TermWin.width, max_width); 738 MIN_IT (TermWin.width, max_width);
726 szHint.width = szHint.base_width + TermWin.width; 739 szHint.width = szHint.base_width + TermWin.width;
727 } 740 }
741
728 if (height && height - szHint.base_height < max_height) 742 if (height && height - szHint.base_height < max_height)
729 { 743 {
730 szHint.height = height; 744 szHint.height = height;
731 TermWin.height = height - szHint.base_height; 745 TermWin.height = height - szHint.base_height;
732 } 746 }
733 else 747 else
734 { 748 {
735 MIN_IT (TermWin.height, max_height); 749 MIN_IT (TermWin.height, max_height);
736 szHint.height = szHint.base_height + TermWin.height; 750 szHint.height = szHint.base_height + TermWin.height;
737 } 751 }
752
738 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 753 if (scrollbar_visible () && (options & Opt_scrollBar_right))
739 window_sb_x = szHint.width - sb_w; 754 window_sb_x = szHint.width - sb_w;
740 755
741 if (recalc_x) 756 if (recalc_x)
742 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 757 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
743 - szHint.width - 2 * TermWin.ext_bwidth); 758 - szHint.width - 2 * TermWin.ext_bwidth);
… …
759 * Called after a window size change. 774 * Called after a window size change.
760 */ 775 */
761void 776void
762rxvt_term::tt_winch () 777rxvt_term::tt_winch ()
763{ 778{
779 if (pty.pty < 0)
780 return;
781
764 struct winsize ws; 782 struct winsize ws;
765
766 if (cmd_fd < 0)
767 return;
768 783
769 ws.ws_col = TermWin.ncol; 784 ws.ws_col = TermWin.ncol;
770 ws.ws_row = TermWin.nrow; 785 ws.ws_row = TermWin.nrow;
771 ws.ws_xpixel = ws.ws_ypixel = 0; 786 ws.ws_xpixel = TermWin.width;
772#ifndef DEBUG_SIZE 787 ws.ws_ypixel = TermWin.height;
773 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 788 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
774#else 789
775 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 790#if 0
776 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 791 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
777# ifdef SIGWINCH
778 else if (cmd_pid) /* force through to the command */ 792 if (cmd_pid) /* force through to the command */
779 kill (cmd_pid, SIGWINCH); 793 kill (cmd_pid, SIGWINCH);
780# endif
781#endif 794#endif
782} 795}
783 796
784/*----------------------------------------------------------------------*/ 797/*----------------------------------------------------------------------*/
785/* rxvt_change_font () - Switch to a new font */ 798/* rxvt_change_font () - Switch to a new font */
… …
817 resize_all_windows (0, 0, 0); 830 resize_all_windows (0, 0, 0);
818 scr_remap_chars (); 831 scr_remap_chars ();
819 scr_touch (true); 832 scr_touch (true);
820 } 833 }
821 834
835 for (unicode_t ch = 0x20; ch <= 0x7f; ch++)
836 TermWin.ascii_map [ch - 0x20] = fs->find_font (ch);
837
822 return true; 838 return true;
823 } 839 }
824 } 840 }
825 841
826 return false; 842 return false;
… …
836/*----------------------------------------------------------------------*/ 852/*----------------------------------------------------------------------*/
837/* xterm sequences - title, iconName, color (exptl) */ 853/* xterm sequences - title, iconName, color (exptl) */
838void 854void
839rxvt_term::set_title (const char *str) 855rxvt_term::set_title (const char *str)
840{ 856{
841#ifndef SMART_WINDOW_TITLE 857#ifdef SMART_WINDOW_TITLE
842 XStoreName (display->display, TermWin.parent[0], str);
843#else
844 char *name; 858 char *name;
845 859
846 if (XFetchName (display->display, TermWin.parent[0], &name) == 0) 860 if (!XFetchName (display->display, TermWin.parent[0], &name))
847 name = NULL; 861 name = NULL;
862
848 if (name == NULL || STRCMP (name, str)) 863 if (name == NULL || strcmp (name, str))
864#endif
849 XStoreName (display->display, TermWin.parent[0], str); 865 XStoreName (display->display, TermWin.parent[0], str);
866
867#ifdef SMART_WINDOW_TITLE
850 if (name) 868 if (name)
851 XFree (name); 869 XFree (name);
852#endif 870#endif
853} 871}
854 872
855void 873void
856rxvt_term::set_iconName (const char *str) 874rxvt_term::set_icon_name (const char *str)
857{ 875{
858#ifndef SMART_WINDOW_TITLE 876#ifdef SMART_WINDOW_TITLE
859 XSetIconName (display->display, TermWin.parent[0], str);
860#else
861 char *name; 877 char *name;
862 878
863 if (XGetIconName (display->display, TermWin.parent[0], &name)) 879 if (!XGetIconName (display->display, TermWin.parent[0], &name))
864 name = NULL; 880 name = NULL;
881
865 if (name == NULL || STRCMP (name, str)) 882 if (name == NULL || strcmp (name, str))
883#endif
866 XSetIconName (display->display, TermWin.parent[0], str); 884 XSetIconName (display->display, TermWin.parent[0], str);
885
886#ifdef SMART_WINDOW_TITLE
867 if (name) 887 if (name)
868 XFree (name); 888 XFree (name);
869#endif 889#endif
870} 890}
871 891
… …
885 i = atoi (color); 905 i = atoi (color);
886 if (i >= 8 && i <= 15) 906 if (i >= 8 && i <= 15)
887 { /* bright colors */ 907 { /* bright colors */
888 i -= 8; 908 i -= 8;
889# ifndef NO_BRIGHTCOLOR 909# ifndef NO_BRIGHTCOLOR
890 PixColors[idx] = PixColors[minBrightCOLOR + i]; 910 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
891 SET_PIXCOLOR (idx); 911 SET_PIXCOLOR (idx);
892 goto Done; 912 goto Done;
893# endif 913# endif
894 914
895 } 915 }
896 if (i >= 0 && i <= 7) 916 if (i >= 0 && i <= 7)
897 { /* normal colors */ 917 { /* normal colors */
898 PixColors[idx] = PixColors[minCOLOR + i]; 918 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
899 SET_PIXCOLOR (idx); 919 SET_PIXCOLOR (idx);
900 goto Done; 920 goto Done;
901 } 921 }
902 } 922 }
923
903 if (!rXParseAllocColor (& xcol, color)) 924 if (!rXParseAllocColor (& xcol, color))
904 return; 925 return;
926
905 /* XStoreColor (display->display, XCMAP, XColor*); */ 927 /* XStoreColor (display->display, display->cmap, XColor*); */
906 928
907 /* 929 /*
908 * FIXME: should free colors here, but no idea how to do it so instead, 930 * FIXME: should free colors here, but no idea how to do it so instead,
909 * so just keep gobbling up the colormap 931 * so just keep gobbling up the colormap
910 */ 932 */
911# if 0 933# if 0
912 for (i = Color_Black; i <= Color_White; i++) 934 for (i = Color_Black; i <= Color_White; i++)
913 if (PixColors[idx] == PixColors[i]) 935 if (pix_colors[idx] == pix_colors[i])
914 break; 936 break;
915 if (i > Color_White) 937 if (i > Color_White)
916 { 938 {
917 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 939 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
918 XFreeColors (display->display, XCMAP, (PixColors + idx), 1, 940 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
919 DisplayPlanes (display->display, display->screen)); 941 DisplayPlanes (display->display, display->screen));
920 } 942 }
921# endif 943# endif
922 944
923 PixColors[idx] = xcol; 945 pix_colors_focused[idx] = xcol;
924 SET_PIXCOLOR (idx); 946 SET_PIXCOLOR (idx);
925 947
926 /* XSetWindowAttributes attr; */ 948 /* XSetWindowAttributes attr; */
927 /* Cursor cursor; */ 949 /* Cursor cursor; */
928Done: 950Done:
951#ifdef OFF_FOCUS_FADING
952 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));
953#endif
929 if (idx == Color_bg && ! (Options & Opt_transparent)) 954 if (idx == Color_bg && ! (options & Opt_transparent))
930 XSetWindowBackground (display->display, TermWin.vt, 955 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
931 PixColors[Color_bg]);
932 956
933 /* handle Color_BD, scrollbar background, etc. */ 957 /* handle Color_BD, scrollbar background, etc. */
934 958
935 set_colorfgbg (); 959 set_colorfgbg ();
936 recolour_cursor (); 960 recolour_cursor ();
937 /* the only reasonable way to enforce a clean update */ 961 scr_touch (true);
938 scr_poweron ();
939} 962}
940 963
941#else 964#else
942# define set_window_color (idx,color) ((void)0) 965# define set_window_color (idx,color) ((void)0)
943#endif /* XTERM_COLOR_CHANGE */ 966#endif /* XTERM_COLOR_CHANGE */
944 967
945void 968void
946rxvt_term::recolour_cursor () 969rxvt_term::recolour_cursor ()
947{ 970{
948#if TODO
949 rxvt_color xcol[2]; 971 XColor xcol[2];
950 972
951 xcol[0] = PixColors[Color_pointer]; 973 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? pix_colors_focused[Color_pointer_fg] : pix_colors_focused[Color_fg];
952 xcol[1] = PixColors[Color_bg]; 974 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? pix_colors_focused[Color_pointer_bg] : pix_colors_focused[Color_bg];
953 XQueryColors (display->display, XCMAP, xcol, 2); 975 XQueryColors (display->display, display->cmap, xcol, 2);
954 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1])); 976 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
955#endif
956} 977}
957 978
958/*----------------------------------------------------------------------*/ 979/*----------------------------------------------------------------------*/
959/* 980/*
960 * find if fg/bg matches any of the normal (low-intensity) colors 981 * find if fg/bg matches any of the normal (low-intensity) colors
… …
966 const char *xpmb = "\0"; 987 const char *xpmb = "\0";
967 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 988 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
968 989
969 env_colorfgbg = 990 env_colorfgbg =
970 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1); 991 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
971 STRCPY (fstr, "default"); 992 strcpy (fstr, "default");
972 STRCPY (bstr, "default"); 993 strcpy (bstr, "default");
973 for (i = Color_Black; i <= Color_White; i++) 994 for (i = Color_Black; i <= Color_White; i++)
974 if (PixColors[Color_fg] == PixColors[i]) 995 if (pix_colors[Color_fg] == pix_colors[i])
975 { 996 {
976 sprintf (fstr, "%d", (i - Color_Black)); 997 sprintf (fstr, "%d", (i - Color_Black));
977 break; 998 break;
978 } 999 }
979 for (i = Color_Black; i <= Color_White; i++) 1000 for (i = Color_Black; i <= Color_White; i++)
980 if (PixColors[Color_bg] == PixColors[i]) 1001 if (pix_colors[Color_bg] == pix_colors[i])
981 { 1002 {
982 sprintf (bstr, "%d", (i - Color_Black)); 1003 sprintf (bstr, "%d", (i - Color_Black));
983#ifdef XPM_BACKGROUND 1004#ifdef XPM_BACKGROUND
984 xpmb = "default;"; 1005 xpmb = "default;";
985#endif 1006#endif
… …
990 1011
991#ifndef NO_BRIGHTCOLOR 1012#ifndef NO_BRIGHTCOLOR
992 colorfgbg = DEFAULT_RSTYLE; 1013 colorfgbg = DEFAULT_RSTYLE;
993 for (i = minCOLOR; i <= maxCOLOR; i++) 1014 for (i = minCOLOR; i <= maxCOLOR; i++)
994 { 1015 {
995 if (PixColors[Color_fg] == PixColors[i]) 1016 if (pix_colors[Color_fg] == pix_colors[i])
996 colorfgbg = SET_FGCOLOR (colorfgbg, i); 1017 colorfgbg = SET_FGCOLOR (colorfgbg, i);
997 if (PixColors[Color_bg] == PixColors[i]) 1018 if (pix_colors[Color_bg] == pix_colors[i])
998 colorfgbg = SET_BGCOLOR (colorfgbg, i); 1019 colorfgbg = SET_BGCOLOR (colorfgbg, i);
999 } 1020 }
1000#endif 1021#endif
1001} 1022}
1002 1023
… …
1009int 1030int
1010rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1031rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1011{ 1032{
1012 if (!screen_in_out->set (display, colour)) 1033 if (!screen_in_out->set (display, colour))
1013 { 1034 {
1014 rxvt_print_error ("can't allocate colour: %s", colour); 1035 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1015 return false; 1036 return false;
1016 } 1037 }
1017 1038
1018 return true; 1039 return true;
1019} 1040}
… …
1030 int old_width = szHint.width, old_height = szHint.height; 1051 int old_width = szHint.width, old_height = szHint.height;
1031#endif 1052#endif
1032 1053
1033 window_calc (width, height); 1054 window_calc (width, height);
1034 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1055 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
1056
1035 if (!ignoreparent) 1057 if (!ignoreparent)
1036 { 1058 {
1037#ifdef SMART_RESIZE 1059#ifdef SMART_RESIZE
1038 /* 1060 /*
1039 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 1061 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
… …
1074 dy /= 2; 1096 dy /= 2;
1075 1097
1076 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1098 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
1077 szHint.width, szHint.height); 1099 szHint.width, szHint.height);
1078#else 1100#else
1079 XResizeWindow (display->display, TermWin.parent[0], szHint.width, 1101 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height);
1080 szHint.height);
1081#endif 1102#endif
1082
1083 } 1103 }
1084 1104
1085 fix_screen = (TermWin.ncol != prev_ncol 1105 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
1086 || TermWin.nrow != prev_nrow);
1087 1106
1088 if (fix_screen || width != old_width || height != old_height) 1107 if (fix_screen || width != old_width || height != old_height)
1089 { 1108 {
1090 if (scrollbar_visible ()) 1109 if (scrollbar_visible ())
1091 { 1110 {
1092 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x, 1111 XMoveResizeWindow (display->display, scrollBar.win,
1112 window_sb_x, 0,
1093 0, scrollbar_TotalWidth (), szHint.height); 1113 scrollbar_TotalWidth (), szHint.height);
1094 resize_scrollbar (); 1114 resize_scrollbar ();
1095 } 1115 }
1096 1116
1097 if (menubar_visible ()) 1117 if (menubar_visible ())
1098 XMoveResizeWindow (display->display, menuBar.win, window_vt_x, 1118 XMoveResizeWindow (display->display, menuBar.win,
1119 window_vt_x, 0,
1099 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1120 TermWin_TotalWidth (), menuBar_TotalHeight ());
1100 1121
1101 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1122 XMoveResizeWindow (display->display, TermWin.vt,
1102 window_vt_y, TermWin_TotalWidth (), 1123 window_vt_x, window_vt_y,
1103 TermWin_TotalHeight ()); 1124 TermWin_TotalWidth (), TermWin_TotalHeight ());
1104 scr_clear (height != old_height); 1125 scr_clear ();
1105#ifdef XPM_BACKGROUND 1126#ifdef XPM_BACKGROUND
1106 resize_pixmap (); 1127 resize_pixmap ();
1107#endif 1128#endif
1108
1109 } 1129 }
1110 1130
1111 if (fix_screen || old_height == 0) 1131 if (fix_screen || old_height == 0)
1112 { 1132 {
1113 int curr_screen = -1; 1133 int curr_screen = -1;
… …
1154 if (width == 0) 1174 if (width == 0)
1155 width = wattr.width - szHint.base_width; 1175 width = wattr.width - szHint.base_width;
1156 if (height == 0) 1176 if (height == 0)
1157 height = wattr.height - szHint.base_height; 1177 height = wattr.height - szHint.base_height;
1158 } 1178 }
1179
1159 if (width != TermWin.width || height != TermWin.height) 1180 if (width != TermWin.width || height != TermWin.height)
1160 { 1181 {
1161 width += szHint.base_width; 1182 width += szHint.base_width;
1162 height += szHint.base_height; 1183 height += szHint.base_height;
1163 resize_all_windows (width, height, 0); 1184 resize_all_windows (width, height, 0);
… …
1168 * - X INPUT METHOD ROUTINES - * 1189 * - X INPUT METHOD ROUTINES - *
1169 * -------------------------------------------------------------------- */ 1190 * -------------------------------------------------------------------- */
1170#ifdef USE_XIM 1191#ifdef USE_XIM
1171 1192
1172void 1193void
1194rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1195{
1196 fg = pix_colors[Color_fg];
1197 bg = pix_colors[Color_bg];
1198}
1199
1200void
1173rxvt_term::im_set_size (XRectangle *size) 1201rxvt_term::im_set_size (XRectangle &size)
1174{ 1202{
1203 // the int_bwidth terms make no sense to me
1175 size->x = TermWin.int_bwidth; 1204 size.x = TermWin.int_bwidth;
1176 size->y = TermWin.int_bwidth; 1205 size.y = TermWin.int_bwidth;
1177 size->width = Width2Pixel (TermWin.ncol); 1206 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth;
1178 size->height = Height2Pixel (TermWin.nrow); 1207 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth;
1179} 1208}
1180 1209
1181void 1210void
1182rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg) 1211rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1212 XRectangle &status_rect,
1213 const XRectangle &needed_rect)
1183{ 1214{
1184 *fg = PixColors[Color_fg]; 1215 preedit_rect.x = needed_rect.width;
1185 *bg = PixColors[Color_bg]; 1216 preedit_rect.y = 0;
1217 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1;
1218 preedit_rect.height = TermWin.fheight;
1219
1220 status_rect.x = 0;
1221 status_rect.y = 0;
1222 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1;
1223 status_rect.height = TermWin.fheight;
1186} 1224}
1187 1225
1188/* Checking whether input method is running. */ 1226/* Checking whether input method is running. */
1189bool 1227bool
1190rxvt_term::IMisRunning () 1228rxvt_term::IMisRunning ()
1191{ 1229{
1192 char *p; 1230 char *p;
1193 Atom atom; 1231 Atom atom;
1194 Window win; 1232 Window win;
1195 char server[IMBUFSIZ]; 1233 char server[IMBUFSIZ];
1196 1234
1197 /* get current locale modifier */ 1235 /* get current locale modifier */
1198 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1236 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1199 { 1237 {
1200 STRCPY (server, "@server="); 1238 strcpy (server, "@server=");
1201 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1239 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1240
1202 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */ 1241 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1203 *p = '\0'; 1242 *p = '\0';
1204 1243
1205 atom = XInternAtom (display->display, server, False); 1244 atom = XInternAtom (display->display, server, False);
1206 win = XGetSelectionOwner (display->display, atom); 1245 win = XGetSelectionOwner (display->display, atom);
1246
1207 if (win != None) 1247 if (win != None)
1208 return True; 1248 return True;
1209 } 1249 }
1250
1210 return False; 1251 return False;
1211} 1252}
1212 1253
1213void 1254void
1214rxvt_term::IMSendSpot () 1255rxvt_term::IMSendSpot ()
1215{ 1256{
1216 XPoint spot; 1257 XPoint spot;
1217 XVaNestedList preedit_attr; 1258 XVaNestedList preedit_attr;
1218 1259
1219 if (Input_Context == NULL 1260 if (!Input_Context
1261 || !TermWin.focus
1220 || !TermWin.focus || ! (input_style & XIMPreeditPosition) 1262 || !(input_style & XIMPreeditPosition)
1263#if 0
1221 || ! (event_type == KeyPress 1264 || !(event_type == KeyPress
1222 || event_type == Expose 1265 || event_type == Expose
1223 || event_type == NoExpose 1266 || event_type == NoExpose
1224 || event_type == SelectionNotify 1267 || event_type == SelectionNotify
1225 || event_type == ButtonRelease || event_type == FocusIn) 1268 || event_type == ButtonRelease || event_type == FocusIn)
1269#endif
1226 || !IMisRunning ()) 1270 || !IMisRunning ())
1227 return; 1271 return;
1228 1272
1229 im_set_position (&spot); 1273 im_set_position (spot);
1230 1274
1231 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); 1275 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1232 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1276 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1233 XFree (preedit_attr); 1277 XFree (preedit_attr);
1234} 1278}
1235 1279
1236void 1280void
1237rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1238 XRectangle * needed_rect)
1239{
1240 int mbh, vtx = 0;
1241
1242 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1243 vtx = scrollbar_TotalWidth ();
1244
1245 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1246 mbh -= TermWin.lineSpace;
1247
1248 preedit_rect->x = needed_rect->width + vtx;
1249 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1250
1251 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1252 preedit_rect->height = Height2Pixel (1);
1253
1254 status_rect->x = vtx;
1255 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1256
1257 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1258 status_rect->height = Height2Pixel (1);
1259}
1260
1261void
1262rxvt_term::im_destroy () 1281rxvt_term::im_destroy ()
1263{ 1282{
1264 if (Input_Context) 1283 if (Input_Context)
1265 { 1284 {
1266 XDestroyIC (Input_Context); 1285 XDestroyIC (Input_Context);
1267 Input_Context = NULL; 1286 Input_Context = 0;
1268 } 1287 }
1269 1288
1270 if (input_method) 1289 if (input_method)
1271 { 1290 {
1272 display->put_xim (input_method); 1291 display->put_xim (input_method);
… …
1279 * open a suitable preedit type 1298 * open a suitable preedit type
1280 */ 1299 */
1281bool 1300bool
1282rxvt_term::IM_get_IC (const char *modifiers) 1301rxvt_term::IM_get_IC (const char *modifiers)
1283{ 1302{
1284 int i, j, found; 1303 int i, j, found;
1285 XIM xim; 1304 XIM xim;
1286 XPoint spot; 1305 XPoint spot;
1287 XRectangle rect, status_rect, needed_rect; 1306 XRectangle rect, status_rect, needed_rect;
1288 unsigned long fg, bg; 1307 unsigned long fg, bg;
1289 const char *p; 1308 const char *p;
1290 char **s; 1309 char **s;
1291 XIMStyles *xim_styles; 1310 XIMStyles *xim_styles;
1292 XVaNestedList preedit_attr, status_attr;
1293 1311
1294 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1312 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1295 return false; 1313 return false;
1296 1314
1297 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1315 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1303 1321
1304 xim_styles = NULL; 1322 xim_styles = NULL;
1305 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1323 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1306 || !xim_styles || !xim_styles->count_styles) 1324 || !xim_styles || !xim_styles->count_styles)
1307 { 1325 {
1308 display->put_xim (input_method); 1326 im_destroy ();
1309 return false; 1327 return false;
1310 } 1328 }
1311 1329
1312 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1330 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1313 s = rxvt_splitcommastring (p); 1331 s = rxvt_splitcommastring (p);
1332
1314 for (i = found = 0; !found && s[i]; i++) 1333 for (i = found = 0; !found && s[i]; i++)
1315 { 1334 {
1316 if (!STRCMP (s[i], "OverTheSpot")) 1335 if (!strcmp (s[i], "OverTheSpot"))
1317 input_style = (XIMPreeditPosition | XIMStatusNothing); 1336 input_style = (XIMPreeditPosition | XIMStatusNothing);
1318 else if (!STRCMP (s[i], "OffTheSpot")) 1337 else if (!strcmp (s[i], "OffTheSpot"))
1319 input_style = (XIMPreeditArea | XIMStatusArea); 1338 input_style = (XIMPreeditArea | XIMStatusArea);
1320 else if (!STRCMP (s[i], "Root")) 1339 else if (!strcmp (s[i], "Root"))
1321 input_style = (XIMPreeditNothing | XIMStatusNothing); 1340 input_style = (XIMPreeditNothing | XIMStatusNothing);
1322 1341
1323 for (j = 0; j < xim_styles->count_styles; j++) 1342 for (j = 0; j < xim_styles->count_styles; j++)
1324 if (input_style == xim_styles->supported_styles[j]) 1343 if (input_style == xim_styles->supported_styles[j])
1325 { 1344 {
… …
1334 free (s); 1353 free (s);
1335 XFree (xim_styles); 1354 XFree (xim_styles);
1336 1355
1337 if (!found) 1356 if (!found)
1338 { 1357 {
1339 display->put_xim (input_method); 1358 im_destroy ();
1340 return false; 1359 return false;
1341 } 1360 }
1342 1361
1343 preedit_attr = status_attr = NULL; 1362 XFontSet fs = 0;
1363 XVaNestedList preedit_attr = 0, status_attr = 0;
1364
1365 if (input_style & (XIMPreeditPosition | XIMPreeditArea))
1366 {
1367 // fake us a font-set, please
1368 char **missing_charset_list;
1369 int missing_charset_count;
1370 char *def_string;
1371 char pat[512];
1372
1373 sprintf (pat,
1374 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1375 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1376 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1377 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1378 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1379 "*",
1380 TermWin.fheight,
1381 TermWin.fheight + 1, TermWin.fheight - 1,
1382 TermWin.fheight - 2, TermWin.fheight + 2);
1383
1384 fs = XCreateFontSet (display->display, pat,
1385 &missing_charset_list, &missing_charset_count, &def_string);
1386
1387 if (missing_charset_list)
1388 XFreeStringList (missing_charset_list);
1389
1390 if (!fs)
1391 {
1392 input_style &= ~(XIMPreeditPosition | XIMPreeditArea);
1393 rxvt_warn ("unable to create fontset for input method, try \"-pt Root\". Continuing.\n");
1394 }
1395 }
1344 1396
1345 if (input_style & XIMPreeditPosition) 1397 if (input_style & XIMPreeditPosition)
1346 { 1398 {
1347 im_set_size (&rect); 1399 im_set_size (rect);
1348 im_set_position (&spot); 1400 im_set_position (spot);
1349 im_set_color (&fg, &bg); 1401 im_set_color (fg, bg);
1350 1402
1351 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1403 preedit_attr = XVaCreateNestedList (0,
1404 XNForeground, fg,
1405 XNBackground, bg,
1406 XNArea, &rect,
1352 XNSpotLocation, &spot, 1407 XNSpotLocation, &spot,
1353 XNForeground, fg, XNBackground, bg,
1354 //XNFontSet, TermWin.fontset, 1408 XNFontSet, fs,
1355 NULL); 1409 NULL);
1356 } 1410 }
1357 else if (input_style & XIMPreeditArea) 1411 else if (input_style & XIMPreeditArea)
1358 { 1412 {
1359 im_set_color (&fg, &bg); 1413 im_set_color (fg, bg);
1360 1414
1361 /* 1415 /*
1362 * The necessary width of preedit area is unknown 1416 * The necessary width of preedit area is unknown
1363 * until create input context. 1417 * until create input context.
1364 */ 1418 */
1365 needed_rect.width = 0; 1419 needed_rect.width = 0;
1366
1367 im_set_preedit_area (&rect, &status_rect, &needed_rect); 1420 im_set_preedit_area (rect, status_rect, needed_rect);
1368 1421
1369 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1422 preedit_attr = XVaCreateNestedList (0,
1423 XNForeground, fg,
1370 XNForeground, fg, XNBackground, bg, 1424 XNBackground, bg,
1425 XNArea, &rect,
1426 XNFontSet, fs,
1427 NULL);
1428 status_attr = XVaCreateNestedList (0,
1429 XNForeground, fg,
1430 XNBackground, bg,
1431 XNArea, &status_rect,
1371 //XNFontSet, TermWin.fontset, 1432 XNFontSet, fs,
1372 NULL); 1433 NULL);
1373 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1374 XNForeground, fg, XNBackground, bg,
1375 //XNFontSet, TermWin.fontset,
1376 NULL);
1377 } 1434 }
1378 1435
1379 Input_Context = XCreateIC (xim, XNInputStyle, input_style, 1436 Input_Context = XCreateIC (xim,
1437 XNInputStyle, input_style,
1380 XNClientWindow, TermWin.parent[0], 1438 XNClientWindow, TermWin.vt,
1381 XNFocusWindow, TermWin.parent[0], 1439 XNFocusWindow, TermWin.parent[0],
1382 preedit_attr ? XNPreeditAttributes : NULL, 1440 preedit_attr ? XNPreeditAttributes : NULL,
1383 preedit_attr, 1441 preedit_attr,
1384 status_attr ? XNStatusAttributes : NULL, 1442 status_attr ? XNStatusAttributes : NULL,
1385 status_attr, NULL); 1443 status_attr, NULL);
1444
1386 if (preedit_attr) XFree (preedit_attr); 1445 if (preedit_attr) XFree (preedit_attr);
1387 if (status_attr) XFree (status_attr); 1446 if (status_attr) XFree (status_attr);
1447 if (fs) XFreeFontSet (display->display, fs);
1388 1448
1389 if (Input_Context == NULL) 1449 if (Input_Context == NULL)
1390 { 1450 {
1391 rxvt_print_error ("failed to create input context"); 1451 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1392 display->put_xim (input_method); 1452 im_destroy ();
1393 return false; 1453 return false;
1394 } 1454 }
1395 1455
1396 if (input_style & XIMPreeditArea) 1456 if (input_style & XIMPreeditArea)
1397 IMSetStatusPosition (); 1457 IMSetStatusPosition ();
… …
1427 s = rxvt_splitcommastring (p); 1487 s = rxvt_splitcommastring (p);
1428 for (i = 0; s[i]; i++) 1488 for (i = 0; s[i]; i++)
1429 { 1489 {
1430 if (*s[i]) 1490 if (*s[i])
1431 { 1491 {
1432 STRCPY (buf, "@im="); 1492 strcpy (buf, "@im=");
1433 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1493 strncat (buf, s[i], IMBUFSIZ - 5);
1434 if (IM_get_IC (buf)) 1494 if (IM_get_IC (buf))
1435 { 1495 {
1436 found = true; 1496 found = true;
1437 break; 1497 break;
1438 } 1498 }
… …
1462} 1522}
1463 1523
1464void 1524void
1465rxvt_term::IMSetStatusPosition () 1525rxvt_term::IMSetStatusPosition ()
1466{ 1526{
1467 XRectangle preedit_rect, status_rect, *needed_rect; 1527 XRectangle preedit_rect, status_rect, *needed_rect;
1468 XVaNestedList preedit_attr, status_attr; 1528 XVaNestedList preedit_attr, status_attr;
1469 1529
1470 if (Input_Context == NULL 1530 if (!Input_Context
1531 || !TermWin.focus
1471 || !TermWin.focus || ! (input_style & XIMPreeditArea) 1532 || !(input_style & XIMPreeditArea)
1472 || !IMisRunning ()) 1533 || !IMisRunning ())
1473 return; 1534 return;
1474 1535
1475 /* Getting the necessary width of preedit area */ 1536 /* Getting the necessary width of preedit area */
1476 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1537 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1477 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1538 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1478 XFree (status_attr); 1539 XFree (status_attr);
1479 1540
1480 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect); 1541 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1542 XFree (needed_rect);
1481 1543
1482 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1544 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1483 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1545 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1484 1546
1485 XSetICValues (Input_Context, 1547 XSetICValues (Input_Context,
1486 XNPreeditAttributes, preedit_attr, 1548 XNPreeditAttributes, preedit_attr,
1487 XNStatusAttributes, status_attr, NULL); 1549 XNStatusAttributes, status_attr, NULL);
1488 1550
1489 XFree (preedit_attr); 1551 XFree (preedit_attr);
1490 XFree (status_attr); 1552 XFree (status_attr);
1491} 1553}
1492#endif /* USE_XIM */ 1554#endif /* USE_XIM */

Diff Legend

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