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.35 by pcg, Fri Feb 20 23:01:45 2004 UTC vs.
Revision 1.53 by pcg, Sun Mar 14 17:33:07 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*;
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * 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>
… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
16 * 17 *
17 * 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
18 * 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
19 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
20 * (at your option) any later version. 21 * (at your option) any later version.
… …
55 STRNCPY (curlocale, locale, 128); 56 STRNCPY (curlocale, locale, 128);
56 setlocale (LC_CTYPE, curlocale); 57 setlocale (LC_CTYPE, curlocale);
57 } 58 }
58} 59}
59 60
61#if ENABLE_COMBINING
62class rxvt_composite_vec rxvt_composite;
63
64text_t rxvt_composite_vec::compose (uint32_t c1, uint32_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 (uint32_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
60void * 125void *
61rxvt_term::operator new (size_t s) 126rxvt_term::operator new (size_t s)
62{ 127{
63 void *p = malloc (s); 128 void *p = malloc (s);
64 129
… …
79 vt_ev (this, &rxvt_term::x_cb), 144 vt_ev (this, &rxvt_term::x_cb),
80#ifdef HAVE_SCROLLBARS 145#ifdef HAVE_SCROLLBARS
81 scrollbar_ev (this, &rxvt_term::x_cb), 146 scrollbar_ev (this, &rxvt_term::x_cb),
82#endif 147#endif
83#ifdef MENUBAR 148#ifdef MENUBAR
84 menubar_ev (this, &rxvt_term::x_cb), fixme 149 menubar_ev (this, &rxvt_term::x_cb),
85#endif 150#endif
86#ifdef CURSOR_BLINK 151#ifdef CURSOR_BLINK
87 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 152 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
88#endif 153#endif
89#ifdef TEXT_BLINK 154#ifdef TEXT_BLINK
… …
116#endif 181#endif
117 182
118 delete TermWin.fontset; 183 delete TermWin.fontset;
119 184
120 if (display) 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
121 if (TermWin.parent[0]) 194 if (TermWin.parent[0])
122 XDestroyWindow (display->display, TermWin.parent[0]); 195 XDestroyWindow (display->display, TermWin.parent[0]);
196 }
123 197
124 // TODO: free pixcolours, colours should become part of rxvt_display 198 // TODO: free pixcolours, colours should become part of rxvt_display
125 199
126 delete PixColors; 200 delete PixColors;
127 201
… …
248 322
249 const char **cmd_argv = init_resources (argc, argv); 323 const char **cmd_argv = init_resources (argc, argv);
250 324
251 set_locale (""); 325 set_locale ("");
252 326
253#if (MENUBAR_MAX) 327#if MENUBAR_MAX
254 menubar_read (rs[Rs_menu]); 328 menubar_read (rs[Rs_menu]);
255#endif 329#endif
256#ifdef HAVE_SCROLLBARS 330#ifdef HAVE_SCROLLBARS
257 if (Options & Opt_scrollBar) 331 if (Options & Opt_scrollBar)
258 scrollBar.setIdle (); /* set existence for size calculations */ 332 scrollBar.setIdle (); /* set existence for size calculations */
… …
261 create_windows (argc, argv); 335 create_windows (argc, argv);
262 336
263 init_xlocale (); 337 init_xlocale ();
264 338
265 scr_reset (); /* initialize screen */ 339 scr_reset (); /* initialize screen */
266#ifdef RXVT_GRAPHICS
267 Gr_reset (); /* reset graphics */
268#endif
269 340
270#if 1 341#if 0
271 XSynchronize (display->display, True); 342 XSynchronize (display->display, True);
272#endif 343#endif
273 344
274#ifdef HAVE_SCROLLBARS 345#ifdef HAVE_SCROLLBARS
275 if (Options & Opt_scrollBar) 346 if (Options & Opt_scrollBar)
276 resize_scrollbar (); /* create and map scrollbar */ 347 resize_scrollbar (); /* create and map scrollbar */
277#endif 348#endif
278#if (MENUBAR_MAX) 349#if (MENUBAR_MAX)
279 if (menubar_visible (r)) 350 if (menubar_visible ())
280 XMapWindow (display->display, menuBar.win); 351 XMapWindow (display->display, menuBar.win);
281#endif 352#endif
282#ifdef TRANSPARENT 353#ifdef TRANSPARENT
283 if (Options & Opt_transparent) 354 if (Options & Opt_transparent)
284 { 355 {
… …
378 449
379 p = malloc (size); 450 p = malloc (size);
380 if (p) 451 if (p)
381 return p; 452 return p;
382 453
383 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 454 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
384 rxvt_clean_exit (); 455 rxvt_clean_exit ();
385 exit (EXIT_FAILURE); 456 exit (EXIT_FAILURE);
386 /* NOTREACHED */ 457 /* NOTREACHED */
387} 458}
388 459
… …
394 465
395 p = calloc (number, size); 466 p = calloc (number, size);
396 if (p) 467 if (p)
397 return p; 468 return p;
398 469
399 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 470 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
400 rxvt_clean_exit (); 471 rxvt_clean_exit ();
401 exit (EXIT_FAILURE); 472 exit (EXIT_FAILURE);
402 /* NOTREACHED */ 473 /* NOTREACHED */
403} 474}
404 475
… …
413 else 484 else
414 p = malloc (size); 485 p = malloc (size);
415 if (p) 486 if (p)
416 return p; 487 return p;
417 488
418 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 489 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
419 rxvt_clean_exit (); 490 rxvt_clean_exit ();
420 exit (EXIT_FAILURE); 491 exit (EXIT_FAILURE);
421 /* NOTREACHED */ 492 /* NOTREACHED */
422} 493}
423 494
… …
615 else 686 else
616 szHint.win_gravity = SouthWestGravity; 687 szHint.win_gravity = SouthWestGravity;
617 } 688 }
618 } 689 }
619 } 690 }
691
620 /* TODO: BOUNDS */ 692 /* TODO: BOUNDS */
621 TermWin.width = TermWin.ncol * TermWin.fwidth; 693 TermWin.width = TermWin.ncol * TermWin.fwidth;
622 TermWin.height = TermWin.nrow * TermWin.fheight; 694 TermWin.height = TermWin.nrow * TermWin.fheight;
623 max_width = MAX_COLS * TermWin.fwidth; 695 max_width = MAX_COLS * TermWin.fwidth;
624 max_height = MAX_ROWS * TermWin.fheight; 696 max_height = MAX_ROWS * TermWin.fheight;
… …
717 * init = 1 - initialize 789 * init = 1 - initialize
718 * 790 *
719 * fontname == FONT_UP - switch to bigger font 791 * fontname == FONT_UP - switch to bigger font
720 * fontname == FONT_DN - switch to smaller font 792 * fontname == FONT_DN - switch to smaller font
721 */ 793 */
722void 794bool
723rxvt_term::change_font (int init, const char *fontname) 795rxvt_term::change_font (const char *fontname)
724{} 796{
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);
725 808
726void 809 if (fs && fs->populate (fontname ? fontname : "fixed"))
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
727rxvt_term::font_up_down (int n, int direction) 832rxvt_term::font_up_down (int n, int direction)
728{} 833{
834 return false;
835}
729 836
730/*----------------------------------------------------------------------*/ 837/*----------------------------------------------------------------------*/
731/*----------------------------------------------------------------------*/ 838/*----------------------------------------------------------------------*/
732/* xterm sequences - title, iconName, color (exptl) */ 839/* xterm sequences - title, iconName, color (exptl) */
733void 840void
734rxvt_term::set_title (const char *str) 841rxvt_term::set_title (const char *str)
735{ 842{
736#ifndef SMART_WINDOW_TITLE 843#ifndef SMART_WINDOW_TITLE
737 XStoreName (display->display, TermWin.parent[0], str); 844 XStoreName (display->display, TermWin.parent[0], str);
738#else 845#else
739 char *name; 846 char *name;
740 847
741 if (XFetchName (display->display, TermWin.parent[0], &name) == 0) 848 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
742 name = NULL; 849 name = NULL;
743 if (name == NULL || STRCMP (name, str)) 850 if (name == NULL || STRCMP (name, str))
744 XStoreName (display->display, TermWin.parent[0], str); 851 XStoreName (display->display, TermWin.parent[0], str);
… …
751rxvt_term::set_iconName (const char *str) 858rxvt_term::set_iconName (const char *str)
752{ 859{
753#ifndef SMART_WINDOW_TITLE 860#ifndef SMART_WINDOW_TITLE
754 XSetIconName (display->display, TermWin.parent[0], str); 861 XSetIconName (display->display, TermWin.parent[0], str);
755#else 862#else
756 char *name; 863 char *name;
757 864
758 if (XGetIconName (display->display, TermWin.parent[0], &name)) 865 if (XGetIconName (display->display, TermWin.parent[0], &name))
759 name = NULL; 866 name = NULL;
760 if (name == NULL || STRCMP (name, str)) 867 if (name == NULL || STRCMP (name, str))
761 XSetIconName (display->display, TermWin.parent[0], str); 868 XSetIconName (display->display, TermWin.parent[0], str);
… …
766 873
767#ifdef XTERM_COLOR_CHANGE 874#ifdef XTERM_COLOR_CHANGE
768void 875void
769rxvt_term::set_window_color (int idx, const char *color) 876rxvt_term::set_window_color (int idx, const char *color)
770{ 877{
771 rxvt_color xcol; 878 rxvt_color xcol;
772 int i; 879 int i;
773 880
774 if (color == NULL || *color == '\0') 881 if (color == NULL || *color == '\0')
775 return; 882 return;
776 883
777 /* handle color aliases */ 884 /* handle color aliases */
… …
994 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1101 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
995 1102
996 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1103 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
997 window_vt_y, TermWin_TotalWidth (), 1104 window_vt_y, TermWin_TotalWidth (),
998 TermWin_TotalHeight ()); 1105 TermWin_TotalHeight ());
999#ifdef RXVT_GRAPHICS 1106 scr_clear (height != old_height);
1000 if (old_height)
1001 Gr_Resize (old_width - szHint.base_width,
1002 old_height - szHint.base_height);
1003#endif
1004 scr_clear ();
1005#ifdef XPM_BACKGROUND 1107#ifdef XPM_BACKGROUND
1006 resize_pixmap (); 1108 resize_pixmap ();
1007#endif 1109#endif
1008 1110
1009 } 1111 }
… …
1314 if (Input_Context) 1416 if (Input_Context)
1315 return; 1417 return;
1316 1418
1317#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1419#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1318 if (rs[Rs_imLocale]) 1420 if (rs[Rs_imLocale])
1319 setlocale (LC_CTYPE, rs[Rs_imLocale]); 1421 SET_LOCALE (rs[Rs_imLocale]);
1320#endif 1422#endif
1321 1423
1322 p = rs[Rs_inputMethod]; 1424 p = rs[Rs_inputMethod];
1323 if (p && *p) 1425 if (p && *p)
1324 { 1426 {
… …
1355 goto done; 1457 goto done;
1356 1458
1357done: 1459done:
1358#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1460#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1359 if (rs[Rs_imLocale]) 1461 if (rs[Rs_imLocale])
1360 setlocale (LC_CTYPE, locale); 1462 SET_LOCALE (locale);
1361#endif 1463#endif
1362} 1464}
1363 1465
1364void 1466void
1365rxvt_term::IMSetStatusPosition () 1467rxvt_term::IMSetStatusPosition ()

Diff Legend

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