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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines