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.21 by pcg, Thu Jan 29 23:26:01 2004 UTC vs.
Revision 1.67 by pcg, Sun May 9 18:19:49 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines