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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines