-- Leo's gemini proxy
-- Connecting to git.thebackupbox.net:1965...
-- Connected
-- Sending request
-- Meta line: 20 text/gemini
repo: rxvt-unicode-sixel action: commit revision: path_from: revision_from: 1426f4addade6ff15aa3c8fba3fb3da0a9fd8029: path_to: revision_to:
commit 1426f4addade6ff15aa3c8fba3fb3da0a9fd8029
Author: Marc Lehmann <schmorp@schmorp.de>
Date: Sun Sep 5 09:33:00 2004 +0000
*** empty log message ***
diff --git a/autoconf/config.h.in b/autoconf/config.h.in
--- a/autoconf/config.h.in +++ b/autoconf/config.h.in @@ -437,10 +437,10 @@ #undef ENCODING_KR /* Define if you want chinese codesets */ -#undef ENCODING_CN +#undef ENCODING_ZH /* Define if you want extended chinese codesets */ -#undef ENCODING_CN_EXT +#undef ENCODING_ZH_EXT /* Define if you don't need to use our replacement string functions */ #undef NO_STRINGS diff --git a/autoconf/configure.in b/autoconf/configure.in
--- a/autoconf/configure.in
+++ b/autoconf/configure.in
@@ -1287,7 +1287,7 @@ if test x$support_combining = xyes; then
AC_DEFINE(ENABLE_COMBINING, 1, Define if you want to automatically compose combining characters)
fi
if test x$codesets = xall; then
- codesets=jp,jp-ext,kr,cn,cn-ext
+ codesets=jp,jp-ext,kr,zh,zh-ext
fi
AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)
AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets)
@@ -1296,8 +1296,8 @@ for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do
JP ) AC_DEFINE(ENCODING_JP, 1, Define if you want japanese codesets) ;;
JP_EXT ) AC_DEFINE(ENCODING_JP_EXT, 1, Define if you want extended japanese codesets) ;;
KR ) AC_DEFINE(ENCODING_KR, 1, Define if you want korean codesets) ;;
- CN ) AC_DEFINE(ENCODING_CN, 1, Define if you want chinese codesets) ;;
- CN_EXT ) AC_DEFINE(ENCODING_CN_EXT, 1, Define if you want extended chinese codesets) ;;
+ ZH ) AC_DEFINE(ENCODING_ZH, 1, Define if you want chinese codesets) ;;
+ ZH_EXT ) AC_DEFINE(ENCODING_ZH_EXT, 1, Define if you want extended chinese codesets) ;;
esac
done
diff --git a/configure b/configure
--- a/configure +++ b/configure @@ -16944,7 +16944,7 @@ _ACEOF fi if test x$codesets = xall; then - codesets=jp,jp-ext,kr,cn,cn-ext + codesets=jp,jp-ext,kr,zh,zh-ext fi cat >>confdefs.h <<\_ACEOF @@ -16973,14 +16973,14 @@ cat >>confdefs.h <<\_ACEOF #define ENCODING_KR 1 _ACEOF ;; - CN ) + ZH ) cat >>confdefs.h <<\_ACEOF -#define ENCODING_CN 1 +#define ENCODING_ZH 1 _ACEOF ;; - CN_EXT ) + ZH_EXT ) cat >>confdefs.h <<\_ACEOF -#define ENCODING_CN_EXT 1 +#define ENCODING_ZH_EXT 1 _ACEOF ;; esac diff --git a/src/command.C b/src/command.C
--- a/src/command.C
+++ b/src/command.C
@@ -912,6 +912,8 @@ rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
void
rxvt_term::flush ()
{
+ flush_ev.stop ();
+
#ifdef TRANSPARENT
if (want_full_refresh)
{
@@ -931,8 +933,6 @@ rxvt_term::flush ()
}
display->flush ();
-
- flush_ev.stop ();
}
void
@@ -1218,11 +1218,6 @@ rxvt_term::x_cb (XEvent &ev)
}
#endif
-#ifdef USE_XIM
- if (XFilterEvent (&ev, None))
- return;
-#endif
-
Window unused_root, unused_child;
int unused_root_x, unused_root_y;
unsigned int unused_mask;
@@ -1564,7 +1559,7 @@ rxvt_term::x_cb (XEvent &ev)
break;
}
#endif
- if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate))
+ if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
break;
if (ev.xany.window == TermWin.vt)
@@ -1577,8 +1572,8 @@ rxvt_term::x_cb (XEvent &ev)
XQueryPointer (display->display, TermWin.vt,
&unused_root, &unused_child,
&unused_root_x, &unused_root_y,
- & (ev.xbutton.x), & (ev.xbutton.y),
- &unused_mask);
+ &ev.xbutton.x, &ev.xbutton.y,
+ &ev.xbutton.state);
#ifdef MOUSE_THRESHOLD
/* deal with a `jumpy' mouse */
if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
@@ -1593,7 +1588,8 @@ rxvt_term::x_cb (XEvent &ev)
}
#endif
selection_extend (ev.xbutton.x, ev.xbutton.y,
- (ev.xbutton.state & Button3Mask) ? 2 : 0);
+ ev.xbutton.state & Button3Mask ? 2 : 0);
+
#ifdef SELECTION_SCROLLING
if (ev.xbutton.y < TermWin.int_bwidth
|| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
@@ -1614,7 +1610,7 @@ rxvt_term::x_cb (XEvent &ev)
selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
/* calc number of lines to scroll */
- if (ev.xbutton.y<TermWin.int_bwidth)
+ if (ev.xbutton.y < TermWin.int_bwidth)
{
scroll_selection_dir = UP;
dist = TermWin.int_bwidth - ev.xbutton.y;
@@ -1648,11 +1644,13 @@ rxvt_term::x_cb (XEvent &ev)
else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
{
while (XCheckTypedWindowEvent (display->display, scrollBar.win,
- MotionNotify, &ev)) ;
+ MotionNotify, &ev))
+ ;
+
XQueryPointer (display->display, scrollBar.win,
&unused_root, &unused_child,
&unused_root_x, &unused_root_y,
- & (ev.xbutton.x), & (ev.xbutton.y),
+ &ev.xbutton.x, &ev.xbutton.y,
&unused_mask);
scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
scrollbar_size ());
@@ -1717,6 +1715,7 @@ rxvt_term::button_press (XButtonEvent &ev)
#endif
clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
+
if (reportmode)
{
/* mouse report from vt window */
@@ -1755,9 +1754,18 @@ rxvt_term::button_press (XButtonEvent &ev)
{
if (ev.button != MEvent.button)
MEvent.clicks = 0;
+
switch (ev.button)
{
case Button1:
+ /* allow meta + click to select rectangular areas */
+ /* should be done in screen.C */
+#if ENABLE_FRILLS
+ selection.rect = !! (ev.state & ModMetaMask);
+#else
+ selection.rect = false;
+#endif
+
/* allow shift+left click to extend selection */
if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
{
diff --git a/src/encoding.C b/src/encoding.C
--- a/src/encoding.C
+++ b/src/encoding.C
@@ -179,12 +179,12 @@ static uint32_t cs_unicode_16_from_unicode (unicode_t unicode) { return unicode
#include "table/ksc5601_1987_0.h"
-//#define ENCODING_CN
+//#define ENCODING_ZH
#include "table/gb2312_1980_0.h"
#include "table/big5.h"
-//#define ENCODING_CN_EXT
+//#define ENCODING_ZH_EXT
#include "table/cns11643_1992_1.h"
#include "table/cns11643_1992_2.h"
diff --git a/src/gentables b/src/gentables
--- a/src/gentables +++ b/src/gentables @@ -265,18 +265,18 @@ EOF __DATA__ VN viscii viscii KR ksc5601_1987_0 ksc5601-raw -CN gb2312_1980_0 gb2312-raw -CN_EXT cns11643_1992_1 cns11643-1 -CN_EXT cns11643_1992_2 cns11643-2 -CN_EXT cns11643_1992_3 cns11643-3 -CN_EXT cns11643_1992_4 cns11643-4 -CN_EXT cns11643_1992_5 cns11643-5 -CN_EXT cns11643_1992_6 cns11643-6 -CN_EXT cns11643_1992_7 cns11643-7 -CN_EXT cns11643_1992_f cns11643-f -CN big5 big5 -CN_EXT big5_ext big5ext -CN_EXT big5_plus big5plus +ZH gb2312_1980_0 gb2312-raw +ZH_EXT cns11643_1992_1 cns11643-1 +ZH_EXT cns11643_1992_2 cns11643-2 +ZH_EXT cns11643_1992_3 cns11643-3 +ZH_EXT cns11643_1992_4 cns11643-4 +ZH_EXT cns11643_1992_5 cns11643-5 +ZH_EXT cns11643_1992_6 cns11643-6 +ZH_EXT cns11643_1992_7 cns11643-7 +ZH_EXT cns11643_1992_f cns11643-f +ZH big5 big5 +ZH_EXT big5_ext big5ext +ZH_EXT big5_plus big5plus EU koi8_r koi8-r EU koi8_u koi8-u DEFAULT iso8859_1 iso-8859-1 diff --git a/src/table/big5.h b/src/table/big5.h
--- a/src/table/big5.h
+++ b/src/table/big5.h
@@ -1,7 +1,7 @@
//
// AUTOMATICALLLY GENERATED by gentables
//
-#ifdef ENCODING_CN
+#ifdef ENCODING_ZH
static const uint16_t big5_f_0[] = {
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
diff --git a/src/table/big5_ext.h b/src/table/big5_ext.h
--- a/src/table/big5_ext.h
+++ b/src/table/big5_ext.h
@@ -1,7 +1,7 @@
//
// AUTOMATICALLLY GENERATED by gentables
//
-#ifdef ENCODING_CN_EXT
+#ifdef ENCODING_ZH_EXT
static const uint16_t big5_ext_f_0[] = {
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
diff --git a/src/table/big5_plus.h b/src/table/big5_plus.h
--- a/src/table/big5_plus.h
+++ b/src/table/big5_plus.h
@@ -1,7 +1,7 @@
//
// AUTOMATICALLLY GENERATED by gentables
//
-#ifdef ENCODING_CN_EXT
+#ifdef ENCODING_ZH_EXT
static const uint16_t big5_plus_f_0[] = {
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
diff --git a/src/table/cns11643_1992_1.h b/src/table/cns11643_1992_1.h
--- a/src/table/cns11643_1992_1.h
+++ b/src/table/cns11643_1992_1.h
@@ -1,7 +1,7 @@
//
// AUTOMATICALLLY GENERATED by gentables
//
-#ifdef ENCODING_CN_EXT
+#ifdef ENCODING_ZH_EXT
static const uint16_t cns11643_1992_1_f_78[] = {
0x4421, 0x4423, 0x0000, 0x4424, 0x0000, 0x0000, 0x0000, 0x0000, 0x4437, 0x4435, 0x4438, 0x4436,
diff --git a/src/table/cns11643_1992_2.h b/src/table/cns11643_1992_2.h
--- a/src/table/cns11643_1992_2.h
+++ b/src/table/cns11643_1992_2.h
@@ -1,7 +1,7 @@
//
// AUTOMATICALLLY GENERATED by gentables
//
-#ifdef ENCODING_CN_EXT
+#ifdef ENCODING_ZH_EXT
static const uint16_t cns11643_1992_2_f_78[] = {
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2126, 0x0000, 0x0000, 0x0000, 0x0000,
diff --git a/src/table/cns11643_1992_3.h b/src/table/cns11643_1992_3.h
--- a/src/table/cns11643_1992_3.h
+++ b/src/table/cns11643_1992_3.h
@@ -1,7 +1,7 @@
//
// AUTOMATICALLLY GENERATED by gentables
//
-#ifdef ENCODING_CN_EXT
+#ifdef ENCODING_ZH_EXT
static const uint16_t cns11643_1992_3_f_52[] = {
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
diff --git a/src/table/cns11643_1992_4.h b/src/table/cns11643_1992_4.h
--- a/src/table/cns11643_1992_4.h
+++ b/src/table/cns11643_1992_4.h
@@ -1,7 +1,7 @@
//
// AUTOMATICALLLY GENERATED by gentables
//
-#ifdef ENCODING_CN_EXT
+#ifdef ENCODING_ZH_EXT
static const uint16_t cns11643_1992_4_f_52[] = {
0x0000, 0x2224, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
diff --git a/src/table/cns11643_1992_5.h b/src/table/cns11643_1992_5.h
--- a/src/table/cns11643_1992_5.h
+++ b/src/table/cns11643_1992_5.h
@@ -1,7 +1,7 @@
//
// AUTOMATICALLLY GENERATED by gentables
//
-#ifdef ENCODING_CN_EXT
+#ifdef ENCODING_ZH_EXT
static const uint16_t cns11643_1992_5_f_52[] = {
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
diff --git a/src/table/cns11643_1992_6.h b/src/table/cns11643_1992_6.h
--- a/src/table/cns11643_1992_6.h
+++ b/src/table/cns11643_1992_6.h
@@ -1,7 +1,7 @@
//
// AUTOMATICALLLY GENERATED by gentables
//
-#ifdef ENCODING_CN_EXT
+#ifdef ENCODING_ZH_EXT
static const uint16_t cns11643_1992_6_f_52[] = {
0x222c, 0x0000, 0x0000, 0x0000, 0x2130, 0x2123, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
diff --git a/src/table/cns11643_1992_7.h b/src/table/cns11643_1992_7.h
--- a/src/table/cns11643_1992_7.h
+++ b/src/table/cns11643_1992_7.h
@@ -1,7 +1,7 @@
//
// AUTOMATICALLLY GENERATED by gentables
//
-#ifdef ENCODING_CN_EXT
+#ifdef ENCODING_ZH_EXT
static const uint16_t cns11643_1992_7_f_69[] = {
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
diff --git a/src/table/cns11643_1992_f.h b/src/table/cns11643_1992_f.h
--- a/src/table/cns11643_1992_f.h
+++ b/src/table/cns11643_1992_f.h
@@ -1,7 +1,7 @@
//
// AUTOMATICALLLY GENERATED by gentables
//
-#ifdef ENCODING_CN_EXT
+#ifdef ENCODING_ZH_EXT
static const uint16_t cns11643_1992_f_f_54[] = {
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
diff --git a/src/table/gb2312_1980_0.h b/src/table/gb2312_1980_0.h
--- a/src/table/gb2312_1980_0.h
+++ b/src/table/gb2312_1980_0.h
@@ -1,7 +1,7 @@
//
// AUTOMATICALLLY GENERATED by gentables
//
-#ifdef ENCODING_CN
+#ifdef ENCODING_ZH
static const uint16_t gb2312_1980_0_f_0[] = {
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
diff --git a/src/xdefaults.C b/src/xdefaults.C
--- a/src/xdefaults.C
+++ b/src/xdefaults.C
@@ -286,11 +286,11 @@ static const char optionsstring[] = "options: "
#if ENCODING_KR
"+kr"
#endif
-#if ENCODING_CN
- "+cn"
+#if ENCODING_ZH
+ "+zh"
#endif
-#if ENCODING_CN_EXT
- "+cn-ext"
+#if ENCODING_ZH_EXT
+ "+zh-ext"
#endif
","
#if OFF_FOCUS_FADING
-----END OF PAGE-----
-- Response ended
-- Page fetched on Sun Jun 2 13:04:36 2024