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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines