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.6 by pcg, Tue Nov 25 17:11:33 2003 UTC vs.
Revision 1.77 by root, Tue Aug 10 20:39:19 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines