ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines