diff -Ncr rxvt-2.7.2_orig/CYGWIN-PATCHES/rxvt-2.7.2j.README rxvt-2.7.2/CYGWIN-PATCHES/rxvt-2.7.2j.README *** rxvt-2.7.2_orig/CYGWIN-PATCHES/rxvt-2.7.2j.README Thu Jan 1 09:00:00 1970 --- rxvt-2.7.2/CYGWIN-PATCHES/rxvt-2.7.2j.README Thu Oct 18 00:11:28 2001 *************** *** 0 **** --- 1,12 ---- + 1) ./configure --prefix=/usr --x-includes="../W11 -IW11" \ + --x-libraries="../W11/lib -mwindows ../W11/wrap/rxvt_res.o -Wl,--subsystem,console" \ + --with-xpm-includes=../W11 \ + --with-xpm-library=../W11/lib \ + --enable-menubar \ + --enable-xpm-background \ + --enable-languages \ + --with-encoding=sjis + 2) comment out USE_XIM in config.h + /*#define USE_XIM 1*/ + 3) make + 4) DISPLAY=:0 PATH=./W11/lib:$PATH ./src/rxvt.exe -fn msmincho-14 -fm msmincho-14 -km sjis diff -Ncr rxvt-2.7.2_orig/W11/w32/Makefile rxvt-2.7.2/W11/w32/Makefile *** rxvt-2.7.2_orig/W11/w32/Makefile Sun Apr 15 09:00:34 2001 --- rxvt-2.7.2/W11/w32/Makefile Thu Oct 18 00:27:34 2001 *************** *** 5,12 **** alldoc tags: ! ../lib/libW11.dll: xlib.o ntutil.o event.o ! dllwrap --export-all-symbols -o ../lib/libW11.dll xlib.o ntutil.o event.o -mwindows xlib.o: xlib.c ntdef.h gcc -c xlib.c -O -I.. -mwin32 --- 5,15 ---- alldoc tags: ! ../lib/libW11.dll: xlib.o ntutil.o event.o xlibime.o ! dllwrap --export-all-symbols -o ../lib/libW11.dll xlib.o ntutil.o event.o xlibime.o -mwindows ! ! xlibime.o: xlibime.c xlibime.h ! gcc -c xlibime.c -O -I.. -mwin32 xlib.o: xlib.c ntdef.h gcc -c xlib.c -O -I.. -mwin32 diff -Ncr rxvt-2.7.2_orig/W11/w32/event.c rxvt-2.7.2/W11/w32/event.c *** rxvt-2.7.2_orig/W11/w32/event.c Tue May 15 10:59:02 2001 --- rxvt-2.7.2/W11/w32/event.c Thu Oct 18 00:27:44 2001 *************** *** 1,6 **** --- 1,8 ---- #include #include "ntdef.h" + #include "xlibime.h" + #include /* a crude method to avoid losing the selection when calling EmptyClipboard, which is necessary to do *************** *** 165,176 **** mask = window->mask; switch (message) { - /* we'll handle these, later */ - case WM_KILLFOCUS: - case WM_SETFOCUS: case WM_QUIT: case WM_CLOSE: case WM_DESTROY: case WM_SYSCHAR: /* alt-keys go here */ case WM_CHAR: case WM_LBUTTONDBLCLK: --- 167,179 ---- mask = window->mask; switch (message) { case WM_QUIT: case WM_CLOSE: case WM_DESTROY: + IME_Release(hWnd); + /* we'll handle these, later */ + case WM_KILLFOCUS: + case WM_SETFOCUS: case WM_SYSCHAR: /* alt-keys go here */ case WM_CHAR: case WM_LBUTTONDBLCLK: *************** *** 280,285 **** --- 283,293 ---- break; } + break; + case WM_IME_STARTCOMPOSITION: + case WM_IME_ENDCOMPOSITION: + IME_SetCompWinPos(hWnd, IME_SCWP_CURSOR); + return (DefWindowProc(hWnd, message, wParam, lParam)); break; default: /* Passes it on if unproccessed */ return (DefWindowProc(hWnd, message, wParam, lParam)); diff -Ncr rxvt-2.7.2_orig/W11/w32/xlib.c rxvt-2.7.2/W11/w32/xlib.c *** rxvt-2.7.2_orig/W11/w32/xlib.c Mon Jun 4 13:31:30 2001 --- rxvt-2.7.2/W11/w32/xlib.c Thu Oct 18 00:31:16 2001 *************** *** 25,30 **** --- 25,31 ---- /* Local Data */ + extern HFONT hImeFont; static void NT_set_GC_pen(); static void NT_set_GC_brush(); static HPEN NT_get_GC_pen(); *************** *** 843,849 **** --- 844,864 ---- const XChar2b* str, int len) { + HDC hDC; + TEXTMETRIC tmet; + HFONT old; xtrace("XDrawString16\n"); + if (VALID_WINDOW(window)) + { + hDC = drawableGetDC(window); + SetBkMode(hDC,TRANSPARENT); + SetTextColor(hDC,CNUMTORGB(gc->values.foreground)); + old=SelectObject(hDC,(HFONT)gc->values.font); + GetTextMetrics(hDC,&tmet); + TextOut(hDC,x,y-tmet.tmAscent,(char *)str,len * 2); + SelectObject(hDC,old); + drawableRelDC(window,hDC); + } return 0; } XDrawImageString( *************** *** 880,886 **** --- 895,918 ---- const XChar2b* str, int len) { + HDC hDC = NULL; + TEXTMETRIC tmet; + HFONT old; + RECT rect; xtrace("XDrawImageString16\n"); + if (VALID_WINDOW(window)) + { + hDC = drawableGetDC(window); + SetBkMode(hDC,OPAQUE); + SetBkColor(hDC, CNUMTORGB(gc->values.background)); + SetTextColor(hDC,CNUMTORGB(gc->values.foreground)); + old=SelectObject(hDC,(HFONT)gc->values.font); + GetTextMetrics(hDC,&tmet); + TextOut( hDC, x, y-tmet.tmAscent, (char *)str, len * 2); + + SelectObject(hDC,old); + drawableRelDC(window,hDC); + } return 0; } *************** *** 2401,2406 **** --- 2433,2450 ---- lf.lfWeight = FW_NORMAL; lf.lfFaceName[0]='\0'; + if (name && + (strstr(name,"msmincho") && + strcpy(lf.lfFaceName, "ＭＳ 明朝") || + strstr(name, "msgothic") && + strcpy(lf.lfFaceName, "ＭＳ ゴシック"))) + { + lf.lfCharSet = SHIFTJIS_CHARSET; /* 文字セット */ + lf.lfOutPrecision = OUT_DEFAULT_PRECIS; /* 出力精度 */ + lf.lfClipPrecision = CLIP_DEFAULT_PRECIS; /* クリッピング精度 */ + lf.lfQuality = PROOF_QUALITY; /* 出力品質 */ + lf.lfPitchAndFamily = FIXED_PITCH | FF_MODERN; /* ピッチとファミリー */ + } if (name && strstr(name,"-bold")) { lf.lfWeight = FW_BOLD; *************** *** 2442,2447 **** --- 2486,2492 ---- strcpy(lf.lfFaceName,"Courier New"); hfont = CreateFontIndirect(&lf); + if(!hImeFont) hImeFont = hfont; return (Font)hfont; } *************** *** 2466,2472 **** SelectObject(hdc,old); ReleaseDC(root,hdc); fs->min_bounds.width = tm.tmAveCharWidth; ! fs->max_bounds.width = tm.tmMaxCharWidth; fs->n_properties = 0; fs->properties = NULL; fs->min_char_or_byte2 =tm.tmFirstChar; --- 2511,2520 ---- SelectObject(hdc,old); ReleaseDC(root,hdc); fs->min_bounds.width = tm.tmAveCharWidth; ! if (name && (strstr(name,"msmincho") || strstr(name, "msgothic"))) ! fs->max_bounds.width = tm.tmAveCharWidth; ! else ! fs->max_bounds.width = tm.tmMaxCharWidth; fs->n_properties = 0; fs->properties = NULL; fs->min_char_or_byte2 =tm.tmFirstChar; diff -Ncr rxvt-2.7.2_orig/W11/w32/xlibime.c rxvt-2.7.2/W11/w32/xlibime.c *** rxvt-2.7.2_orig/W11/w32/xlibime.c Thu Jan 1 09:00:00 1970 --- rxvt-2.7.2/W11/w32/xlibime.c Thu Oct 18 00:11:28 2001 *************** *** 0 **** --- 1,104 ---- + /*****************************************************************\ + + Library of windows IME relative functions which part of xlib.c + Jan-01 Genzoo.A Created. + + \******************************************************************/ + #include + #include + #include "xlibime.h" + #define MAX_IT(current, other) if ((other) > (current)) (current) = (other) + + static FARPROC pImmGetContext; + static FARPROC pImmReleaseContext; + static FARPROC pImmSetCompositionFontA; + static FARPROC pImmSetCompositionWindow; + HFONT hImeFont = NULL; + static HANDLE _hImeLib = NULL; + + static int cursor_pos_x = 0; + static int cursor_pos_y = 0; + + void SetCurPos(const int x, const int y); + + void SetCurPos(const int x, const int y) + { + cursor_pos_x = x; + cursor_pos_y = y; + } + + /* there is no need direct call */ + HANDLE _IME_GetHandle() + { + if (_hImeLib != NULL) return _hImeLib; + + _hImeLib = LoadLibrary("IMM32.DLL"); + if (_hImeLib == NULL){ + _hImeLib = INVALID_HANDLE_VALUE; + return _hImeLib; + } + + #define IME_LOAD_LIB(__symbol__) \ + p ## __symbol__ = GetProcAddress(_hImeLib, #__symbol__); \ + if(!p ## __symbol__){ \ + FreeLibrary(_hImeLib); \ + _hImeLib = INVALID_HANDLE_VALUE; \ + return _hImeLib; \ + } + + IME_LOAD_LIB(ImmGetContext); + IME_LOAD_LIB(ImmReleaseContext); + IME_LOAD_LIB(ImmSetCompositionFontA); + IME_LOAD_LIB(ImmSetCompositionWindow); + + #undef IME_LOAD_LIB + + return _hImeLib; + } + + void IME_Release(HWND hWnd) + { + if(_hImeLib == INVALID_HANDLE_VALUE || !_hImeLib) return; + IME_SetCompWinPos(hWnd,IME_SCWP_DEFAULT); + FreeLibrary(_hImeLib); + _hImeLib = NULL; + hImeFont = NULL; + } + + void IME_SetCompWinPos(HWND hWnd, ime_scwp_t ind) + { + HIMC hIMC; + COMPOSITIONFORM cf; + static BOOL isSetFont = FALSE; + HANDLE hImeLib = _IME_GetHandle(); + if(hImeLib == INVALID_HANDLE_VALUE) return; + hIMC = (*pImmGetContext)(hWnd); + if (ind == IME_SCWP_CURSOR){ + cf.dwStyle = CFS_POINT; + cf.ptCurrentPos.x = cursor_pos_x; + cf.ptCurrentPos.y = cursor_pos_y; + MAX_IT(cf.ptCurrentPos.y,0); + } + else + cf.dwStyle = CFS_DEFAULT; + (*pImmSetCompositionWindow)(hIMC,&cf); + (*pImmReleaseContext)(hWnd,hIMC); + + if(!isSetFont) isSetFont = _IME_SetCompWinFont(hWnd); + } + + /* there is no need direct call */ + BOOL _IME_SetCompWinFont(HWND hWnd) + { + HIMC hIMC; + LOGFONT lf; + HANDLE hImeLib = _IME_GetHandle(); + if(hImeLib == INVALID_HANDLE_VALUE || !hImeFont) return FALSE;; + hIMC = (*pImmGetContext)(hWnd); + GetObject(hImeFont, sizeof(LOGFONT), &lf); + (*pImmSetCompositionFontA)(hIMC,&lf); + (*pImmReleaseContext)(hWnd,hIMC); + return TRUE; + } + + diff -Ncr rxvt-2.7.2_orig/W11/w32/xlibime.h rxvt-2.7.2/W11/w32/xlibime.h *** rxvt-2.7.2_orig/W11/w32/xlibime.h Thu Jan 1 09:00:00 1970 --- rxvt-2.7.2/W11/w32/xlibime.h Thu Oct 18 00:11:28 2001 *************** *** 0 **** --- 1,28 ---- + /*****************************************************************\ + + Library of windows IME relative functions which part of xlib.c + Jan-01 Genzoo.A Created. + + \******************************************************************/ + + #ifndef __XLIBIME_H__ + #define __XLIBIME_H__ + + typedef enum { + IME_SCWP_DEFAULT, + IME_SCWP_CURSOR + } ime_scwp_t; + + #ifdef XLIBIME_INST + HANDLE _IME_GetHandle(); + BOOL _IME_SetCompWinFont(HWND); + # define EXTLIT + #else + # define EXTLIT extern + EXTLIT HFONT hImeFont; + #endif + + EXTLIT void IME_Release(HWND); + EXTLIT void IME_SetCompWinPos(HWND, ime_scwp_t); + + #endif /* ! __XLIBIME_H__ */ diff -Ncr rxvt-2.7.2_orig/W11/wrap/wrap.c rxvt-2.7.2/W11/wrap/wrap.c *** rxvt-2.7.2_orig/W11/wrap/wrap.c Mon Jun 4 11:39:48 2001 --- rxvt-2.7.2/W11/wrap/wrap.c Thu Oct 18 00:29:22 2001 *************** *** 105,110 **** --- 105,117 ---- (func_NT_SetAtom)(class); } + typedef void (proto_SetCurPos)(const int x, const int y); + static proto_SetCurPos *func_SetCurPos = NULL; + void SetCurPos(const int x, const int y) { + if(func_SetCurPos) + (func_SetCurPos)(x, y); + } + typedef Display * (proto_XOpenDisplay)(const char *name); static proto_XOpenDisplay *func_XOpenDisplay = NULL; Display * XOpenDisplay(const char *name) { *************** *** 118,123 **** --- 125,131 ---- _libname="libW11"; class = _register_window_class(); _set_atom(class); + if (!func_SetCurPos) func_SetCurPos=(proto_SetCurPos *)_loadfunc("SetCurPos"); } else _libname="libX11"; } diff -Ncr rxvt-2.7.2_orig/src/screen.c rxvt-2.7.2/src/screen.c *** rxvt-2.7.2_orig/src/screen.c Sat Dec 18 21:19:24 1999 --- rxvt-2.7.2/src/screen.c Thu Oct 18 00:11:28 2001 *************** *** 1813,1818 **** --- 1813,1819 ---- void sjis2jis(unsigned char *str, int len) { + #if 0 register int i; unsigned char *high, *low; *************** *** 1830,1835 **** --- 1831,1837 ---- *low -= 0x1F; } } + #endif } /* INTPROTO */ *************** *** 2081,2087 **** --- 2083,2096 ---- * screen.text/screen.rend contain what the screen will change to. */ + void SetCurPos(const int x, const int y); #define DRAW_STRING(Func, x, y, str, len) \ + SetCurPos(\ + Col2Pixel(screen.cur.col) +\ + + (scrollbar_visible() && !(Options & Opt_scrollBar_right)\ + ? (SB_WIDTH + sb_shadow * 2) : 0),\ + Row2Pixel(screen.cur.row)\ + ),\ Func(Xdisplay, drawBuffer, TermWin.gc, (x), (y), (str), (len)) #if defined (NO_BRIGHTCOLOR) || defined (VERYBOLD) *************** *** 2827,2833 **** if (XmbTextPropertyToTextList(Xdisplay, &ct, &cl, &dummy_count) == Success && cl) { PasteIt(cl[0], STRLEN(cl[0])); ! XFreeStringList(cl); } else #endif PasteIt(ct.value, ct.nitems); --- 2836,2847 ---- if (XmbTextPropertyToTextList(Xdisplay, &ct, &cl, &dummy_count) == Success && cl) { PasteIt(cl[0], STRLEN(cl[0])); ! // XFreeStringList(cl); ! { ! int i; ! for(i=0; i # endif + int XpmReadFileToPixmap(Display *display, + Drawable d, + char *filename, + Pixmap *pixmap_return, + Pixmap *shapemask_return, + XpmAttributes *attributes); typedef struct { short w, h, x, y;