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

Diff Legend

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