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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines