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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines