ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.22 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.80 by root, Fri Aug 13 19:31:23 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines