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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines