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.11 by pcg, Mon Dec 8 23:14:40 2003 UTC vs.
Revision 1.54 by pcg, Mon Mar 15 00:08:11 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines