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.15 by pcg, Thu Dec 18 05:45:11 2003 UTC vs.
Revision 1.66 by pcg, Thu Apr 8 20:31:45 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines