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.22 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.114 by root, Tue Sep 7 06:19:45 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines