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.28 by pcg, Mon Feb 9 22:45:29 2004 UTC vs.
Revision 1.119 by root, Mon Dec 13 01:29:03 2004 UTC

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

Diff Legend

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