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.18 by pcg, Fri Dec 19 06:17:03 2003 UTC vs.
Revision 1.65 by pcg, Fri Apr 2 15:15:26 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*;
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.18 2003/12/19 06:17:03 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * 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>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
12 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
13 * - extensive modifications 12 * - extensive modifications
14 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
15 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
16 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
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);
72{ 139{
73 free (p); 140 free (p);
74} 141}
75 142
76rxvt_term::rxvt_term () 143rxvt_term::rxvt_term ()
77: destroy_ev (this, &rxvt_term::destroy_cb), 144 :
145 rootwin_ev (this, &rxvt_term::rootwin_cb),
146 termwin_ev (this, &rxvt_term::x_cb),
147 vt_ev (this, &rxvt_term::x_cb),
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
78#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif
157#ifdef TEXT_BLINK
79 blink_ev (this, &rxvt_term::blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
80#endif 159#endif
81#ifdef POINTER_BLANK 160#ifdef POINTER_BLANK
82 pointer_ev (this, &rxvt_term::pointer_cb), 161 pointer_ev (this, &rxvt_term::pointer_cb),
83#endif 162#endif
163#ifdef USE_XIM
84 x_ev (this, &rxvt_term::x_cb), 164 im_ev (this, &rxvt_term::im_cb),
165#endif
85 check_ev (this, &rxvt_term::check_cb), 166 check_ev (this, &rxvt_term::check_cb),
167 destroy_ev (this, &rxvt_term::destroy_cb),
168 pty_ev (this, &rxvt_term::pty_cb),
86 incr_ev (this, &rxvt_term::incr_cb), 169 incr_ev (this, &rxvt_term::incr_cb)
87 pty_ev (this, &rxvt_term::pty_cb)
88{ 170{
89 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 171 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
172
173 termlist.push_back (this);
90} 174}
91 175
92rxvt_term::~rxvt_term () 176rxvt_term::~rxvt_term ()
93{ 177{
94 scr_release (); 178 termlist.erase (find (termlist.begin (), termlist.end(), this));
95
96 free (locale);
97 free (codeset);
98
99#ifndef NO_SETOWNER_TTYDEV
100 rxvt_privileged_ttydev (this, RESTORE);
101#endif
102#ifdef UTMP_SUPPORT
103 rxvt_privileged_utmp (this, RESTORE);
104#endif
105#ifdef USE_XIM
106 if (Input_Context != NULL)
107 {
108 XDestroyIC (Input_Context);
109 Input_Context = NULL;
110 }
111#endif
112 179
113 if (cmd_fd >= 0) 180 if (cmd_fd >= 0)
114 close (cmd_fd); 181 close (cmd_fd);
115 182
116 if (Xfd >= 0) 183#ifndef NO_SETOWNER_TTYDEV
117 XCloseDisplay (Xdisplay); 184 privileged_ttydev (RESTORE);
185#endif
186#ifdef UTMP_SUPPORT
187 privileged_utmp (RESTORE);
188#endif
189
190 delete TermWin.fontset;
191
192 if (display)
193 {
194 selection_clear ();
195
196#ifdef MENUBAR
197 if (menubarGC) XFreeGC (display->display, menubarGC);
198#endif
199#ifdef XTERM_SCROLLBAR
200 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
201 if (ShadowGC) XFreeGC (display->display, ShadowGC);
202#endif
203#ifdef PLAIN_SCROLLBAR
204 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC);
205#endif
206#ifdef NEXT_SCROLLBAR
207 if (blackGC) XFreeGC (display->display, blackGC);
208 if (whiteGC) XFreeGC (display->display, whiteGC);
209 if (grayGC) XFreeGC (display->display, grayGC);
210 if (darkGC) XFreeGC (display->display, darkGC);
211 if (stippleGC) XFreeGC (display->display, stippleGC);
212 if (dimple) XFreePixmap (display->display, dimple);
213 if (upArrow) XFreePixmap (display->display, upArrow);
214 if (downArrow) XFreePixmap (display->display, downArrow);
215 if (upArrowHi) XFreePixmap (display->display, upArrowHi);
216 if (downArrowHi) XFreePixmap (display->display, downArrowHi);
217#endif
218#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
219 if (topShadowGC) XFreeGC (display->display, topShadowGC);
220 if (botShadowGC) XFreeGC (display->display, botShadowGC);
221 if (scrollbarGC) XFreeGC (display->display, scrollbarGC);
222#endif
223 if (TermWin.gc) XFreeGC (display->display, TermWin.gc);
224
225#if defined(MENUBAR) && (MENUBAR_MAX > 1)
226 delete menuBar.drawable;
227 //if (menuBar.win)
228 // XDestroyWindow (display->display, menuBar.win);
229#endif
230 delete TermWin.drawable;
231 // destroy all windows
232 if (TermWin.parent[0])
233 XDestroyWindow (display->display, TermWin.parent[0]);
234 }
235
236 // TODO: free pixcolours, colours should become part of rxvt_display
118 237
119 delete PixColors; 238 delete PixColors;
239
240 displays.put (display);
241
242 scr_release ();
243
244 /* clear all resources */
245 for (int i = 0; i < allocated.size (); i++)
246 free (allocated[i]);
247
248 free (selection.text);
249 // TODO: manage env vars in child only(!)
250 free (env_windowid);
251 free (env_display);
252 free (env_term);
253 free (env_colorfgbg);
254 free (locale);
255#if 0
256 free (codeset);
257#endif
258
259 delete envv;
260 delete argv;
120} 261}
121 262
122void 263void
123rxvt_term::destroy () 264rxvt_term::destroy ()
124{ 265{
266 if (display)
267 {
268 rootwin_ev.stop (display);
269 termwin_ev.stop (display);
270 vt_ev.stop (display);
271#ifdef USE_XIM
272 im_destroy ();
273 im_ev.stop (display);
274#endif
275#ifdef HAVE_SCROLLBARS
276 scrollbar_ev.stop (display);
277#endif
278#ifdef MENUBAR
279 menubar_ev.stop (display);
280#endif
281 }
282
125 check_ev.stop (); 283 check_ev.stop ();
126 pty_ev.stop (); 284 pty_ev.stop ();
127 x_ev.stop ();
128#ifdef CURSOR_BLINK 285#ifdef CURSOR_BLINK
286 cursor_blink_ev.stop ();
287#endif
288#ifdef TEXT_BLINK
129 blink_ev.stop (); 289 text_blink_ev.stop ();
130#endif 290#endif
131#ifdef POINTER_BLANK 291#ifdef POINTER_BLANK
132 pointer_ev.stop (); 292 pointer_ev.stop ();
133#endif 293#endif
134 294
142 302
143 delete this; 303 delete this;
144} 304}
145 305
146/*----------------------------------------------------------------------*/ 306/*----------------------------------------------------------------------*/
147/* rxvt_init() */ 307/* rxvt_init () */
148/* LIBPROTO */ 308bool
149rxvt_t
150rxvt_init (int argc, const char *const *argv) 309rxvt_term::init (int argc, const char *const *argv)
151{ 310{
152 SET_R (new rxvt_term); 311 SET_R (this);
153 dR;
154 312
155 if (!R->init_vars () || !R->init (argc, argv)) 313 if (!init_vars ())
156 { 314 return false;
157 delete R; 315
158 return NULL; 316 /*
317 * Save and then give up any super-user privileges
318 * If we need privileges in any area then we must specifically request it.
319 * We should only need to be root in these cases:
320 * 1. write utmp entries on some systems
321 * 2. chown tty on some systems
322 */
323 privileges (SAVE);
324 privileges (IGNORE);
325
326 init_secondary ();
327
328 const char **cmd_argv = init_resources (argc, argv);
329
330 set_locale ("");
331
332#if MENUBAR_MAX
333 menubar_read (rs[Rs_menu]);
334#endif
335#ifdef HAVE_SCROLLBARS
336 if (Options & Opt_scrollBar)
337 scrollBar.setIdle (); /* set existence for size calculations */
338#endif
339
340 create_windows (argc, argv);
341
342 init_xlocale ();
343
344 scr_reset (); /* initialize screen */
345
346#if 0
347 XSynchronize (display->display, True);
348#endif
349
350#ifdef HAVE_SCROLLBARS
351 if (Options & Opt_scrollBar)
352 resize_scrollbar (); /* create and map scrollbar */
353#endif
354#if (MENUBAR_MAX)
355 if (menubar_visible ())
356 XMapWindow (display->display, menuBar.win);
357#endif
358#ifdef TRANSPARENT
359 if (Options & Opt_transparent)
159 } 360 {
361 XSelectInput (display->display, display->root, PropertyChangeMask);
362 check_our_parents ();
363 }
364#endif
160 365
366 rootwin_ev.start (display, display->root);
367
368 XMapWindow (display->display, TermWin.vt);
369 XMapWindow (display->display, TermWin.parent[0]);
370
371 init_command (cmd_argv);
372
373 pty_ev.start (cmd_fd, EVENT_READ);
374
375 check_ev.start ();
376
161 return R; 377 return true;
162} 378}
163 379
164/* EXTPROTO */ 380static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
381
165void 382void
166rxvt_init_signals () 383rxvt_init_signals ()
167{ 384{
168/* install exit handler for cleanup */ 385 /* install exit handler for cleanup */
169#if 0 386#if 0
170#ifdef HAVE_ATEXIT 387#ifdef HAVE_ATEXIT
171 atexit(rxvt_clean_exit); 388 atexit (rxvt_clean_exit);
172#else 389#else
173#endif 390#endif
174#endif 391#endif
175 392
176 struct sigaction sa; 393 struct sigaction sa;
182 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0); 399 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
183 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0); 400 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
184 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0); 401 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
185 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0); 402 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
186 403
187/* need to trap SIGURG for SVR4 (Unixware) rlogin */ 404 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
188/* signal (SIGURG, SIG_DFL); */ 405 /* signal (SIGURG, SIG_DFL); */
189 406
190 XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 407 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
191 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 408 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
192}
193
194bool
195rxvt_term::init (int argc, const char *const *argv)
196{
197 /*
198 * Save and then give up any super-user privileges
199 * If we need privileges in any area then we must specifically request it.
200 * We should only need to be root in these cases:
201 * 1. write utmp entries on some systems
202 * 2. chown tty on some systems
203 */
204 rxvt_privileges (this, SAVE);
205 rxvt_privileges (this, IGNORE);
206
207 init_secondary ();
208
209 const char **cmd_argv = init_resources (argc, argv);
210
211 set_locale ("");
212
213#if (MENUBAR_MAX)
214 rxvt_menubar_read (this, rs[Rs_menu]);
215#endif
216#ifdef HAVE_SCROLLBARS
217 if (Options & Opt_scrollBar)
218 scrollBar.setIdle (); /* set existence for size calculations */
219#endif
220
221 create_windows (argc, argv);
222
223 init_xlocale ();
224
225 scr_reset (); /* initialize screen */
226#ifdef RXVT_GRAPHICS
227 rxvt_Gr_reset (this); /* reset graphics */
228#endif
229
230#if 0
231#ifdef DEBUG_X
232 XSynchronize(Xdisplay, True);
233#endif
234#endif
235
236#ifdef HAVE_SCROLLBARS
237 if (Options & Opt_scrollBar)
238 resize_scrollbar (); /* create and map scrollbar */
239#endif
240#if (MENUBAR_MAX)
241 if (menubar_visible(r))
242 XMapWindow (Xdisplay, menuBar.win);
243#endif
244#ifdef TRANSPARENT
245 if (Options & Opt_transparent)
246 {
247 XSelectInput (Xdisplay, Xroot, PropertyChangeMask);
248 rxvt_check_our_parents (this);
249 }
250#endif
251 XMapWindow (Xdisplay, TermWin.vt);
252 XMapWindow (Xdisplay, TermWin.parent[0]);
253
254 init_env ();
255 init_command (cmd_argv);
256
257 x_ev.start (Xfd, EVENT_READ);
258 pty_ev.start (cmd_fd, EVENT_READ);
259
260 check_ev.start ();
261
262 process_x_events ();
263
264 return true;
265} 409}
266 410
267/* ------------------------------------------------------------------------- * 411/* ------------------------------------------------------------------------- *
268 * SIGNAL HANDLING & EXIT HANDLER * 412 * SIGNAL HANDLING & EXIT HANDLER *
269 * ------------------------------------------------------------------------- */ 413 * ------------------------------------------------------------------------- */
270/* 414/*
271 * Catch a SIGCHLD signal and exit if the direct child has died 415 * Catch a SIGCHLD signal and exit if the direct child has died
272 */ 416 */
417
418void rxvt_term::child_exited (int pid)
419{
420 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
421 if (pid == (*t)->cmd_pid)
422 {
423 (*t)->destroy ();
424 break;
425 }
426}
427
273/* ARGSUSED */ 428/* ARGSUSED */
274/* EXTPROTO */ 429/* EXTPROTO */
275RETSIGTYPE 430RETSIGTYPE
276rxvt_Child_signal(int sig __attribute__ ((unused))) 431rxvt_Child_signal (int sig __attribute__ ((unused)))
277{ 432{
278 int pid, save_errno = errno; 433 int pid, save_errno = errno;
434
279 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 435 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
280 ; 436 rxvt_term::child_exited (pid);
437
281 errno = save_errno; 438 errno = save_errno;
282
283#if 0
284 if (pid == R->cmd_pid)
285 exit (EXIT_SUCCESS);
286#endif
287} 439}
288 440
289/* 441/*
290 * Catch a fatal signal and tidy up before quitting 442 * Catch a fatal signal and tidy up before quitting
291 */ 443 */
292/* EXTPROTO */ 444/* EXTPROTO */
293RETSIGTYPE 445RETSIGTYPE
294rxvt_Exit_signal(int sig) 446rxvt_Exit_signal (int sig)
295{ 447{
296 signal(sig, SIG_DFL); 448 signal (sig, SIG_DFL);
297#ifdef DEBUG_CMD 449#ifdef DEBUG_CMD
298 rxvt_print_error("signal %d", sig); 450 rxvt_warn ("caught signal %d, exiting.\n", sig);
299#endif 451#endif
300 rxvt_clean_exit(); 452 rxvt_clean_exit ();
301 kill(getpid(), sig); 453 kill (getpid (), sig);
302} 454}
303 455
304/* ARGSUSED */
305/* INTPROTO */ 456/* INTPROTO */
306int 457int
307rxvt_xerror_handler(const Display * display 458rxvt_xerror_handler (Display *display, XErrorEvent *event)
308 __attribute__ ((unused)), const XErrorEvent * event)
309{ 459{
310 dR;
311
312 if (R->allowedxerror == -1) 460 if (GET_R->allowedxerror == -1)
313 R->allowedxerror = event->error_code; 461 GET_R->allowedxerror = event->error_code;
314 else 462 else
315 { 463 {
316 rxvt_print_error("XError: Request: %d . %d, Error: %d", 464 old_xerror_handler (display, event);
317 event->request_code, event->minor_code,
318 event->error_code);
319
320 R->destroy (); 465 GET_R->destroy ();
321 } 466 }
322 467
323 return 0; 468 return 0;
324} 469}
325 470
330 */ 475 */
331/* EXTPROTO */ 476/* EXTPROTO */
332void 477void
333rxvt_clean_exit () 478rxvt_clean_exit ()
334{ 479{
335 dR; 480 // TODO: rxvtd should clean up all ressources
336 481 if (GET_R)
337 R->destroy (); 482 GET_R->destroy ();
338} 483}
339 484
340/* ------------------------------------------------------------------------- * 485/* ------------------------------------------------------------------------- *
341 * MEMORY ALLOCATION WRAPPERS * 486 * MEMORY ALLOCATION WRAPPERS *
342 * ------------------------------------------------------------------------- */ 487 * ------------------------------------------------------------------------- */
343/* EXTPROTO */ 488/* EXTPROTO */
344void * 489void *
345rxvt_malloc(size_t size) 490rxvt_malloc (size_t size)
346{ 491{
347 void *p; 492 void *p;
348 493
349 p = malloc(size); 494 p = malloc (size);
350 if (p) 495 if (p)
351 return p; 496 return p;
352 497
353 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 498 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
354 rxvt_clean_exit(); 499 rxvt_clean_exit ();
355 exit(EXIT_FAILURE); 500 exit (EXIT_FAILURE);
356/* NOTREACHED */ 501 /* NOTREACHED */
357} 502}
358 503
359/* EXTPROTO */ 504/* EXTPROTO */
360void * 505void *
361rxvt_calloc(size_t number, size_t size) 506rxvt_calloc (size_t number, size_t size)
362{ 507{
363 void *p; 508 void *p;
364 509
365 p = calloc(number, size); 510 p = calloc (number, size);
366 if (p) 511 if (p)
367 return p; 512 return p;
368 513
369 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 514 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
370 rxvt_clean_exit(); 515 rxvt_clean_exit ();
371 exit(EXIT_FAILURE); 516 exit (EXIT_FAILURE);
372/* NOTREACHED */ 517 /* NOTREACHED */
373} 518}
374 519
375/* EXTPROTO */ 520/* EXTPROTO */
376void * 521void *
377rxvt_realloc(void *ptr, size_t size) 522rxvt_realloc (void *ptr, size_t size)
378{ 523{
379 void *p; 524 void *p;
380 525
381 if (ptr) 526 if (ptr)
382 p = realloc(ptr, size); 527 p = realloc (ptr, size);
383 else 528 else
384 p = malloc(size); 529 p = malloc (size);
385 if (p) 530 if (p)
386 return p; 531 return p;
387 532
388 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 533 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
389 rxvt_clean_exit(); 534 rxvt_clean_exit ();
390 exit(EXIT_FAILURE); 535 exit (EXIT_FAILURE);
391/* NOTREACHED */ 536 /* NOTREACHED */
392} 537}
393 538
394/* ------------------------------------------------------------------------- * 539/* ------------------------------------------------------------------------- *
395 * PRIVILEGED OPERATIONS * 540 * PRIVILEGED OPERATIONS *
396 * ------------------------------------------------------------------------- */ 541 * ------------------------------------------------------------------------- */
397/* take care of suid/sgid super-user (root) privileges */ 542/* take care of suid/sgid super-user (root) privileges */
398/* INTPROTO */
399void 543void
400rxvt_privileges(pR_ int mode) 544rxvt_term::privileges (int mode)
401{ 545{
402#if ! defined(__CYGWIN32__) 546#if ! defined(__CYGWIN32__)
403# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 547# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
404/* setreuid() is the poor man's setuid(), seteuid() */ 548 /* setreuid () is the poor man's setuid (), seteuid () */
405# define seteuid(a) setreuid(-1, (a)) 549# define seteuid(a) setreuid(-1, (a))
406# define setegid(a) setregid(-1, (a)) 550# define setegid(a) setregid(-1, (a))
407# define HAVE_SETEUID 551# define HAVE_SETEUID
408# endif 552# endif
409# ifdef HAVE_SETEUID 553# ifdef HAVE_SETEUID
410 switch (mode) { 554 switch (mode)
555 {
411 case IGNORE: 556 case IGNORE:
412 /* 557 /*
413 * change effective uid/gid - not real uid/gid - so we can switch 558 * change effective uid/gid - not real uid/gid - so we can switch
414 * back to root later, as required 559 * back to root later, as required
415 */ 560 */
416 seteuid(getuid()); 561 seteuid (getuid ());
417 setegid(getgid()); 562 setegid (getgid ());
418 break; 563 break;
419 case SAVE: 564 case SAVE:
420 R->euid = geteuid(); 565 euid = geteuid ();
421 R->egid = getegid(); 566 egid = getegid ();
422 break; 567 break;
423 case RESTORE: 568 case RESTORE:
424 seteuid(R->euid); 569 seteuid (euid);
425 setegid(R->egid); 570 setegid (egid);
426 break; 571 break;
427 } 572 }
428# else 573# else
429 switch (mode) { 574 switch (mode)
575 {
430 case IGNORE: 576 case IGNORE:
431 setuid(getuid()); 577 setuid (getuid ());
432 setgid(getgid()); 578 setgid (getgid ());
433 /* FALLTHROUGH */ 579 /* FALLTHROUGH */
434 case SAVE: 580 case SAVE:
435 /* FALLTHROUGH */ 581 /* FALLTHROUGH */
436 case RESTORE: 582 case RESTORE:
437 break; 583 break;
438 } 584 }
439# endif 585# endif
440#endif 586#endif
441} 587}
442 588
443#ifdef UTMP_SUPPORT 589#ifdef UTMP_SUPPORT
444/* EXTPROTO */
445void 590void
446rxvt_privileged_utmp(pR_ char action) 591rxvt_term::privileged_utmp (char action)
447{ 592{
448 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 593 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
449 action, R->next_utmp_action, getpid())); 594 action, next_utmp_action, getpid ()));
450 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) 595 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
451 || (R->Options & Opt_utmpInhibit) 596 || (Options & Opt_utmpInhibit)
452 || R->ttydev == NULL || *R->ttydev == '\0') 597 || ttydev == NULL || *ttydev == '\0')
453 return; 598 return;
454 599
455 rxvt_privileges(aR_ RESTORE); 600 privileges (RESTORE);
456 if (action == SAVE) { 601 if (action == SAVE)
602 {
457 R->next_utmp_action = RESTORE; 603 next_utmp_action = RESTORE;
458 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 604 makeutent (ttydev, rs[Rs_display_name]);
605 }
606 else
459 } else { /* action == RESTORE */ 607 { /* action == RESTORE */
460 R->next_utmp_action = IGNORE; 608 next_utmp_action = IGNORE;
461 rxvt_cleanutent(aR); 609 cleanutent ();
462 } 610 }
463 rxvt_privileges(aR_ IGNORE); 611 privileges (IGNORE);
464} 612}
465#endif 613#endif
466 614
467#ifndef NO_SETOWNER_TTYDEV 615#ifndef NO_SETOWNER_TTYDEV
468/* EXTPROTO */
469void 616void
470rxvt_privileged_ttydev(pR_ char action) 617rxvt_term::privileged_ttydev (char action)
471{ 618{
472 D_MAIN((stderr, 619 D_MAIN ((stderr,
473 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", 620 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
474 action, R->next_tty_action, getpid())); 621 action, next_tty_action, getpid ()));
475 if (R->next_tty_action != action || (action != SAVE && action != RESTORE) 622 if (next_tty_action != action || (action != SAVE && action != RESTORE)
476 || R->ttydev == NULL || *R->ttydev == '\0') 623 || ttydev == NULL || *ttydev == '\0')
477 return; 624 return;
478 625
479 rxvt_privileges(aR_ RESTORE); 626 privileges (RESTORE);
480 627
481 if (action == SAVE) { 628 if (action == SAVE)
629 {
482 R->next_tty_action = RESTORE; 630 next_tty_action = RESTORE;
483# ifndef RESET_TTY_TO_COMMON_DEFAULTS 631# ifndef RESET_TTY_TO_COMMON_DEFAULTS
484/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 632 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
485 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ 633 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
486 R->next_tty_action = IGNORE; 634 next_tty_action = IGNORE;
487 else 635 else
488# endif 636# endif
637
489 { 638 {
490 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */ 639 chown (ttydev, getuid (), ttygid); /* fail silently */
491 chmod(R->ttydev, R->ttymode); 640 chmod (ttydev, ttymode);
492# ifdef HAVE_REVOKE 641# ifdef HAVE_REVOKE
493 revoke(R->ttydev); 642 revoke (ttydev);
494# endif 643# endif
644
495 } 645 }
646 }
647 else
496 } else { /* action == RESTORE */ 648 { /* action == RESTORE */
497 R->next_tty_action = IGNORE; 649 next_tty_action = IGNORE;
498# ifndef RESET_TTY_TO_COMMON_DEFAULTS 650# ifndef RESET_TTY_TO_COMMON_DEFAULTS
499 chmod(R->ttydev, R->ttyfd_stat.st_mode); 651 chmod (ttydev, ttyfd_stat.st_mode);
500 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); 652 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
501# else 653# else
502 chmod(R->ttydev, 654 chmod (ttydev,
503 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 655 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
504 chown(R->ttydev, 0, 0); 656 chown (ttydev, 0, 0);
505# endif 657# endif
506 }
507 658
659 }
660
508 rxvt_privileges(aR_ IGNORE); 661 privileges (IGNORE);
509 662
510# ifndef RESET_TTY_TO_COMMON_DEFAULTS 663# ifndef RESET_TTY_TO_COMMON_DEFAULTS
511 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 664 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
512 action == RESTORE ? "Restoring" : (action == 665 action == RESTORE ? "Restoring" : (action ==
513 SAVE ? "Saving" : 666 SAVE ? "Saving" :
514 "UNKNOWN ERROR for"), R->ttydev, 667 "UNKNOWN ERROR for"), ttydev,
515 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, 668 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
516 R->ttyfd_stat.st_gid)); 669 ttyfd_stat.st_gid));
517# endif 670# endif
518} 671}
519#endif 672#endif
520 673
521/*----------------------------------------------------------------------*/ 674/*----------------------------------------------------------------------*/
524 * if width/height are non-zero then override calculated width/height 677 * if width/height are non-zero then override calculated width/height
525 */ 678 */
526void 679void
527rxvt_term::window_calc (unsigned int width, unsigned int height) 680rxvt_term::window_calc (unsigned int width, unsigned int height)
528{ 681{
529 short recalc_x, recalc_y; 682 short recalc_x, recalc_y;
530 int x, y, sb_w, mb_h, flags; 683 int x, y, sb_w, mb_h, flags;
531 unsigned int w, h; 684 unsigned int w, h;
532 unsigned int max_width, max_height; 685 unsigned int max_width, max_height;
533 686
534 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 687 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
535 TermWin.ncol, TermWin.nrow, szHint.width, 688 TermWin.ncol, TermWin.nrow, szHint.width,
536 szHint.height)); 689 szHint.height));
537 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 690 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
538 szHint.win_gravity = NorthWestGravity; 691 szHint.win_gravity = NorthWestGravity;
539/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 692 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
540 693
541 recalc_x = recalc_y = 0; 694 recalc_x = recalc_y = 0;
542 flags = 0; 695 flags = 0;
543 if (!parsed_geometry) { 696 if (!parsed_geometry)
697 {
544 parsed_geometry = 1; 698 parsed_geometry = 1;
545 if (rs[Rs_geometry]) 699 if (rs[Rs_geometry])
546 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h); 700 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
547 if (flags & WidthValue) { 701 if (flags & WidthValue)
702 {
548 TermWin.ncol = BOUND_POSITIVE_INT16(w); 703 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
549 szHint.flags |= USSize; 704 szHint.flags |= USSize;
550 } 705 }
551 if (flags & HeightValue) { 706 if (flags & HeightValue)
707 {
552 TermWin.nrow = BOUND_POSITIVE_INT16(h); 708 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
553 szHint.flags |= USSize; 709 szHint.flags |= USSize;
554 } 710 }
555 if (flags & XValue) { 711 if (flags & XValue)
712 {
556 szHint.x = x; 713 szHint.x = x;
557 szHint.flags |= USPosition; 714 szHint.flags |= USPosition;
558 if (flags & XNegative) { 715 if (flags & XNegative)
716 {
559 recalc_x = 1; 717 recalc_x = 1;
560 szHint.win_gravity = NorthEastGravity; 718 szHint.win_gravity = NorthEastGravity;
561 } 719 }
562 } 720 }
563 if (flags & YValue) { 721 if (flags & YValue)
722 {
564 szHint.y = y; 723 szHint.y = y;
565 szHint.flags |= USPosition; 724 szHint.flags |= USPosition;
566 if (flags & YNegative) { 725 if (flags & YNegative)
726 {
567 recalc_y = 1; 727 recalc_y = 1;
568 if (szHint.win_gravity == NorthEastGravity) 728 if (szHint.win_gravity == NorthEastGravity)
569 szHint.win_gravity = SouthEastGravity; 729 szHint.win_gravity = SouthEastGravity;
570 else 730 else
571 szHint.win_gravity = SouthWestGravity; 731 szHint.win_gravity = SouthWestGravity;
572 } 732 }
573 } 733 }
574 } 734 }
735
575/* TODO: BOUNDS */ 736 /* TODO: BOUNDS */
576 TermWin.width = TermWin.ncol * TermWin.fwidth; 737 TermWin.width = TermWin.ncol * TermWin.fwidth;
577 TermWin.height = TermWin.nrow * TermWin.fheight; 738 TermWin.height = TermWin.nrow * TermWin.fheight;
578 max_width = MAX_COLS * TermWin.fwidth; 739 max_width = MAX_COLS * TermWin.fwidth;
579 max_height = MAX_ROWS * TermWin.fheight; 740 max_height = MAX_ROWS * TermWin.fheight;
580 741
581 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 742 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
582 743
583 sb_w = mb_h = 0; 744 sb_w = mb_h = 0;
584 window_vt_x = window_vt_y = 0; 745 window_vt_x = window_vt_y = 0;
585 if (scrollbar_visible (this)) { 746 if (scrollbar_visible ())
747 {
586 sb_w = scrollbar_TotalWidth(); 748 sb_w = scrollbar_TotalWidth ();
587 szHint.base_width += sb_w; 749 szHint.base_width += sb_w;
588 if (!(Options & Opt_scrollBar_right)) 750 if (! (Options & Opt_scrollBar_right))
589 window_vt_x = sb_w; 751 window_vt_x = sb_w;
590 } 752 }
591 if (menubar_visible (this)) { 753 if (menubar_visible ())
754 {
592 mb_h = menuBar_TotalHeight(); 755 mb_h = menuBar_TotalHeight ();
593 szHint.base_height += mb_h; 756 szHint.base_height += mb_h;
594 window_vt_y = mb_h; 757 window_vt_y = mb_h;
595 } 758 }
596 szHint.width_inc = TermWin.fwidth; 759 szHint.width_inc = TermWin.fwidth;
597 szHint.height_inc = TermWin.fheight; 760 szHint.height_inc = TermWin.fheight;
598 szHint.min_width = szHint.base_width + szHint.width_inc; 761 szHint.min_width = szHint.base_width + szHint.width_inc;
599 szHint.min_height = szHint.base_height + szHint.height_inc; 762 szHint.min_height = szHint.base_height + szHint.height_inc;
600 763
601 if (width && width - szHint.base_width < max_width) { 764 if (width && width - szHint.base_width < max_width)
765 {
602 szHint.width = width; 766 szHint.width = width;
603 TermWin.width = width - szHint.base_width; 767 TermWin.width = width - szHint.base_width;
604 } else { 768 }
769 else
770 {
605 MIN_IT(TermWin.width, max_width); 771 MIN_IT (TermWin.width, max_width);
606 szHint.width = szHint.base_width + TermWin.width; 772 szHint.width = szHint.base_width + TermWin.width;
607 } 773 }
608 if (height && height - szHint.base_height < max_height) { 774 if (height && height - szHint.base_height < max_height)
775 {
609 szHint.height = height; 776 szHint.height = height;
610 TermWin.height = height - szHint.base_height; 777 TermWin.height = height - szHint.base_height;
611 } else { 778 }
779 else
780 {
612 MIN_IT(TermWin.height, max_height); 781 MIN_IT (TermWin.height, max_height);
613 szHint.height = szHint.base_height + TermWin.height; 782 szHint.height = szHint.base_height + TermWin.height;
614 } 783 }
615 if (scrollbar_visible (this) && (Options & Opt_scrollBar_right)) 784 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
616 window_sb_x = szHint.width - sb_w; 785 window_sb_x = szHint.width - sb_w;
617 786
618 if (recalc_x) 787 if (recalc_x)
619 szHint.x += (DisplayWidth (Xdisplay, DefaultScreen (Xdisplay)) 788 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
620 - szHint.width - 2 * TermWin.ext_bwidth); 789 - szHint.width - 2 * TermWin.ext_bwidth);
621 if (recalc_y) 790 if (recalc_y)
622 szHint.y += (DisplayHeight (Xdisplay, DefaultScreen (Xdisplay)) 791 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
623 - szHint.height - 2 * TermWin.ext_bwidth); 792 - szHint.height - 2 * TermWin.ext_bwidth);
624 793
625 TermWin.ncol = TermWin.width / TermWin.fwidth; 794 TermWin.ncol = TermWin.width / TermWin.fwidth;
626 TermWin.nrow = TermWin.height / TermWin.fheight; 795 TermWin.nrow = TermWin.height / TermWin.fheight;
627 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 796 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
628 TermWin.ncol, TermWin.nrow, szHint.width, 797 TermWin.ncol, TermWin.nrow, szHint.width,
629 szHint.height)); 798 szHint.height));
630 return; 799 return;
631} 800}
632 801
633/*----------------------------------------------------------------------*/ 802/*----------------------------------------------------------------------*/
634/* 803/*
635 * Tell the teletype handler what size the window is. 804 * Tell the teletype handler what size the window is.
636 * Called after a window size change. 805 * Called after a window size change.
637 */ 806 */
638void 807void
639rxvt_term::tt_winch () 808rxvt_term::tt_winch ()
640{ 809{
641 struct winsize ws; 810 struct winsize ws;
642 811
643 if (cmd_fd < 0) 812 if (cmd_fd < 0)
644 return; 813 return;
645 814
646 ws.ws_col = TermWin.ncol; 815 ws.ws_col = TermWin.ncol;
648 ws.ws_xpixel = ws.ws_ypixel = 0; 817 ws.ws_xpixel = ws.ws_ypixel = 0;
649#ifndef DEBUG_SIZE 818#ifndef DEBUG_SIZE
650 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 819 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
651#else 820#else
652 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 821 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
653 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 822 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
654# ifdef SIGWINCH 823# ifdef SIGWINCH
655 else if (cmd_pid) /* force through to the command */ 824 else if (cmd_pid) /* force through to the command */
656 kill (cmd_pid, SIGWINCH); 825 kill (cmd_pid, SIGWINCH);
657# endif 826# endif
658#endif 827#endif
659} 828}
660 829
661/*----------------------------------------------------------------------*/ 830/*----------------------------------------------------------------------*/
662/* rxvt_change_font() - Switch to a new font */ 831/* rxvt_change_font () - Switch to a new font */
663/* 832/*
664 * init = 1 - initialize 833 * init = 1 - initialize
665 * 834 *
666 * fontname == FONT_UP - switch to bigger font 835 * fontname == FONT_UP - switch to bigger font
667 * fontname == FONT_DN - switch to smaller font 836 * fontname == FONT_DN - switch to smaller font
668 */ 837 */
669/* EXTPROTO */ 838bool
670void
671rxvt_change_font(pR_ int init, const char *fontname) 839rxvt_term::change_font (const char *fontname)
672{ 840{
673} 841 if (fontname == FONT_UP)
842 {
843 // TODO
844 }
845 else if (fontname == FONT_DN)
846 {
847 // TODO
848 }
849 else
850 {
851 rxvt_fontset *fs = new rxvt_fontset (this);
674 852
675/* INTPROTO */ 853 if (fs && fs->populate (fontname ? fontname : "fixed"))
676void 854 {
855 delete TermWin.fontset;
856 TermWin.fontset = fs;
857 TermWin.fwidth = fs->base_font ()->width;
858 TermWin.fheight = fs->base_font ()->height;
859 TermWin.fbase = fs->base_font ()->ascent;
860
861 if (TermWin.parent[0])
862 {
863 resize_all_windows (0, 0, 0);
864 scr_remap_chars ();
865 scr_touch (true);
866 }
867
868 return true;
869 }
870 }
871
872 return false;
873}
874
875bool
677rxvt_font_up_down(pR_ int n, int direction) 876rxvt_term::font_up_down (int n, int direction)
678{ 877{
878 return false;
679} 879}
680 880
681/*----------------------------------------------------------------------*/ 881/*----------------------------------------------------------------------*/
682/*----------------------------------------------------------------------*/ 882/*----------------------------------------------------------------------*/
683/* xterm sequences - title, iconName, color (exptl) */ 883/* xterm sequences - title, iconName, color (exptl) */
684/* EXTPROTO */
685void 884void
686rxvt_set_title(pR_ const char *str) 885rxvt_term::set_title (const char *str)
687{ 886{
688#ifndef SMART_WINDOW_TITLE 887#ifdef SMART_WINDOW_TITLE
888 char *name;
889
890 if (!XFetchName (display->display, TermWin.parent[0], &name))
891 name = NULL;
892
893 if (name == NULL || STRCMP (name, str))
894#endif
689 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 895 XStoreName (display->display, TermWin.parent[0], str);
896
897#ifdef SMART_WINDOW_TITLE
898 if (name)
899 XFree (name);
900#endif
901}
902
903void
904rxvt_term::set_icon_name (const char *str)
905{
906#ifdef SMART_WINDOW_TITLE
907 char *name;
908
909 if (!XGetIconName (display->display, TermWin.parent[0], &name))
910 name = NULL;
911
912 if (name == NULL || STRCMP (name, str))
913#endif
914 XSetIconName (display->display, TermWin.parent[0], str);
915
916#ifdef SMART_WINDOW_TITLE
917 if (name)
918 XFree (name);
919#endif
920}
921
922#ifdef XTERM_COLOR_CHANGE
923void
924rxvt_term::set_window_color (int idx, const char *color)
925{
926 rxvt_color xcol;
927 int i;
928
929 if (color == NULL || *color == '\0')
930 return;
931
932 /* handle color aliases */
933 if (isdigit (*color))
934 {
935 i = atoi (color);
936 if (i >= 8 && i <= 15)
937 { /* bright colors */
938 i -= 8;
939# ifndef NO_BRIGHTCOLOR
940 PixColors[idx] = PixColors[minBrightCOLOR + i];
941 SET_PIXCOLOR (idx);
942 goto Done;
943# endif
944
945 }
946 if (i >= 0 && i <= 7)
947 { /* normal colors */
948 PixColors[idx] = PixColors[minCOLOR + i];
949 SET_PIXCOLOR (idx);
950 goto Done;
951 }
952 }
953
954 if (!rXParseAllocColor (& xcol, color))
955 return;
956
957 /* XStoreColor (display->display, XCMAP, XColor*); */
958
959 /*
960 * FIXME: should free colors here, but no idea how to do it so instead,
961 * so just keep gobbling up the colormap
962 */
963# if 0
964 for (i = Color_Black; i <= Color_White; i++)
965 if (PixColors[idx] == PixColors[i])
966 break;
967 if (i > Color_White)
968 {
969 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
970 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
971 DisplayPlanes (display->display, display->screen));
972 }
973# endif
974
975 PixColors[idx] = xcol;
976 SET_PIXCOLOR (idx);
977
978 /* XSetWindowAttributes attr; */
979 /* Cursor cursor; */
980Done:
981 if (idx == Color_bg && ! (Options & Opt_transparent))
982 XSetWindowBackground (display->display, TermWin.vt,
983 PixColors[Color_bg]);
984
985 /* handle Color_BD, scrollbar background, etc. */
986
987 set_colorfgbg ();
988 recolour_cursor ();
989 scr_touch (true);
990}
991
690#else 992#else
691 char *name;
692
693 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0)
694 name = NULL;
695 if (name == NULL || STRCMP(name, str))
696 XStoreName(R->Xdisplay, R->TermWin.parent[0], str);
697 if (name)
698 XFree(name);
699#endif
700}
701
702/* EXTPROTO */
703void
704rxvt_set_iconName(pR_ const char *str)
705{
706#ifndef SMART_WINDOW_TITLE
707 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str);
708#else
709 char *name;
710
711 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name))
712 name = NULL;
713 if (name == NULL || STRCMP(name, str))
714 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str);
715 if (name)
716 XFree(name);
717#endif
718}
719
720#ifdef XTERM_COLOR_CHANGE
721/* EXTPROTO */
722void
723rxvt_set_window_color(pR_ int idx, const char *color)
724{
725 rxvt_color xcol;
726 int i;
727
728 if (color == NULL || *color == '\0')
729 return;
730
731/* handle color aliases */
732 if (isdigit(*color)) {
733 i = atoi(color);
734 if (i >= 8 && i <= 15) { /* bright colors */
735 i -= 8;
736# ifndef NO_BRIGHTCOLOR
737 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i];
738 SET_PIXCOLOR(R, idx);
739 goto Done;
740# endif
741 }
742 if (i >= 0 && i <= 7) { /* normal colors */
743 R->PixColors[idx] = R->PixColors[minCOLOR + i];
744 SET_PIXCOLOR(R, idx);
745 goto Done;
746 }
747 }
748 if (!rxvt_rXParseAllocColor(aR_ & xcol, color))
749 return;
750/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */
751
752/*
753 * FIXME: should free colors here, but no idea how to do it so instead,
754 * so just keep gobbling up the colormap
755 */
756# if 0
757 for (i = Color_Black; i <= Color_White; i++)
758 if (R->PixColors[idx] == R->PixColors[i])
759 break;
760 if (i > Color_White) {
761 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */
762 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1,
763 DisplayPlanes(R->Xdisplay, Xscreen));
764 }
765# endif
766
767 R->PixColors[idx] = xcol;
768 SET_PIXCOLOR(R, idx);
769
770/* XSetWindowAttributes attr; */
771/* Cursor cursor; */
772 Done:
773 if (idx == Color_bg && !(R->Options & Opt_transparent))
774 XSetWindowBackground(R->Xdisplay, R->TermWin.vt,
775 R->PixColors[Color_bg]);
776
777/* handle Color_BD, scrollbar background, etc. */
778
779 rxvt_set_colorfgbg (aR);
780 R->recolour_cursor ();
781/* the only reasonable way to enforce a clean update */
782 rxvt_scr_poweron (aR);
783}
784
785#else
786# define rxvt_set_window_color(aR_ idx,color) ((void)0) 993# define set_window_color (idx,color) ((void)0)
787#endif /* XTERM_COLOR_CHANGE */ 994#endif /* XTERM_COLOR_CHANGE */
788 995
789void 996void
790rxvt_term::recolour_cursor () 997rxvt_term::recolour_cursor ()
791{ 998{
792#if TODO
793 rxvt_color xcol[2]; 999 XColor xcol[2];
794 1000
795 xcol[0] = PixColors[Color_pointer]; 1001 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColors[Color_pointer_fg] : PixColors[Color_fg];
796 xcol[1] = PixColors[Color_bg]; 1002 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColors[Color_pointer_bg] : PixColors[Color_bg];
797 XQueryColors (Xdisplay, XCMAP, xcol, 2); 1003 XQueryColors (display->display, XCMAP, xcol, 2);
798 XRecolorCursor (Xdisplay, TermWin_cursor, &(xcol[0]), &(xcol[1])); 1004 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
799#endif
800} 1005}
801 1006
802/*----------------------------------------------------------------------*/ 1007/*----------------------------------------------------------------------*/
803/* 1008/*
804 * find if fg/bg matches any of the normal (low-intensity) colors 1009 * find if fg/bg matches any of the normal (low-intensity) colors
805 */ 1010 */
806/* INTPROTO */
807void 1011void
808rxvt_set_colorfgbg(pR) 1012rxvt_term::set_colorfgbg ()
809{ 1013{
810 unsigned int i; 1014 unsigned int i;
811 const char *xpmb = "\0"; 1015 const char *xpmb = "\0";
812 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 1016 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
813 1017
814 R->env_colorfgbg = 1018 env_colorfgbg =
815 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 1019 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
816 STRCPY(fstr, "default"); 1020 STRCPY (fstr, "default");
817 STRCPY(bstr, "default"); 1021 STRCPY (bstr, "default");
818 for (i = Color_Black; i <= Color_White; i++) 1022 for (i = Color_Black; i <= Color_White; i++)
819 if (R->PixColors[Color_fg] == R->PixColors[i]) { 1023 if (PixColors[Color_fg] == PixColors[i])
1024 {
820 sprintf(fstr, "%d", (i - Color_Black)); 1025 sprintf (fstr, "%d", (i - Color_Black));
821 break; 1026 break;
822 } 1027 }
823 for (i = Color_Black; i <= Color_White; i++) 1028 for (i = Color_Black; i <= Color_White; i++)
824 if (R->PixColors[Color_bg] == R->PixColors[i]) { 1029 if (PixColors[Color_bg] == PixColors[i])
1030 {
825 sprintf(bstr, "%d", (i - Color_Black)); 1031 sprintf (bstr, "%d", (i - Color_Black));
826#ifdef XPM_BACKGROUND 1032#ifdef XPM_BACKGROUND
827 xpmb = "default;"; 1033 xpmb = "default;";
828#endif 1034#endif
829 break; 1035 break;
830 } 1036 }
1037
831 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1038 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
832 putenv(R->env_colorfgbg);
833 1039
834#ifndef NO_BRIGHTCOLOR 1040#ifndef NO_BRIGHTCOLOR
835 R->colorfgbg = DEFAULT_RSTYLE; 1041 colorfgbg = DEFAULT_RSTYLE;
836 for (i = minCOLOR; i <= maxCOLOR; i++) { 1042 for (i = minCOLOR; i <= maxCOLOR; i++)
1043 {
837 if (R->PixColors[Color_fg] == R->PixColors[i]) 1044 if (PixColors[Color_fg] == PixColors[i])
838 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 1045 colorfgbg = SET_FGCOLOR (colorfgbg, i);
839 if (R->PixColors[Color_bg] == R->PixColors[i]) 1046 if (PixColors[Color_bg] == PixColors[i])
840 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 1047 colorfgbg = SET_BGCOLOR (colorfgbg, i);
841 } 1048 }
842#endif 1049#endif
843} 1050}
844 1051
845/*----------------------------------------------------------------------*/ 1052/*----------------------------------------------------------------------*/
846/* 1053/*
847 * Colour determination for low colour displays, routine from 1054 * Colour determination for low colour displays, routine from
848 * Hans de Goede <hans@highrise.nl> 1055 * Hans de Goede <hans@highrise.nl>
849 */ 1056 */
850 1057
851/* EXTPROTO */
852int 1058int
853rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 1059rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
854{ 1060{
855 screen_in_out->set(aR_ colour);
856
857 if (!screen_in_out->set(aR_ colour)) { 1061 if (!screen_in_out->set (display, colour))
858 rxvt_print_error("can't allocate colour: %s", colour); 1062 {
1063 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
859 return false; 1064 return false;
860 } 1065 }
861 1066
862 return true; 1067 return true;
863} 1068}
864 1069
865/* -------------------------------------------------------------------- * 1070/* -------------------------------------------------------------------- *
866 * - WINDOW RESIZING - * 1071 * - WINDOW RESIZING - *
867 * -------------------------------------------------------------------- */ 1072 * -------------------------------------------------------------------- */
873#ifdef SMART_RESIZE 1078#ifdef SMART_RESIZE
874 int old_width = szHint.width, old_height = szHint.height; 1079 int old_width = szHint.width, old_height = szHint.height;
875#endif 1080#endif
876 1081
877 window_calc (width, height); 1082 window_calc (width, height);
878 XSetWMNormalHints (Xdisplay, TermWin.parent[0], &szHint); 1083 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
879 if (!ignoreparent) 1084 if (!ignoreparent)
880 { 1085 {
881#ifdef SMART_RESIZE 1086#ifdef SMART_RESIZE
882 /* 1087 /*
883 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 1088 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
886 int x, y, x1, y1; 1091 int x, y, x1, y1;
887 int dx, dy; 1092 int dx, dy;
888 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1093 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
889 Window unused_cr; 1094 Window unused_cr;
890 1095
891 XTranslateCoordinates (Xdisplay, TermWin.parent[0], Xroot, 1096 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
892 0, 0, &x, &y, &unused_cr); 1097 0, 0, &x, &y, &unused_cr);
893 XGetGeometry (Xdisplay, TermWin.parent[0], &unused_cr, &x1, &y1, 1098 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,
894 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1099 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
895 /* 1100 /*
896 * if Xroot isn't the parent window, a WM will probably have offset 1101 * if display->root isn't the parent window, a WM will probably have offset
897 * our position for handles and decorations. Counter it 1102 * our position for handles and decorations. Counter it
898 */ 1103 */
899 if (x1 != x || y1 != y) { 1104 if (x1 != x || y1 != y)
1105 {
900 x -= x1; 1106 x -= x1;
901 y -= y1; 1107 y -= y1;
902 } 1108 }
903 1109
904 x1 = (DisplayWidth (Xdisplay, Xscreen) - old_width) / 2; 1110 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;
905 y1 = (DisplayHeight (Xdisplay, Xscreen) - old_height) / 2; 1111 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;
906 dx = old_width - szHint.width; 1112 dx = old_width - szHint.width;
907 dy = old_height - szHint.height; 1113 dy = old_height - szHint.height;
908 1114
909 /* Check position of the center of the window */ 1115 /* Check position of the center of the window */
910 if (x < x1) /* left half */ 1116 if (x < x1) /* left half */
911 dx = 0; 1117 dx = 0;
912 else if (x == x1) /* exact center */ 1118 else if (x == x1) /* exact center */
913 dx /= 2; 1119 dx /= 2;
914 if (y < y1) /* top half */ 1120 if (y < y1) /* top half */
915 dy = 0; 1121 dy = 0;
916 else if (y == y1) /* exact center */ 1122 else if (y == y1) /* exact center */
917 dy /= 2; 1123 dy /= 2;
918 1124
919 XMoveResizeWindow (Xdisplay, TermWin.parent[0], x + dx, y + dy, 1125 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
920 szHint.width, szHint.height); 1126 szHint.width, szHint.height);
921#else 1127#else
922 XResizeWindow (Xdisplay, TermWin.parent[0], szHint.width, 1128 XResizeWindow (display->display, TermWin.parent[0], szHint.width,
923 szHint.height); 1129 szHint.height);
924#endif 1130#endif
1131
925 } 1132 }
926 1133
927 fix_screen = (TermWin.ncol != prev_ncol 1134 fix_screen = (TermWin.ncol != prev_ncol
928 || TermWin.nrow != prev_nrow); 1135 || TermWin.nrow != prev_nrow);
929 1136
930 if (fix_screen || width != old_width || height != old_height) 1137 if (fix_screen || width != old_width || height != old_height)
931 { 1138 {
932 if (scrollbar_visible (this)) 1139 if (scrollbar_visible ())
933 { 1140 {
934 XMoveResizeWindow (Xdisplay, scrollBar.win, window_sb_x, 1141 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x,
935 0, scrollbar_TotalWidth (), szHint.height); 1142 0, scrollbar_TotalWidth (), szHint.height);
936 resize_scrollbar (); 1143 resize_scrollbar ();
937 } 1144 }
938 1145
939 if (menubar_visible (this)) 1146 if (menubar_visible ())
940 XMoveResizeWindow (Xdisplay, menuBar.win, window_vt_x, 1147 XMoveResizeWindow (display->display, menuBar.win, window_vt_x,
941 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1148 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
942 1149
943 XMoveResizeWindow (Xdisplay, TermWin.vt, window_vt_x, 1150 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
944 window_vt_y, TermWin_TotalWidth (), 1151 window_vt_y, TermWin_TotalWidth (),
945 TermWin_TotalHeight ()); 1152 TermWin_TotalHeight ());
946#ifdef RXVT_GRAPHICS 1153 scr_clear (height != old_height);
947 if (old_height)
948 rxvt_Gr_Resize (this, old_width - szHint.base_width,
949 old_height - szHint.base_height);
950#endif
951 scr_clear ();
952#ifdef XPM_BACKGROUND 1154#ifdef XPM_BACKGROUND
953 rxvt_resize_pixmap (this); 1155 resize_pixmap ();
954#endif 1156#endif
1157
955 } 1158 }
956 1159
957 if (fix_screen || old_height == 0) 1160 if (fix_screen || old_height == 0)
958 { 1161 {
959 int curr_screen = -1; 1162 int curr_screen = -1;
960 uint16_t old_ncol = prev_ncol; 1163 int old_ncol = prev_ncol;
961 1164
962 /* scr_reset only works on the primary screen */ 1165 /* scr_reset only works on the primary screen */
963 if (old_height) /* this is not the first time through */ 1166 if (old_height) /* this is not the first time through */
1167 {
1168 unsigned int ncol = TermWin.ncol;
1169 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
964 curr_screen = rxvt_scr_change_screen (this, PRIMARY); 1170 curr_screen = scr_change_screen (PRIMARY);
1171 TermWin.ncol = ncol;
1172 }
965 1173
966 scr_reset(); 1174 scr_reset ();
967 1175
968 if (curr_screen >= 0) /* this is not the first time through */ 1176 if (curr_screen >= 0) /* this is not the first time through */
969 { 1177 {
970 rxvt_scr_change_screen (this, curr_screen); 1178 scr_change_screen (curr_screen);
971 rxvt_selection_check (this, old_ncol != TermWin.ncol ? 4 : 0); 1179 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
972 } 1180 }
973 } 1181 }
974 1182
975 old_width = szHint.width; 1183 old_width = szHint.width;
976 old_height = szHint.height; 1184 old_height = szHint.height;
977 1185
978#ifdef USE_XIM 1186#ifdef USE_XIM
979 rxvt_IMSetStatusPosition (this); 1187 IMSetStatusPosition ();
980#endif 1188#endif
981} 1189}
982 1190
983/* 1191/*
984 * Set the width/height of the vt window in characters. Units are pixels. 1192 * Set the width/height of the vt window in characters. Units are pixels.
985 * good for toggling 80/132 columns 1193 * good for toggling 80/132 columns
986 */ 1194 */
987/* EXTPROTO */
988void 1195void
989rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1196rxvt_term::set_widthheight (unsigned int width, unsigned int height)
990{ 1197{
991 XWindowAttributes wattr; 1198 XWindowAttributes wattr;
992 1199
993 if (width == 0 || height == 0) { 1200 if (width == 0 || height == 0)
1201 {
994 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1202 XGetWindowAttributes (display->display, display->root, &wattr);
995 if (width == 0) 1203 if (width == 0)
996 width = wattr.width - R->szHint.base_width; 1204 width = wattr.width - szHint.base_width;
997 if (height == 0) 1205 if (height == 0)
998 height = wattr.height - R->szHint.base_height; 1206 height = wattr.height - szHint.base_height;
999 } 1207 }
1000 if (width != R->TermWin.width || height != R->TermWin.height) { 1208 if (width != TermWin.width || height != TermWin.height)
1209 {
1001 width += R->szHint.base_width; 1210 width += szHint.base_width;
1002 height += R->szHint.base_height; 1211 height += szHint.base_height;
1003 R->resize_all_windows (width, height, 0); 1212 resize_all_windows (width, height, 0);
1004 } 1213 }
1005} 1214}
1006 1215
1007/* -------------------------------------------------------------------- * 1216/* -------------------------------------------------------------------- *
1008 * - X INPUT METHOD ROUTINES - * 1217 * - X INPUT METHOD ROUTINES - *
1009 * -------------------------------------------------------------------- */ 1218 * -------------------------------------------------------------------- */
1010#ifdef USE_XIM 1219#ifdef USE_XIM
1220
1011void 1221void
1012rxvt_term::set_size (XRectangle *size) 1222rxvt_term::im_set_size (XRectangle *size)
1013{ 1223{
1014 size->x = TermWin.int_bwidth; 1224 size->x = TermWin.int_bwidth;
1015 size->y = TermWin.int_bwidth; 1225 size->y = TermWin.int_bwidth;
1016 size->width = Width2Pixel(TermWin.ncol); 1226 size->width = Width2Pixel (TermWin.ncol);
1017 size->height = Height2Pixel(TermWin.nrow); 1227 size->height = Height2Pixel (TermWin.nrow);
1018} 1228}
1019 1229
1020void 1230void
1021rxvt_term::set_color (unsigned long *fg, unsigned long *bg) 1231rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
1022{ 1232{
1023 *fg = PixColors[Color_fg]; 1233 *fg = PixColors[Color_fg];
1024 *bg = PixColors[Color_bg]; 1234 *bg = PixColors[Color_bg];
1025} 1235}
1026 1236
1027/* Checking whether input method is running. */ 1237/* Checking whether input method is running. */
1028/* INTPROTO */
1029Bool 1238bool
1030rxvt_IMisRunning(pR) 1239rxvt_term::IMisRunning ()
1031{ 1240{
1032 char *p; 1241 char *p;
1033 Atom atom; 1242 Atom atom;
1034 Window win; 1243 Window win;
1035 char server[IMBUFSIZ]; 1244 char server[IMBUFSIZ];
1036 1245
1037/* get current locale modifier */ 1246 /* get current locale modifier */
1038 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1247 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1248 {
1039 STRCPY(server, "@server="); 1249 STRCPY (server, "@server=");
1040 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1250 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1041 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1251 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
1042 *p = '\0'; 1252 *p = '\0';
1043 1253
1044 atom = XInternAtom(R->Xdisplay, server, False); 1254 atom = XInternAtom (display->display, server, False);
1045 win = XGetSelectionOwner(R->Xdisplay, atom); 1255 win = XGetSelectionOwner (display->display, atom);
1046 if (win != None) 1256 if (win != None)
1047 return True; 1257 return True;
1048 } 1258 }
1049 return False; 1259 return False;
1050} 1260}
1051 1261
1052/* EXTPROTO */
1053void 1262void
1054rxvt_IMSendSpot(pR) 1263rxvt_term::IMSendSpot ()
1055{ 1264{
1056 XPoint spot; 1265 XPoint spot;
1057 XVaNestedList preedit_attr; 1266 XVaNestedList preedit_attr;
1058 1267
1059 if (R->Input_Context == NULL 1268 if (Input_Context == NULL
1060 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1269 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
1061 || !(R->event_type == KeyPress 1270 || ! (event_type == KeyPress
1062 || R->event_type == Expose 1271 || event_type == Expose
1063 || R->event_type == NoExpose 1272 || event_type == NoExpose
1064 || R->event_type == SelectionNotify 1273 || event_type == SelectionNotify
1065 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1274 || event_type == ButtonRelease || event_type == FocusIn)
1066 || !rxvt_IMisRunning(aR)) 1275 || !IMisRunning ())
1067 return; 1276 return;
1068 1277
1069 R->set_position (&spot); 1278 im_set_position (&spot);
1070 1279
1071 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1280 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1072 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1281 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1073 XFree(preedit_attr); 1282 XFree (preedit_attr);
1074} 1283}
1075 1284
1076void 1285void
1077rxvt_term::set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, 1286rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1078 XRectangle * needed_rect) 1287 XRectangle * needed_rect)
1079{ 1288{
1080 int mbh, vtx = 0; 1289 int mbh, vtx = 0;
1081 1290
1082 if (scrollbar_visible (this) && !(Options & Opt_scrollBar_right)) 1291 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1083 vtx = scrollbar_TotalWidth(); 1292 vtx = scrollbar_TotalWidth ();
1084 1293
1085 mbh = menubar_visible (this) ? menuBar_TotalHeight() : 0; 1294 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1086 mbh -= TermWin.lineSpace; 1295 mbh -= TermWin.lineSpace;
1087 1296
1088 preedit_rect->x = needed_rect->width + vtx; 1297 preedit_rect->x = needed_rect->width + vtx;
1089 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; 1298 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1090 1299
1091 preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx; 1300 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1092 preedit_rect->height = Height2Pixel(1); 1301 preedit_rect->height = Height2Pixel (1);
1093 1302
1094 status_rect->x = vtx; 1303 status_rect->x = vtx;
1095 status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; 1304 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1096 1305
1097 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1); 1306 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1098 status_rect->height = Height2Pixel(1); 1307 status_rect->height = Height2Pixel (1);
1099} 1308}
1100 1309
1101/* ARGSUSED */
1102/* INTPROTO */
1103void 1310void
1104rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1311rxvt_term::im_destroy ()
1105 __attribute__ ((unused)), XPointer call_data
1106 __attribute__ ((unused)))
1107{ 1312{
1108 dR; 1313 if (Input_Context)
1109 1314 {
1315 XDestroyIC (Input_Context);
1110 R->Input_Context = NULL; 1316 Input_Context = NULL;
1111/* To avoid Segmentation Fault in C locale: Solaris only? */ 1317 }
1112 if (STRCMP(R->locale, "C")) 1318
1113 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 1319 if (input_method)
1114 rxvt_IMInstantiateCallback, NULL); 1320 {
1321 display->put_xim (input_method);
1322 input_method = 0;
1323 }
1115} 1324}
1116 1325
1117/* 1326/*
1118 * Try to open a XIM with the current modifiers, then see if we can 1327 * Try to open a XIM with the current modifiers, then see if we can
1119 * open a suitable preedit type 1328 * open a suitable preedit type
1120 */ 1329 */
1121static Bool 1330bool
1122rxvt_IM_get_IC (pR) 1331rxvt_term::IM_get_IC (const char *modifiers)
1123{ 1332{
1124 int i, j, found; 1333 int i, j, found;
1125 XIM xim; 1334 XIM xim;
1126 XPoint spot; 1335 XPoint spot;
1127 XRectangle rect, status_rect, needed_rect; 1336 XRectangle rect, status_rect, needed_rect;
1128 unsigned long fg, bg; 1337 unsigned long fg, bg;
1129 const char *p; 1338 const char *p;
1130 char **s; 1339 char **s;
1131 XIMStyles *xim_styles; 1340 XIMStyles *xim_styles;
1132 XVaNestedList preedit_attr, status_attr; 1341 XVaNestedList preedit_attr, status_attr;
1133 XIMCallback ximcallback;
1134 1342
1343 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1344 return false;
1345
1135 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1346 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1136 xim = XOpenIM (R->Xdisplay, NULL, NULL, NULL); 1347 input_method = display->get_xim (locale, modifiers);
1137 if (xim == NULL) 1348 if (input_method == NULL)
1138 return False; 1349 return false;
1139 1350
1351 xim = input_method->xim;
1352
1140 xim_styles = NULL; 1353 xim_styles = NULL;
1141 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1354 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1142 || !xim_styles || !xim_styles->count_styles) { 1355 || !xim_styles || !xim_styles->count_styles)
1143 XCloseIM(xim); 1356 {
1357 display->put_xim (input_method);
1144 return False; 1358 return false;
1145 } 1359 }
1146 1360
1147 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType] 1361 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1148 : "OverTheSpot,OffTheSpot,Root";
1149 s = rxvt_splitcommastring(p); 1362 s = rxvt_splitcommastring (p);
1150 for (i = found = 0; !found && s[i]; i++) { 1363 for (i = found = 0; !found && s[i]; i++)
1364 {
1151 if (!STRCMP(s[i], "OverTheSpot")) 1365 if (!STRCMP (s[i], "OverTheSpot"))
1152 R->input_style = (XIMPreeditPosition | XIMStatusNothing); 1366 input_style = (XIMPreeditPosition | XIMStatusNothing);
1153 else if (!STRCMP(s[i], "OffTheSpot")) 1367 else if (!STRCMP (s[i], "OffTheSpot"))
1154 R->input_style = (XIMPreeditArea | XIMStatusArea); 1368 input_style = (XIMPreeditArea | XIMStatusArea);
1155 else if (!STRCMP(s[i], "Root")) 1369 else if (!STRCMP (s[i], "Root"))
1156 R->input_style = (XIMPreeditNothing | XIMStatusNothing); 1370 input_style = (XIMPreeditNothing | XIMStatusNothing);
1157 1371
1158 for (j = 0; j < xim_styles->count_styles; j++) 1372 for (j = 0; j < xim_styles->count_styles; j++)
1159 if (R->input_style == xim_styles->supported_styles[j]) { 1373 if (input_style == xim_styles->supported_styles[j])
1374 {
1160 found = 1; 1375 found = 1;
1161 break; 1376 break;
1162 } 1377 }
1163 } 1378 }
1379
1164 for (i = 0; s[i]; i++) 1380 for (i = 0; s[i]; i++)
1165 free(s[i]); 1381 free (s[i]);
1382
1166 free(s); 1383 free (s);
1167 XFree(xim_styles); 1384 XFree (xim_styles);
1168 1385
1169 if (!found) { 1386 if (!found)
1170 XCloseIM(xim); 1387 {
1388 display->put_xim (input_method);
1171 return False; 1389 return false;
1172 } 1390 }
1173 1391
1174 ximcallback.callback = rxvt_IMDestroyCallback;
1175
1176 /* XXX: not sure why we need this (as well as IC one below) */
1177 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1178
1179 preedit_attr = status_attr = NULL; 1392 preedit_attr = status_attr = NULL;
1180 1393
1181 if (R->input_style & XIMPreeditPosition) { 1394 if (input_style & XIMPreeditPosition)
1395 {
1182 R->set_size (&rect); 1396 im_set_size (&rect);
1183 R->set_position (&spot); 1397 im_set_position (&spot);
1184 R->set_color (&fg, &bg); 1398 im_set_color (&fg, &bg);
1185 1399
1186 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1400 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1187 XNSpotLocation, &spot, 1401 XNSpotLocation, &spot,
1188 XNForeground, fg, XNBackground, bg,
1189 //XNFontSet, R->TermWin.fontset,
1190 NULL);
1191 } else if (R->input_style & XIMPreeditArea) {
1192 R->set_color (&fg, &bg);
1193
1194 /*
1195 * The necessary width of preedit area is unknown
1196 * until create input context.
1197 */
1198 needed_rect.width = 0;
1199
1200 R->set_preedit_area(&rect, &status_rect, &needed_rect);
1201
1202 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1203 XNForeground, fg, XNBackground, bg,
1204 //XNFontSet, R->TermWin.fontset,
1205 NULL);
1206 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1207 XNForeground, fg, XNBackground, bg, 1402 XNForeground, fg, XNBackground, bg,
1208 //XNFontSet, R->TermWin.fontset, 1403 //XNFontSet, TermWin.fontset,
1209 NULL); 1404 NULL);
1405 }
1406 else if (input_style & XIMPreeditArea)
1210 } 1407 {
1408 im_set_color (&fg, &bg);
1409
1410 /*
1411 * The necessary width of preedit area is unknown
1412 * until create input context.
1413 */
1414 needed_rect.width = 0;
1415
1416 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1417
1418 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1419 XNForeground, fg, XNBackground, bg,
1420 //XNFontSet, TermWin.fontset,
1421 NULL);
1422 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1423 XNForeground, fg, XNBackground, bg,
1424 //XNFontSet, TermWin.fontset,
1425 NULL);
1426 }
1427
1211 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style, 1428 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1212 XNClientWindow, R->TermWin.parent[0], 1429 XNClientWindow, TermWin.parent[0],
1213 XNFocusWindow, R->TermWin.parent[0], 1430 XNFocusWindow, TermWin.parent[0],
1214 XNDestroyCallback, &ximcallback,
1215 preedit_attr ? XNPreeditAttributes : NULL, 1431 preedit_attr ? XNPreeditAttributes : NULL,
1216 preedit_attr, 1432 preedit_attr,
1217 status_attr ? XNStatusAttributes : NULL, 1433 status_attr ? XNStatusAttributes : NULL,
1218 status_attr, NULL); 1434 status_attr, NULL);
1219 if (preedit_attr) 1435 if (preedit_attr) XFree (preedit_attr);
1220 XFree(preedit_attr); 1436 if (status_attr) XFree (status_attr);
1221 if (status_attr) 1437
1222 XFree(status_attr);
1223 if (R->Input_Context == NULL) { 1438 if (Input_Context == NULL)
1224 rxvt_print_error("failed to create input context"); 1439 {
1225 XCloseIM(xim); 1440 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1441 display->put_xim (input_method);
1226 return False; 1442 return false;
1227 } 1443 }
1444
1228 if (R->input_style & XIMPreeditArea) 1445 if (input_style & XIMPreeditArea)
1229 rxvt_IMSetStatusPosition(aR); 1446 IMSetStatusPosition ();
1447
1230 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); 1448 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1231 return True; 1449 return true;
1232} 1450}
1233 1451
1234/*
1235 * X manual pages and include files don't match on some systems:
1236 * some think this is an XIDProc and others an XIMProc so we can't
1237 * use the first argument - need to update this to be nice for
1238 * both types via some sort of configure detection
1239 */
1240/* ARGSUSED */
1241/* EXTPROTO */
1242void 1452void
1243rxvt_IMInstantiateCallback(Display * unused 1453rxvt_term::im_cb ()
1244 __attribute__ ((unused)), XPointer client_data
1245 __attribute__ ((unused)), XPointer call_data
1246 __attribute__ ((unused)))
1247{ 1454{
1248 dR;
1249 int i, found, had_im; 1455 int i, found, had_im;
1250 const char *p; 1456 const char *p;
1251 char **s; 1457 char **s;
1252 char buf[IMBUFSIZ]; 1458 char buf[IMBUFSIZ];
1253 1459
1460 im_destroy ();
1461
1254 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1462 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1255 if (R->Input_Context) 1463 if (Input_Context)
1256 return; 1464 return;
1257 1465
1258#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1466#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1259 if (R->rs[Rs_imLocale]) 1467 if (rs[Rs_imLocale])
1260 setlocale (LC_CTYPE, R->rs[Rs_imLocale]); 1468 SET_LOCALE (rs[Rs_imLocale]);
1261#endif 1469#endif
1262 1470
1263 p = R->rs[Rs_inputMethod]; 1471 p = rs[Rs_inputMethod];
1264 if (p && *p) 1472 if (p && *p)
1265 { 1473 {
1266 bool found = false; 1474 bool found = false;
1267 1475
1268 s = rxvt_splitcommastring (p); 1476 s = rxvt_splitcommastring (p);
1270 { 1478 {
1271 if (*s[i]) 1479 if (*s[i])
1272 { 1480 {
1273 STRCPY (buf, "@im="); 1481 STRCPY (buf, "@im=");
1274 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1482 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1275 if ((p = XSetLocaleModifiers (buf)) && *p 1483 if (IM_get_IC (buf))
1276 && rxvt_IM_get_IC (aR))
1277 { 1484 {
1278 found = true; 1485 found = true;
1279 break; 1486 break;
1280 } 1487 }
1281 } 1488 }
1282 } 1489 }
1283 for (i = 0; s[i]; i++) 1490 for (i = 0; s[i]; i++)
1284 free(s[i]); 1491 free (s[i]);
1285 free(s); 1492 free (s);
1286 1493
1287 if (found) 1494 if (found)
1288 goto done; 1495 goto done;
1289 } 1496 }
1290 1497
1291/* try with XMODIFIERS env. var. */ 1498 /* try with XMODIFIERS env. var. */
1292 if ((p = XSetLocaleModifiers ("")) && *p 1499 if (IM_get_IC (""))
1293 && rxvt_IM_get_IC (aR))
1294 goto done; 1500 goto done;
1295 1501
1296/* try with no modifiers base IF the user didn't specify an IM */ 1502 /* try with no modifiers base IF the user didn't specify an IM */
1297 if ((p = XSetLocaleModifiers ("@im=none")) && *p 1503 if (IM_get_IC ("@im=none"))
1298 && rxvt_IM_get_IC (aR) == True)
1299 goto done; 1504 goto done;
1300 1505
1301done: 1506done:
1302#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1507#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1303 if (R->rs[Rs_imLocale]) 1508 if (rs[Rs_imLocale])
1304 setlocale (LC_CTYPE, R->locale); 1509 SET_LOCALE (locale);
1305#endif 1510#endif
1306} 1511}
1307 1512
1308/* EXTPROTO */
1309void 1513void
1310rxvt_IMSetStatusPosition(pR) 1514rxvt_term::IMSetStatusPosition ()
1311{ 1515{
1312 XRectangle preedit_rect, status_rect, *needed_rect; 1516 XRectangle preedit_rect, status_rect, *needed_rect;
1313 XVaNestedList preedit_attr, status_attr; 1517 XVaNestedList preedit_attr, status_attr;
1314 1518
1315 if (R->Input_Context == NULL 1519 if (Input_Context == NULL
1316 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1520 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1317 || !rxvt_IMisRunning(aR)) 1521 || !IMisRunning ())
1318 return; 1522 return;
1319 1523
1320/* Getting the necessary width of preedit area */ 1524 /* Getting the necessary width of preedit area */
1321 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1525 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1322 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1526 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1323 XFree(status_attr); 1527 XFree (status_attr);
1324 1528
1325 R->set_preedit_area(&preedit_rect, &status_rect, needed_rect); 1529 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1326 1530
1327 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1531 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1328 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1532 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1329 1533
1330 XSetICValues(R->Input_Context, 1534 XSetICValues (Input_Context,
1331 XNPreeditAttributes, preedit_attr, 1535 XNPreeditAttributes, preedit_attr,
1332 XNStatusAttributes, status_attr, NULL); 1536 XNStatusAttributes, status_attr, NULL);
1333 1537
1334 XFree(preedit_attr); 1538 XFree (preedit_attr);
1335 XFree(status_attr); 1539 XFree (status_attr);
1336} 1540}
1337#endif /* USE_XIM */ 1541#endif /* USE_XIM */
1338 1542
1339/*----------------------------------------------------------------------*/ 1543/*----------------------------------------------------------------------*/
1340rxvt_t rxvt_current_term; 1544rxvt_t rxvt_current_term;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines