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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.22 by pcg, Sat Jan 31 00:20:21 2004 UTC

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

Diff Legend

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