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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines