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.24 by pcg, Sat Jan 31 03:26:28 2004 UTC vs.
Revision 1.76 by root, Wed Aug 4 03:29:28 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines