- Based on fedora tgif pkg ( git://pkgs.fedoraproject.org/tgif.git )
- Original tgif Japanese resources use EUC-JP.
- The HACK-ed tgif is able to run on UTF-8 environment (both
LANG=ja_JP.UTF-8
andLANG=ja_JP.euc-jp
). Tgif.PreeditType: overthespot
is very buggy. So,Tgif.PreeditType: root
is recommended.- OBJ file is compatible!
- OBJ-file encoding is EUC-JP since the Japanese font
Ryumin
andGothicBBB
use EUC-JP.
- OBJ-file encoding is EUC-JP since the Japanese font
tgif-4.2.5-utf8dirtyhack2.patch
is based ontgif-utf8dirtyhack.patch
Last active
August 29, 2015 14:08
-
-
Save cat-in-136/a8add625dd919e991a80 to your computer and use it in GitHub Desktop.
UTF-8-japanese HACK for tgif based on the fedora pkg ( git://pkgs.fedoraproject.org/tgif.git )
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tgif-QPL-4.2.2.tar.gz | |
/tgif-QPL-4.2.3.tar.gz | |
/tgif-QPL-4.2.4.tar.gz | |
/tgif-QPL-4.2.5.tar.gz |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
a622240ce2377f15b6d8261e4c49b8f6 tgif-QPL-4.2.5.tar.gz |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- tgif-QPL-4.2.5.orig/text.c 2011-06-28 11:04:59.000000000 +0900 | |
+++ tgif-QPL-4.2.5/text.c 2014-11-03 00:47:56.040279534 +0900 | |
@@ -18,6 +18,8 @@ | |
* @(#)$Header: /mm2/home/cvs/bc-src/tgif/text.c,v 1.73 2011/06/14 02:32:19 william Exp $ | |
*/ | |
+#include <iconv.h> | |
+ | |
#define _INCLUDE_FROM_TEXT_C_ | |
#include "tgifdefs.h" | |
@@ -3806,6 +3808,38 @@ | |
char *s; | |
int has_ch; | |
{ | |
+#if 1 /* Dirty UTF-8 HACK */ | |
+ if (has_ch >= 2 && canvasFontDoubleByte) { | |
+ char *lang=NULL; | |
+ | |
+ lang = (char*)getenv("LANG"); | |
+ if (lang == NULL) { | |
+ lang = XGetDefault(mainDisplay, TOOL_NAME, "Lang"); | |
+ } | |
+ | |
+ if ((lang != NULL) && (strncmp(lang, "ja_JP.", 6) == 0 && (strncasecmp(lang+6, "utf8", 4) == 0 || strncasecmp(lang+6, "utf-8", 5) == 0))) { | |
+ iconv_t convd=NULL; | |
+ char s2[MAXSTRING]; | |
+ char *in_buf, *out_buf; | |
+ size_t in_size, out_size; | |
+ size_t ret; | |
+ | |
+ in_buf = s; | |
+ in_size = strlen(s); | |
+ out_buf = s2; | |
+ out_size = sizeof(s2) - 1; | |
+ | |
+ convd = iconv_open("EUC-JP", "utf-8"); | |
+ iconv(convd, NULL, NULL, NULL, NULL); | |
+ ret = iconv(convd, &in_buf, &in_size, &out_buf, &out_size); | |
+ if (ret >= 0) { | |
+ strncpy(s, s2, MAXSTRING - 1); | |
+ has_ch = strlen(s2); | |
+ } | |
+ iconv_close(convd); | |
+ } | |
+ } | |
+#endif | |
if (has_ch >= 2 && !canvasFontDoubleByte && | |
Tgim_has_stringprep_convert()) { | |
char *psz=NULL, *psz1=NULL, *psz2=NULL, *psz_encoding=NULL; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- tgif-QPL-4.1.45/chat.c.debug 2006-06-14 07:29:57.000000000 +0900 | |
+++ tgif-QPL-4.1.45/chat.c 2008-03-11 03:59:04.000000000 +0900 | |
@@ -350,10 +350,11 @@ | |
case TDGTNF_MULTI_BTN_CLICKED: | |
if (tdgt_notify.ctl_id == ID_CHAT_BTN_COLOR) { | |
int color_index=INVALID; | |
+ char c_tmp; | |
switch (tdgt_notify.nf_arg) { /* Button[1-3] */ | |
case Button1: | |
- color_index = (int)TdgtBtnGetText( | |
+ color_index = (int)*TdgtBtnGetText( | |
gstChatInfo.btn_ctl[CHAT_BTN_COLOR]); | |
if (++color_index >= maxColors) color_index = 0; | |
break; | |
@@ -361,13 +362,14 @@ | |
color_index = tdgt_notify.nf_arg2; | |
break; | |
case Button3: | |
- color_index = (int)TdgtBtnGetText( | |
+ color_index = (int)*TdgtBtnGetText( | |
gstChatInfo.btn_ctl[CHAT_BTN_COLOR]); | |
if (--color_index < 0) color_index = maxColors-1; | |
break; | |
} | |
+ c_tmp = (char) color_index; | |
TdgtBtnSetText(gstChatInfo.btn_ctl[CHAT_BTN_COLOR], | |
- (char*)color_index, NULL); | |
+ &c_tmp, NULL); | |
TdgtSmplEditSetColorIndex(gstChatInfo.edit_ctl, color_index); | |
tgWriteProfileString("User", "Color", | |
colorMenuItems[color_index], gstChatInfo.ini_fname); | |
@@ -589,6 +591,8 @@ | |
int new_alloc=FALSE, ival=0, font_style=STYLE_NR; | |
int is_bold=FALSE, is_italic=FALSE, color_index=colorIndex; | |
+ char c_tmp; | |
+ | |
if ((buf=tgGetProfileString("User", "Color", gstChatInfo.ini_fname)) != | |
NULL) { | |
color_index = QuickFindColorIndex(NULL, buf, &new_alloc, TRUE); | |
@@ -685,6 +689,8 @@ | |
0, 0, TGMUTYPE_TEXT, TDGTBTN_CLICK, TGBS_NORMAL, STYLE_NR, "Send", | |
&mosi); | |
+ c_tmp = (char) color_index; | |
+ | |
mosi.one_line_status = FALSE; | |
UtilStrCpyN(mosi.btn_str[0], sizeof(mosi.btn_str[0]), colorMouseStatus[0].l); | |
UtilStrCpyN(mosi.btn_str[1], sizeof(mosi.btn_str[1]), colorMouseStatus[0].m); | |
@@ -695,7 +701,7 @@ | |
gstChatInfo.btn_win_info[CHAT_BTN_COLOR].w, | |
gstChatInfo.btn_win_info[CHAT_BTN_COLOR].h, | |
0, 0, TGMUTYPE_COLOR, TDGTBTN_CLICK, TGBS_NORMAL, INVALID, | |
- (char*)color_index, &mosi); | |
+ &c_tmp, &mosi); | |
gstChatInfo.edit_ctl = CreateTdgtSmplEdit(chatWindow, NULL, ID_CHAT_EDIT, | |
gstChatInfo.edit_win_info.x, gstChatInfo.edit_win_info.y, | |
--- tgif-QPL-4.1.45/cmd.c.debug 2006-06-14 07:29:57.000000000 +0900 | |
+++ tgif-QPL-4.1.45/cmd.c 2008-03-11 02:49:42.000000000 +0900 | |
@@ -794,10 +794,12 @@ | |
int count=0; | |
if (CmdPtr->pos_before_has_ids) { | |
+ char c_tmp; | |
for (obj_ptr=topObj; obj_ptr != NULL; obj_ptr=next_obj) { | |
next_obj = obj_ptr->next; | |
+ c_tmp = (char) (CmdPtr->pos_before[count]); | |
if (ObjHasFullID(obj_ptr, | |
- (char*)(int)(CmdPtr->pos_before[count]))) { | |
+ &c_tmp)) { | |
count++; | |
sel_ptr->obj = obj_ptr; | |
if (!obj_ptr->locked) MoveObj(obj_ptr, dx, dy); | |
--- tgif-QPL-4.1.45/font.c.debug 2008-03-11 03:54:02.000000000 +0900 | |
+++ tgif-QPL-4.1.45/font.c 2008-03-11 03:54:02.000000000 +0900 | |
@@ -20,6 +20,8 @@ | |
#define _INCLUDE_FROM_FONT_C_ | |
+#include <ctype.h> | |
+ | |
#include "tgifdefs.h" | |
#include "cmdids.h" | |
@@ -372,15 +374,15 @@ | |
char *font_name; | |
int dbflag; | |
{ | |
- unsigned char c; | |
- unsigned char *buf, *dist, *src; | |
+ char c; | |
+ char *buf, *dist, *src; | |
char **font_list; | |
int actual_count_return; | |
if (!font_name) | |
return False; | |
- buf = (unsigned char*)malloc (strlen(font_name) + 3); | |
+ buf = malloc (strlen(font_name) + 3); | |
if (!buf) | |
return False; | |
--- tgif-QPL-4.1.45/stretch.c.debug 2006-06-14 07:29:59.000000000 +0900 | |
+++ tgif-QPL-4.1.45/stretch.c 2008-03-11 03:07:59.000000000 +0900 | |
@@ -386,6 +386,7 @@ | |
*pn_num_to_resize = 0; | |
for (sel_ptr=botSel; sel_ptr != NULL; sel_ptr=sel_ptr->prev) { | |
struct AttrRec *name_attr=NULL; | |
+ char c_tmp; | |
if (HasOnResize(sel_ptr->obj, &name_attr) && name_attr != NULL) { | |
num_to_resize++; | |
@@ -396,7 +397,8 @@ | |
num_to_resize*sizeof(char*)); | |
} | |
if (ppsz_names == NULL) FailAllocMessage(); | |
- ppsz_names[num_to_resize-1] = (char*)(sel_ptr->obj->id); | |
+ c_tmp = (char) (sel_ptr->obj->id); | |
+ ppsz_names[num_to_resize-1] = &c_tmp; | |
} | |
} | |
if (num_to_resize == 0) return NULL; | |
@@ -429,7 +431,7 @@ | |
RemoveAllSel(); | |
for (i=0; i < num_to_resize; i++) { | |
struct AttrRec *exec_attr=NULL; | |
- struct ObjRec *obj_ptr=FindObjWithOID((int)(ppsz_names[i])); | |
+ struct ObjRec *obj_ptr=FindObjWithOID((int)(*ppsz_names[i])); | |
if (obj_ptr != NULL && !SkipOnResize(obj_ptr)) { | |
exec_attr = FindAttrWithName(obj_ptr, "on_resize=", NULL); | |
@@ -445,7 +447,7 @@ | |
} | |
} | |
for (i=0; i < num_to_resize; i++) { | |
- struct ObjRec *obj_ptr=FindObjWithOID((int)(ppsz_names[i])); | |
+ struct ObjRec *obj_ptr=FindObjWithOID((int)(*ppsz_names[i])); | |
if (obj_ptr != NULL) { | |
if (!AlreadySelected(obj_ptr)) { | |
--- tgif-QPL-4.1.45/tdgtbtn.c.debug 2006-06-14 07:29:59.000000000 +0900 | |
+++ tgif-QPL-4.1.45/tdgtbtn.c 2008-03-11 03:14:25.000000000 +0900 | |
@@ -129,7 +129,7 @@ | |
break; | |
case TGMUTYPE_COLOR: | |
if (colorDisplay) { | |
- pixel = (btn_down ? myFgPixel : colorPixels[(int)(pTdgtBtn->str)]); | |
+ pixel = (btn_down ? myFgPixel : colorPixels[(unsigned int)(*pTdgtBtn->str)]); | |
} else { | |
pixel = myFgPixel; | |
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- tgif-QPL-4.2.5/arc.c.format 2011-06-28 11:04:56.000000000 +0900 | |
+++ tgif-QPL-4.2.5/arc.c 2013-12-04 10:01:49.568114857 +0900 | |
@@ -53,6 +53,7 @@ | |
#include "strtbl.e" | |
#include "util.e" | |
#include "xpixmap.e" | |
+#include <string.h> | |
#define EXPAND_BBOX(bbox,x,y) \ | |
if ((x)<(bbox)->ltx) (bbox)->ltx=(x); if ((y)<(bbox)->lty) (bbox)->lty=(y); \ | |
@@ -2041,7 +2042,7 @@ void ReadArcObj(FP, Inbuf, ObjPtr) | |
} | |
if (dir == ARC_CCW && angle2 < 0) { | |
- sprintf(gszMsgBox, TgLoadString(STID_WARN_INCONSIST_ARC_DIR)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_WARN_INCONSIST_ARC_DIR)); | |
if (PRTGIF) { | |
fprintf(stderr, "%s\n", gszMsgBox); | |
} else { | |
@@ -2050,7 +2051,7 @@ void ReadArcObj(FP, Inbuf, ObjPtr) | |
SetFileModified(TRUE); | |
dir = ARC_CW; | |
} else if (dir == ARC_CW && angle2 > 0) { | |
- sprintf(gszMsgBox, TgLoadString(STID_WARN_INCONSIST_ARC_DIR)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_WARN_INCONSIST_ARC_DIR)); | |
if (PRTGIF) { | |
fprintf(stderr, "%s\n", gszMsgBox); | |
} else { | |
--- tgif-QPL-4.2.5/auxtext.c.format 2011-06-28 11:04:56.000000000 +0900 | |
+++ tgif-QPL-4.2.5/auxtext.c 2013-12-04 10:05:19.997447447 +0900 | |
@@ -46,6 +46,7 @@ | |
#include "util.e" | |
#include "xbitmap.e" | |
#include "xpixmap.e" | |
+#include <string.h> | |
GC rotateGC=NULL; | |
Pixmap textBackingBitmap=None, textBackingBgBitmap=None; | |
@@ -113,7 +114,7 @@ int InputOctalString(pszBuf, pnBufSize) | |
if (canvasFontDoubleByte) { | |
sprintf(gszMsgBox, TgLoadString(STID_INPUT_OCTAL_STR), "\\244\\244"); | |
} else { | |
- sprintf(gszMsgBox, TgLoadString(STID_INPUT_STR)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_INPUT_STR)); | |
} | |
Dialog(gszMsgBox, TgLoadCachedString(CSTID_DLG_ACCEPT_CANCEL), szSpec); | |
UtilTrimBlanks(szSpec); | |
--- tgif-QPL-4.2.5/cutpaste.c.format 2011-06-28 11:04:57.000000000 +0900 | |
+++ tgif-QPL-4.2.5/cutpaste.c 2013-12-04 10:06:43.131060861 +0900 | |
@@ -72,6 +72,7 @@ | |
#include "util.e" | |
#include "xbitmap.e" | |
#include "xpixmap.e" | |
+#include <string.h> | |
int copyingToCutBuffer=FALSE; | |
int pastingFile=FALSE; | |
@@ -200,7 +201,7 @@ int WriteBufToCutBuffer(buf, bytes_to_wr | |
lastKeyOrBtnEvInfo.time); | |
if (XGetSelectionOwner(mainDisplay, XA_PRIMARY) != mainWindow) { | |
setselowner_failed = TRUE; | |
- sprintf(gszMsgBox, TgLoadString(STID_CANT_ACQUIRE_X_SELECTION)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_CANT_ACQUIRE_X_SELECTION)); | |
MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); | |
} else { | |
startSelectionOwnershipTimeValid = TRUE; | |
@@ -349,10 +350,10 @@ int CopyObjectToCutBuffer(force) | |
MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); | |
} else { | |
if (!WriteBufToCutBuffer(cut_buffer, stat.st_size, FALSE, FALSE, NULL)) { | |
- sprintf(gszMsgBox, TgLoadString(STID_COPY_FAILED_OBJ_MAYBE_TOO_BIG)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_COPY_FAILED_OBJ_MAYBE_TOO_BIG)); | |
MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); | |
} else { | |
- sprintf(gszMsgBox, TgLoadString(STID_COPY_BUFFER_UPDATED)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_COPY_BUFFER_UPDATED)); | |
Msg(gszMsgBox); | |
} | |
} | |
--- tgif-QPL-4.2.5/drawing.c.format 2011-06-28 11:04:57.000000000 +0900 | |
+++ tgif-QPL-4.2.5/drawing.c 2013-12-04 10:08:14.192591285 +0900 | |
@@ -87,6 +87,7 @@ | |
#include "wb.e" | |
#include "xbitmap.e" | |
#include "xpixmap.e" | |
+#include <string.h> | |
#define O_VIS 4 | |
#define O_INVIS 4 | |
@@ -3339,7 +3340,7 @@ void EditIndexedAttrInEditor(index) | |
SaveStatusStrings(); | |
if (*attr_ptr->attr_name.s == '\0') { | |
- sprintf(title, TgLoadString(STID_EDIT_UNNAME_ATTR_DOTS)); | |
+ strcpy(title, TgLoadString(STID_EDIT_UNNAME_ATTR_DOTS)); | |
sprintf(cmd, gszEditorCmd, title, tfi.tmp_fname); | |
sprintf(gszMsgBox, TgLoadString(STID_EDIT_UNNAME_ATTR_WITH_CMD), cmd); | |
} else { | |
@@ -3460,7 +3461,7 @@ void EditIndexedAttrGroupInEditor(index) | |
} | |
SaveStatusStrings(); | |
if (*attr_ptr->attr_name.s == '\0') { | |
- sprintf(title, TgLoadString(STID_EDIT_UNNAME_ATTR_DOTS)); | |
+ strcpy(title, TgLoadString(STID_EDIT_UNNAME_ATTR_DOTS)); | |
sprintf(cmd, gszEditorCmd, title, tfi.tmp_fname); | |
sprintf(gszMsgBox, TgLoadString(STID_EDIT_UNNAME_ATTR_WITH_CMD), cmd); | |
} else { | |
--- tgif-QPL-4.2.5/edit.c.format 2011-06-28 11:04:57.000000000 +0900 | |
+++ tgif-QPL-4.2.5/edit.c 2013-12-04 10:09:47.119337642 +0900 | |
@@ -73,6 +73,7 @@ | |
#include "util.e" | |
#include "xbitmap.e" | |
#include "xpixmap.e" | |
+#include <string.h> | |
struct SelRec *outerSelForFind=NULL; | |
struct SelRec *innerSelForFind=NULL; | |
@@ -1138,7 +1139,7 @@ void MakeRegularPolygon() | |
INFO_MB); | |
return; | |
} | |
- sprintf(gszMsgBox, TgLoadString(STID_VERTEX_AT_3_OCLOCK_YNC)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_VERTEX_AT_3_OCLOCK_YNC)); | |
if ((vertex_at_right=MsgBox(gszMsgBox, TOOL_NAME, YNC_MB)) == | |
MB_ID_CANCEL) { | |
return; | |
@@ -6104,7 +6105,7 @@ void RemoveObjectShadow() | |
return; | |
} | |
if (CountObjectWithShadow() == 0) { | |
- sprintf(gszMsgBox, TgLoadString(STID_NO_OBJ_SHADOW_FOUND)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_NO_OBJ_SHADOW_FOUND)); | |
MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); | |
return; | |
} | |
--- tgif-QPL-4.2.5/eps.c.format 2011-06-28 11:04:57.000000000 +0900 | |
+++ tgif-QPL-4.2.5/eps.c 2013-12-04 10:13:22.699268832 +0900 | |
@@ -670,7 +670,7 @@ FILE *GetTiffEPSIInfo(fp, pszEPS, file_b | |
} | |
fclose(xbm_fp); | |
if (writeFileFailed) { | |
- fprintf(stderr, TgLoadString(STID_FAIL_TO_WRITE_TO_STDOUT)); | |
+ fprintf(stderr, "%s", TgLoadString(STID_FAIL_TO_WRITE_TO_STDOUT)); | |
} | |
unlink(xbm_fname); | |
*xbm_fname = '\0'; | |
--- tgif-QPL-4.2.5/exec.c.format 2011-06-28 11:04:57.000000000 +0900 | |
+++ tgif-QPL-4.2.5/exec.c 2013-12-04 10:13:45.343887675 +0900 | |
@@ -85,6 +85,7 @@ | |
#include "xpixmap.e" | |
#include "xprtfltr.e" | |
#include "z_intrf.e" | |
+#include <string.h> | |
int execAnimating=FALSE; | |
int execAnimateRedraw=FALSE; | |
@@ -1753,7 +1754,7 @@ int CheckExecInterrupt(orig_cmd) | |
if (ESCPressed() || (check_any_button && XCheckMaskEvent(mainDisplay, | |
ButtonPressMask | KeyPressMask, &ev)) || CheckInterrupt(TRUE)) { | |
if (orig_cmd == NULL) { | |
- sprintf(gszMsgBox, TgLoadString(STID_USER_INTR)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_USER_INTR)); | |
} else { | |
sprintf(gszMsgBox, TgLoadString(STID_FUNC_USER_INTR), orig_cmd); | |
} | |
--- tgif-QPL-4.2.5/file.c.format 2011-06-28 11:04:57.000000000 +0900 | |
+++ tgif-QPL-4.2.5/file.c 2013-12-04 10:16:32.516221408 +0900 | |
@@ -87,6 +87,7 @@ | |
#include "xbitmap.e" | |
#include "xpixmap.e" | |
#include "xprtfltr.e" | |
+#include <string.h> | |
#ifdef _METRIC_PIX_PER_INCH | |
#define METRIC_PIX_PER_INCH 127 | |
@@ -4376,7 +4377,7 @@ int ImportGivenFile(file_name, group_and | |
sprintf(gszMsgBox, TgLoadString(STID_FILE_VER_ABORT_IMPORT), | |
fileVersion, TOOL_NAME, homePageURL); | |
} else { | |
- sprintf(gszMsgBox, TgLoadString(STID_FILE_CORRUPTED_ABORT_IMPORT)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_FILE_CORRUPTED_ABORT_IMPORT)); | |
} | |
MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); | |
SetDefaultCursor(mainWindow); | |
@@ -4862,7 +4863,7 @@ int LoadFile(FullName, ObjFile, GzippedO | |
sprintf(gszMsgBox, TgLoadString(STID_FILE_VER_ABORT_OPEN), | |
fileVersion, TOOL_NAME, homePageURL); | |
} else { | |
- sprintf(gszMsgBox, TgLoadString(STID_FILE_CORRUPTED_ABORT_OPEN)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_FILE_CORRUPTED_ABORT_OPEN)); | |
} | |
MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); | |
DrawPaperBoundary(drawWindow); | |
@@ -6609,7 +6610,7 @@ int DoGenDump(FileName) | |
whereToPrint == HTML_FILE || whereToPrint == PNG_FILE || | |
whereToPrint == JPEG_FILE || whereToPrint == PPM_FILE) { | |
if (topObj == NULL) { | |
- sprintf(gszMsgBox, TgLoadString(STID_NO_OBJ_TO_EXPORT)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_NO_OBJ_TO_EXPORT)); | |
if (PRTGIF) { | |
fprintf(stderr, "%s\n", gszMsgBox); | |
} else { | |
@@ -7646,7 +7647,7 @@ int DoGenDump(FileName) | |
SetOutputFileName(ps_file, TEXT_FILE_EXT, NULL, &FileName); | |
} else { | |
if (!curFileDefined) { | |
- sprintf(gszMsgBox, TgLoadString(STID_NO_CUR_FILE_CANNOT_GEN_TEXT)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_NO_CUR_FILE_CANNOT_GEN_TEXT)); | |
MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); | |
unlink(tmpFile); | |
return FALSE; | |
@@ -8675,7 +8676,7 @@ void SetTemplate() | |
} | |
sprintf(file_name, "%s%c%s", path, DIR_SEP, name); | |
} else { | |
- sprintf(gszMsgBox, TgLoadString(STID_SELECT_FILE_AS_TEMPLATE)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_SELECT_FILE_AS_TEMPLATE)); | |
if (SelectFileNameToImport(gszMsgBox, OBJ_FILE_EXT, file_name) == | |
INVALID) { | |
return; | |
--- tgif-QPL-4.2.5/grid.c.format 2011-06-28 11:04:57.000000000 +0900 | |
+++ tgif-QPL-4.2.5/grid.c 2013-12-04 10:17:33.560277288 +0900 | |
@@ -51,6 +51,7 @@ | |
#include "util.e" | |
#include "wb.e" | |
#include "xprtfltr.e" | |
+#include <string.h> | |
#define ENGLISH_GRID_STEP 8 | |
#define METRIC_GRID_STEP 5 | |
@@ -358,7 +359,7 @@ void ToggleRightMargin() | |
sprintf(gszMsgBox, TgLoadString(STID_RIGHT_MARGIN_IS), buf); | |
Msg(gszMsgBox); | |
} else { | |
- sprintf(gszMsgBox, TgLoadString(STID_RIGHT_MARGIN_DISABLED)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_RIGHT_MARGIN_DISABLED)); | |
Msg(gszMsgBox); | |
} | |
} | |
--- tgif-QPL-4.2.5/imgproc.c.format 2011-06-28 11:04:57.000000000 +0900 | |
+++ tgif-QPL-4.2.5/imgproc.c 2013-12-04 10:23:12.840460491 +0900 | |
@@ -62,6 +62,7 @@ | |
#include "xbitmap.e" | |
#include "xpixmap.e" | |
#include "z_intrf.e" | |
+#include <string.h> | |
#define HISTOGRAMCOUNT(i) (gpHistogram[(i)].pixel) | |
#define HISTOGRAMRED(i) (gpHistogram[(i)].red) | |
@@ -9102,7 +9103,8 @@ int SetupReplaceColorInfo(obj_ptr, prci) | |
} | |
} | |
if (!found) { | |
- snprintf(gszMsgBox, sizeof(gszMsgBox), TgLoadString(STID_CANNOT_FIND_GOOD_TRANSPIX)); | |
+ strncpy(gszMsgBox, TgLoadString(STID_CANNOT_FIND_GOOD_TRANSPIX), sizeof(gszMsgBox)); | |
+ gszMsgBox[sizeof(gszMsgBox) - 1] = 0; | |
MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); | |
return FALSE; | |
} | |
@@ -9753,7 +9755,7 @@ void ToggleFloodReplaceColorThreshold() | |
fillReplaceBlueThresh); | |
Msg(gszMsgBox); | |
} else { | |
- sprintf(gszMsgBox, TgLoadString(STID_FLOOD_REPLACE_DISABLED)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_FLOOD_REPLACE_DISABLED)); | |
Msg(gszMsgBox); | |
} | |
} | |
--- tgif-QPL-4.2.5/import.c.format 2011-06-28 11:04:57.000000000 +0900 | |
+++ tgif-QPL-4.2.5/import.c 2013-12-04 11:08:17.558213212 +0900 | |
@@ -66,6 +66,7 @@ | |
#include "xbitmap.e" | |
#include "xpixmap.e" | |
#include "z_intrf.e" | |
+#include <string.h> | |
typedef struct ImportInfoRec { | |
char *name, *ext, *cmd; | |
@@ -2674,7 +2675,7 @@ void ImportGIFToXPixmapDeck() | |
memset(&ii, 0, sizeof(struct ImportInfoRec)); | |
/* pick an animated GIF file */ | |
- sprintf(szTop, TgLoadString(STID_SEL_ANIM_GIF_FILE_TO_IMPORT)); | |
+ strcpy(szTop, TgLoadString(STID_SEL_ANIM_GIF_FILE_TO_IMPORT)); | |
importingFile = TRUE; | |
*gif_fname = *tmp_fname = '\0'; | |
if (importFromLibrary) { | |
--- tgif-QPL-4.2.5/page.c.format 2011-06-28 11:04:58.000000000 +0900 | |
+++ tgif-QPL-4.2.5/page.c 2013-12-04 11:11:38.581459620 +0900 | |
@@ -62,6 +62,7 @@ | |
#include "xprtfltr.e" | |
#include "xbm/leftend.xbm" | |
+#include <string.h> | |
struct PageRec *firstPage=NULL, *lastPage=NULL, *curPage=NULL; | |
int curPageNum=1, lastPageNum=1; | |
@@ -1583,7 +1584,7 @@ void DeletePages() | |
if (spi.num_pages_specified == lastPageNum) { | |
MsgBox(TgLoadString(STID_CANT_DEL_ALL_PAGES), TOOL_NAME, INFO_MB); | |
} else if (spi.num_pages_specified > 0) { | |
- sprintf(gszMsgBox, TgLoadString(spi.num_pages_specified > 1 ? | |
+ strcpy(gszMsgBox, TgLoadString(spi.num_pages_specified > 1 ? | |
STID_DELETE_A_PAGE_CAUSE_FLUSH : | |
STID_DELETE_PAGES_PAGE_CAUSE_FLUSH)); | |
if (firstCmd == NULL || OkToFlushUndoBuffer(gszMsgBox)) { | |
--- tgif-QPL-4.2.5/pattern.c.format 2011-06-28 11:04:58.000000000 +0900 | |
+++ tgif-QPL-4.2.5/pattern.c 2013-12-04 11:14:00.603883545 +0900 | |
@@ -49,6 +49,7 @@ | |
#include "strtbl.e" | |
#include "text.e" | |
#include "util.e" | |
+#include <string.h> | |
int objFill=NONEPAT; | |
int transPat=FALSE; | |
@@ -1738,16 +1739,16 @@ void ChangeAllSelLineType(TypeIndex, Hig | |
*gszMsgBox = '\0'; | |
switch (curSpline) { | |
case LT_STRAIGHT: | |
- sprintf(gszMsgBox, TgLoadString(STID_LINE_TYPE_IS_STRAIGHT)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_LINE_TYPE_IS_STRAIGHT)); | |
break; | |
case LT_SPLINE: | |
- sprintf(gszMsgBox, TgLoadString(STID_LINE_TYPE_IS_SPLINE)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_LINE_TYPE_IS_SPLINE)); | |
break; | |
case LT_INTSPLINE: | |
- sprintf(gszMsgBox, TgLoadString(STID_LINE_TYPE_IS_INTSPLINE)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_LINE_TYPE_IS_INTSPLINE)); | |
break; | |
case LT_STRUCT_SPLINE: | |
- sprintf(gszMsgBox, TgLoadString(STID_LINE_TYPE_IS_STRUCT_SPLINE)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_LINE_TYPE_IS_STRUCT_SPLINE)); | |
break; | |
} | |
Msg(gszMsgBox); | |
@@ -2290,7 +2291,7 @@ TgMenu *CreateLineDashMenu(parent_menu, | |
item_info->menu_str = (char*)(Pixmap*)(&lineDashPixmap[i]); | |
item_info->shortcut_str = NULL; | |
if (i == 0) { | |
- sprintf(gszMsgBox, TgLoadCachedString(CSTID_SET_PEN_DASH_PAT_NO_DASH)); | |
+ strcpy(gszMsgBox, TgLoadCachedString(CSTID_SET_PEN_DASH_PAT_NO_DASH)); | |
} else { | |
sprintf(gszMsgBox, TgLoadCachedString(CSTID_SET_PEN_DASH_PAT_PAT_NUM), | |
i); | |
@@ -2507,13 +2508,13 @@ TgMenu *CreatePenMenu(parent_menu, x, y, | |
item_info->shortcut_str = NULL; | |
switch (i) { | |
case NONEPAT: | |
- sprintf(gszMsgBox, TgLoadCachedString(CSTID_SET_PEN_TO_NONE)); | |
+ strcpy(gszMsgBox, TgLoadCachedString(CSTID_SET_PEN_TO_NONE)); | |
break; | |
case SOLIDPAT: | |
- sprintf(gszMsgBox, TgLoadCachedString(CSTID_SET_PEN_TO_SOLID)); | |
+ strcpy(gszMsgBox, TgLoadCachedString(CSTID_SET_PEN_TO_SOLID)); | |
break; | |
case BACKPAT: | |
- sprintf(gszMsgBox, TgLoadCachedString(CSTID_SET_PEN_TO_BACKGROUND)); | |
+ strcpy(gszMsgBox, TgLoadCachedString(CSTID_SET_PEN_TO_BACKGROUND)); | |
break; | |
default: | |
sprintf(gszMsgBox, TgLoadCachedString(CSTID_SET_PEN_TO_PAT_NUM), i); | |
--- tgif-QPL-4.2.5/poly.c.format 2011-06-28 11:04:58.000000000 +0900 | |
+++ tgif-QPL-4.2.5/poly.c 2013-12-04 11:15:57.377387816 +0900 | |
@@ -57,6 +57,7 @@ | |
#include "strtbl.e" | |
#include "util.e" | |
#include "xpixmap.e" | |
+#include <stdio.h> | |
#define RETREAT (0.8) | |
@@ -5506,7 +5507,7 @@ void ReadPolyObj(FP, Inbuf, ObjPtr) | |
smooth[0] = smooth[num_pts-1] = FALSE; | |
SetFileModified(TRUE); | |
- sprintf(gszMsgBox, TgLoadCachedString(CSTID_BAD_SMOOTHHINGE_POLY_FIXED)); | |
+ strcpy(gszMsgBox, TgLoadCachedString(CSTID_BAD_SMOOTHHINGE_POLY_FIXED)); | |
if (PRTGIF) { | |
fprintf(stderr, "%s\n", gszMsgBox); | |
} else { | |
--- tgif-QPL-4.2.5/scroll.c.format 2011-06-28 11:04:58.000000000 +0900 | |
+++ tgif-QPL-4.2.5/scroll.c 2013-12-04 11:16:52.500762618 +0900 | |
@@ -45,6 +45,7 @@ | |
#include "util.e" | |
#include "xbm/scrl_up.xbm" | |
+#include <string.h> | |
#define FAKE_CM 80 | |
@@ -1559,13 +1560,13 @@ void ChangeScrollMode(ModeIndex) | |
switch (smoothScrollingCanvas) { | |
case SMOOTH_SCROLLING: | |
- sprintf(gszMsgBox, TgLoadString(STID_WILL_UPD_WIN_SMOOTH_SCROLL)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_WILL_UPD_WIN_SMOOTH_SCROLL)); | |
break; | |
case JUMP_SCROLLING: | |
- sprintf(gszMsgBox, TgLoadString(STID_WILL_UPD_WIN_JUMP_SCROLL)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_WILL_UPD_WIN_JUMP_SCROLL)); | |
break; | |
case NO_UPDATE_SCROLLING: | |
- sprintf(gszMsgBox, TgLoadString(STID_WILL_NOT_UPD_WIN_SCROLL)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_WILL_NOT_UPD_WIN_SCROLL)); | |
break; | |
} | |
Msg(gszMsgBox); | |
--- tgif-QPL-4.2.5/shape.c.format 2011-06-28 11:04:58.000000000 +0900 | |
+++ tgif-QPL-4.2.5/shape.c 2013-12-04 11:18:04.716114094 +0900 | |
@@ -56,6 +56,7 @@ | |
#include "strtbl.e" | |
#include "text.e" | |
#include "util.e" | |
+#include <string.h> | |
int numShapes=MAXSHAPES; | |
int curShape=(-1); | |
@@ -1111,7 +1112,7 @@ void CreateShape() | |
if ((objFill == NONEPAT || (objFill == BACKPAT && transPat)) && | |
(shapeShadowDx != 0 || shapeShadowDy != 0)) { | |
- sprintf(gszMsgBox, TgLoadString(objFill==NONEPAT ? | |
+ strcpy(gszMsgBox, TgLoadString(objFill==NONEPAT ? | |
STID_CREATE_SHADOW_SHAPE_NO_FILL : | |
STID_CREATE_SHADOW_SHAPE_TRAN_FILL)); | |
switch (MsgBox(gszMsgBox, TOOL_NAME, YNC_MB)) { | |
--- tgif-QPL-4.2.5/special.c.format 2011-06-28 11:04:58.000000000 +0900 | |
+++ tgif-QPL-4.2.5/special.c 2013-12-04 11:20:16.395342522 +0900 | |
@@ -70,6 +70,7 @@ | |
#include "util.e" | |
#include "version.e" | |
#include "wb.e" | |
+#include <string.h> | |
int placingTopObj=FALSE; | |
int connectingPortsByWire=FALSE; | |
@@ -1292,15 +1293,15 @@ void ConnectPortsToBroadcastWire() | |
if (*existing_signal_name == '\0') { | |
if (signal_name_diff) { | |
/* conflicting signal names */ | |
- sprintf(gszMsgBox, TgLoadString(STID_CONFLICT_SIG_NAME_ENT_NEW)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_CONFLICT_SIG_NAME_ENT_NEW)); | |
} else { | |
/* all ports have no signal names */ | |
- sprintf(gszMsgBox, TgLoadString(STID_PLS_ENT_SIG_NAME)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_PLS_ENT_SIG_NAME)); | |
} | |
} else { | |
UtilStrCpyN(new_signal_name, sizeof(new_signal_name), | |
existing_signal_name); | |
- sprintf(gszMsgBox, TgLoadString(STID_PLS_ENT_SIG_NAME)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_PLS_ENT_SIG_NAME)); | |
} | |
if (!(*new_signal_name != '\0' && already_has_broadcast_signal_name)) { | |
UtilTrimBlanks(new_signal_name); | |
@@ -3090,7 +3091,7 @@ void ExportToTable() | |
} | |
} | |
if (ok) { | |
- sprintf(&buf[cur_len], gszMsgBox); | |
+ strcpy(&buf[cur_len], gszMsgBox); | |
cur_len += len; | |
} | |
} | |
@@ -3127,7 +3128,7 @@ void ExportToTable() | |
void ToggleShowWireSignalName() | |
{ | |
showWireSignalName = !showWireSignalName; | |
- sprintf(gszMsgBox, TgLoadString(showWireSignalName ? | |
+ strcpy(gszMsgBox, TgLoadString(showWireSignalName ? | |
STID_WILL_SHOW_WIRE_SIGNAL_NAME : STID_WILL_HIDE_WIRE_SIGNAL_NAME)); | |
Msg(gszMsgBox); | |
} | |
--- tgif-QPL-4.2.5/stream.c.format 2011-06-28 11:04:59.000000000 +0900 | |
+++ tgif-QPL-4.2.5/stream.c 2013-12-04 11:22:15.267089935 +0900 | |
@@ -37,6 +37,7 @@ | |
#include "stream.e" | |
#include "strtbl.e" | |
#include "util.e" | |
+#include <string.h> | |
static int gnMultipartReplace=FALSE; | |
static int gnPossibleMultipartReplace=TRUE; | |
@@ -669,7 +670,7 @@ void FakeUserAgent(buf) | |
*prev_agent = '\0'; | |
GetUserAgent(prev_agent, sizeof(prev_agent)); | |
if (*prev_agent == '\0') { | |
- sprintf(gszMsgBox, TgLoadString(STID_ENTER_USERAGENT_FOR_HTTP)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_ENTER_USERAGENT_FOR_HTTP)); | |
} else { | |
sprintf(gszMsgBox, TgLoadString(STID_ENTER_USERAGENT_FOR_HTTP_CUR), | |
prev_agent); | |
@@ -685,7 +686,7 @@ void FakeUserAgent(buf) | |
*prev_agent = '\0'; | |
GetUserAgent(prev_agent, sizeof(prev_agent)); | |
if (*prev_agent == '\0') { | |
- sprintf(gszMsgBox, TgLoadString(STID_WILL_USE_DEF_USERAGENT_HTTP)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_WILL_USE_DEF_USERAGENT_HTTP)); | |
} else { | |
sprintf(gszMsgBox, TgLoadString(STID_WILL_USE_NAMED_USERAGENT_HTTP), | |
prev_agent); | |
@@ -708,7 +709,7 @@ void FakeReferer(buf) | |
if (len > 0 && spec[len-1] == ')') spec[len-1] = '\0'; | |
} else { | |
if (gpszFakedReferer == NULL) { | |
- sprintf(gszMsgBox, TgLoadString(STID_ENTER_REFERRER_FOR_HTTP)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_ENTER_REFERRER_FOR_HTTP)); | |
} else { | |
sprintf(gszMsgBox, TgLoadString(STID_ENTER_REFERRER_FOR_HTTP_CUR), | |
gpszFakedReferer); | |
@@ -727,7 +728,7 @@ void FakeReferer(buf) | |
UtilTrimBlanks(spec); | |
HttpFakeReferer(spec); | |
if (gpszFakedReferer == NULL) { | |
- sprintf(gszMsgBox, TgLoadString(STID_WILL_NOT_USE_REFERRER_HTTP)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_WILL_NOT_USE_REFERRER_HTTP)); | |
} else { | |
sprintf(gszMsgBox, TgLoadString(STID_WILL_USE_NAMED_REFERRER_HTTP), | |
gpszFakedReferer); | |
@@ -738,7 +739,7 @@ void FakeReferer(buf) | |
void ToggleKeepAlive() | |
{ | |
gnHttpKeepAlive = (!gnHttpKeepAlive); | |
- sprintf(gszMsgBox, TgLoadString(gnHttpKeepAlive ? | |
+ strcpy(gszMsgBox, TgLoadString(gnHttpKeepAlive ? | |
STID_WILL_USE_KEEP_ALIVE_HTTP : STID_NOT_WILL_USE_KEEP_ALIVE_HTTP)); | |
Msg(gszMsgBox); | |
} | |
--- tgif-QPL-4.2.5/text.c.format 2011-06-28 11:04:59.000000000 +0900 | |
+++ tgif-QPL-4.2.5/text.c 2013-12-04 11:26:06.450826454 +0900 | |
@@ -71,6 +71,7 @@ | |
#include "wb.e" | |
#include "xbitmap.e" | |
#include "xpixmap.e" | |
+#include <string.h> | |
#define ADVANCE_LEFT (TRUE) | |
#define ADVANCE_RIGHT (FALSE) | |
@@ -3749,9 +3750,9 @@ void HandleCopyInDrawTextMode() | |
copy_db_utf8_str && (double_byte_font_index != INVALID), NULL); | |
if (copy_failed) { | |
- sprintf(gszMsgBox, TgLoadString(STID_COPY_FAIL_SEL_STR_MAY_TOO_LNG)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_COPY_FAIL_SEL_STR_MAY_TOO_LNG)); | |
} else { | |
- sprintf(gszMsgBox, TgLoadString(STID_COPY_BUFFER_UPDATED)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_COPY_BUFFER_UPDATED)); | |
} | |
Msg(gszMsgBox); | |
free(cut_buffer); | |
--- tgif-QPL-4.2.5/tgcwdl.c.format 2011-06-28 11:04:59.000000000 +0900 | |
+++ tgif-QPL-4.2.5/tgcwdl.c 2013-12-04 11:23:05.576908258 +0900 | |
@@ -50,6 +50,7 @@ | |
#include "util.e" | |
#include "xbitmap.e" | |
#include "xpixmap.e" | |
+#include <string.h> | |
ColorWheelInfo gColorWheelInfo; | |
@@ -1727,7 +1728,7 @@ TidgetInfo *CreateTdgtColorWheelDialogBo | |
TidgetSetFocusWindow(None); | |
if (!colorDisplay || mainVisual->class != TrueColor) { | |
- sprintf(gszMsgBox, TgLoadString(STID_COLOR_WHEEL_NOT_AVAIL)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_COLOR_WHEEL_NOT_AVAIL)); | |
MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); | |
free(pcwdi); | |
return NULL; | |
--- tgif-QPL-4.2.5/tgisdl.c.format 2011-06-28 11:04:59.000000000 +0900 | |
+++ tgif-QPL-4.2.5/tgisdl.c 2013-12-04 11:24:56.618750303 +0900 | |
@@ -41,6 +41,7 @@ | |
#include "tidget.e" | |
#include "tgisdl.e" | |
#include "util.e" | |
+#include <string.h> | |
InsertSymbolInfo gInsertSymbolInfo; | |
@@ -808,7 +809,7 @@ TidgetInfo *CreateTdgtInsertSymbolDialog | |
TidgetSetFocusWindow(None); | |
if (!colorDisplay || mainVisual->class != TrueColor) { | |
- sprintf(gszMsgBox, TgLoadString(STID_COLOR_WHEEL_NOT_AVAIL)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_COLOR_WHEEL_NOT_AVAIL)); | |
MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); | |
free(pisdi); | |
return NULL; | |
--- tgif-QPL-4.2.5/wb.c.format 2011-06-28 11:04:59.000000000 +0900 | |
+++ tgif-QPL-4.2.5/wb.c 2013-12-04 11:27:33.957946515 +0900 | |
@@ -67,6 +67,7 @@ | |
#include "wb_seg.e" | |
#include "xpixmap.e" | |
#include "z_intrf.e" | |
+#include <stdio.h> | |
struct WhiteBoardRec gstWBInfo; | |
@@ -2283,7 +2284,7 @@ void UnpackCurrentTGWBState(p_cur_state) | |
*content_type = '\0'; | |
if (!GetContentInfoFromBuf(buf, content_type, sizeof(content_type), | |
&content_length, &buf_data_start)) { | |
- sprintf(gszMsgBox, TgLoadString(STID_JOIN_WB_IN_FAILED_NO_CONTTYPE)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_JOIN_WB_IN_FAILED_NO_CONTTYPE)); | |
MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); | |
return; | |
} | |
@@ -2512,7 +2513,7 @@ void UnpackCurrentTGWBState(p_cur_state) | |
gstWBInfo.join_session_in_progress = TRUE; | |
} else { | |
CleanUpWBCmds(); | |
- sprintf(gszMsgBox, TgLoadString(STID_JOIN_WB_IN_PROGRESS_FAILED)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_JOIN_WB_IN_PROGRESS_FAILED)); | |
MsgBox(gszMsgBox, TOOL_NAME, INFO_MB); | |
} | |
if (need_to_free_buf) UtilFree(buf); | |
--- tgif-QPL-4.2.5/xbitmap.c.format 2011-06-28 11:05:00.000000000 +0900 | |
+++ tgif-QPL-4.2.5/xbitmap.c 2013-12-04 11:29:31.527543277 +0900 | |
@@ -64,6 +64,7 @@ | |
#include "xpixmap.e" | |
#include "xprtfltr.e" | |
#include "z_intrf.e" | |
+#include <string.h> | |
GC xbmGC=NULL; | |
@@ -147,7 +148,7 @@ void SetHtmlExportTemplate() | |
char spec[MAXSTRING<<1]; | |
if (*gszHhtmlExportTemplate == '\0') { | |
- sprintf(gszMsgBox, TgLoadString(STID_ENTER_HTML_TEMPLATE)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_ENTER_HTML_TEMPLATE)); | |
} else { | |
sprintf(gszMsgBox, TgLoadString(STID_ENTER_HTML_TEMPLATE_CUR_IS), | |
gszHhtmlExportTemplate); | |
@@ -172,7 +173,7 @@ void SetHtmlExportTemplate() | |
} | |
UtilStrCpyN(gszHhtmlExportTemplate, sizeof(gszHhtmlExportTemplate), spec); | |
if (*gszHhtmlExportTemplate == '\0') { | |
- sprintf(gszMsgBox, TgLoadString(STID_NO_HTML_TEMPLATE_FILE)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_NO_HTML_TEMPLATE_FILE)); | |
} else { | |
sprintf(gszMsgBox, TgLoadString(STID_HTML_TEMPLATE_SET_TO_GIVEN), | |
gszHhtmlExportTemplate); | |
@@ -421,7 +422,7 @@ void ExportThresholdBitmap() | |
sprintf(gszMsgBox, TgLoadString(STID_WILL_USE_GIVE_SMPLE_THRESHOLD), | |
bitmapThresholdStr); | |
} else { | |
- sprintf(gszMsgBox, TgLoadString(STID_WILL_NOT_USE_SIMPLE_THRESHOLD)); | |
+ strcpy(gszMsgBox, TgLoadString(STID_WILL_NOT_USE_SIMPLE_THRESHOLD)); | |
} | |
Msg(gszMsgBox); | |
} | |
@@ -3153,7 +3154,7 @@ void GenerateTemplateHtmlVar(map_fp, var | |
} else if ((attr_ptr=FindFileAttrWithName("title=")) != NULL) { | |
fprintf(map_fp, "%s", attr_ptr->attr_value.s); | |
} else { | |
- fprintf(map_fp, TgLoadCachedString(CSTID_PARANED_UNKNOWN)); | |
+ fprintf(map_fp, "%s", TgLoadCachedString(CSTID_PARANED_UNKNOWN)); | |
} | |
break; | |
case TGV_MAP_WIDTH: fprintf(map_fp, "%1d", RbX-LtX); break; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -uNr tgif-QPL-4.2.5.orig/po/ja/Imakefile tgif-QPL-4.2.5/po/ja/Imakefile | |
--- tgif-QPL-4.2.5.orig/po/ja/Imakefile 2004-06-19 08:12:02.000000000 +0900 | |
+++ tgif-QPL-4.2.5/po/ja/Imakefile 2014-11-02 10:55:48.760326782 +0900 | |
@@ -28,6 +28,15 @@ | |
.SUFFIXES: .mo .po | |
.po.mo: | |
+ # convert EUC to JP | |
+ # test | |
+ iconv --from-code=EUC-JISX0213 --to-code=UTF-8 $< -o /dev/null | |
+ | |
+ mv $< $<.euc-backup | |
+ iconv --from-code=EUC-JISX0213 --to-code=UTF-8 -o $< $<.euc-backup | |
+ sed 's/charset=JISX-0208-1983-0/charset=UTF-8/' -i $< | |
+ | |
+ | |
msgfmt -o $@ $< | |
all:: $(CATALOGS) | |
diff -uNr tgif-QPL-4.2.5.orig/po/ja/tgif-wrapper.sh tgif-QPL-4.2.5/po/ja/tgif-wrapper.sh | |
--- tgif-QPL-4.2.5.orig/po/ja/tgif-wrapper.sh 2008-04-01 05:58:15.000000000 +0900 | |
+++ tgif-QPL-4.2.5/po/ja/tgif-wrapper.sh 1970-01-01 09:00:00.000000000 +0900 | |
@@ -1,8 +0,0 @@ | |
-#!/bin/bash | |
- | |
-if echo $LANG | grep -q ja_JP ; then | |
- export LANG=ja_JP.eucJP | |
-fi | |
- | |
-exec /usr/libexec/tgif $* | |
- | |
diff -uNr tgif-QPL-4.2.5.orig/po/ja/tgif.desktop tgif-QPL-4.2.5/po/ja/tgif.desktop | |
--- tgif-QPL-4.2.5.orig/po/ja/tgif.desktop 2008-04-01 05:58:15.000000000 +0900 | |
+++ tgif-QPL-4.2.5/po/ja/tgif.desktop 2014-11-02 10:59:41.733321896 +0900 | |
@@ -4,7 +4,7 @@ | |
Comment=2-D drawling tool | |
Comment[ja]=2次元ドãƒãƒ¼ã‚¤ãƒ³ã‚°ã‚½ãƒ•ãƒˆ | |
Exec=tgif %f | |
-Icon=tgif | |
+Icon=tgificon | |
Terminal=false | |
Type=Application | |
StartupNotify=false | |
--- tgif-QPL-4.2.5.orig/po/ja/Tgif.ad 2008-03-29 07:17:30.000000000 +0900 | |
+++ tgif-QPL-4.2.5/po/ja/Tgif.ad 2014-11-02 14:30:34.343056501 +0900 | |
@@ -6,11 +6,17 @@ | |
! Modified by Shoji Matsumoto <shom@vinelinux.org> | |
! Modified by Daisuke SUZUKI <daisuke@vinelinux.org> | |
-Tgif.MenuFontSet: -*-helvetica-medium-r-normal--12-*-*-*-*-*-*-*,-alias-*-medium-r-normal--12-*-*-*-*-*-*-* | |
-Tgif.BoldMsgFont: -*-helvetica-bold-r-normal--12-*-*-*-*-*-*-* | |
-Tgif.MsgFont: -*-helvetica-medium-r-normal--12-*-*-*-*-*-*-* | |
+Tgif.MenuFontSet: a14,k14,r14 | |
+Tgif.BoldMsgFont: -*-*-medium-r-normal--14-*-*-*-*-*-jisx0208.1983-*,-*-*-medium-r-normal--14-*-*-*-*-*-jisx0208.1976-*,-*-*-medium-r-normal--14-*-*-*-*-*-iso8859-* | |
+Tgif.BoldMsgFontSet: a14,k14,r14 | |
+Tgif.ItalicMsgFont: -*-*-medium-r-normal--14-*-*-*-*-*-jisx0208.1983-*,-*-*-medium-r-normal--14-*-*-*-*-*-jisx0208.1976-*,-*-*-medium-r-normal--14-*-*-*-*-*-iso8859-* | |
+Tgif.ItalicMsgFontSet: a14,k14,r14 | |
+Tgif.BoldItalicMsgFont: -*-*-medium-r-normal--14-*-*-*-*-*-jisx0208.1983-*,-*-*-medium-r-normal--14-*-*-*-*-*-jisx0208.1976-*,-*-*-medium-r-normal--14-*-*-*-*-*-iso8859-* | |
+Tgif.BoldItalicMsgFontSet: a14,k14,r14 | |
+Tgif.MsgFont: -*-*-medium-r-normal--14-*-*-*-*-*-jisx0208.1983-*,-*-*-medium-r-normal--14-*-*-*-*-*-jisx0208.1976-*,-*-*-medium-r-normal--14-*-*-*-*-*-iso8859-* | |
+Tgif.MsgFontSet: a14,k14,r14 | |
-Tgif.FontSizes: 8 9 10 11 12 13 14 15 16 17 18 20 24 32 34 36 40 44 60 70 100 200 250 300 | |
+Tgif.FontSizes: 8 9 10 11 12 13 14 15 16 17 18 20 24 32 34 36 40 44 60 70 100 200 250 300 | |
Tgif.DefaultSingleByteFont: Helvetica | |
Tgif.AdditionalFonts: \n\ | |
@@ -21,81 +27,32 @@ | |
Tgif.ZapfChanceryShowFontChar: ZC | |
+!-*-mincho-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,Ryumin-Light-EUC-H\n\ | |
+!-*-mincho-bold-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,Ryumin-Light-EUC-H\n\ | |
+!-*-mincho-medium-i-*--%d-*-*-*-*-*-jisx0208.1983-*,H,Ryumin-Italic-EUC-H\n\ | |
+!-*-mincho-bold-i-*--%d-*-*-*-*-*-jisx0208.1983-*,H,Ryumin-Italic-EUC-H\n\ | |
+!\n\ | |
+ | |
Tgif.SquareDoubleByteFonts: \n\ | |
--alias-mincho-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,Ryumin-Light-EUC-H\n\ | |
--alias-mincho-bold-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,Ryumin-Light-EUC-H\n\ | |
--alias-mincho-medium-i-*--%d-*-*-*-*-*-jisx0208.1983-*,H,Ryumin-Italic-EUC-H\n\ | |
--alias-mincho-bold-i-*--%d-*-*-*-*-*-jisx0208.1983-*,H,Ryumin-Italic-EUC-H\n\ | |
-\n\ | |
--alias-gothic-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,GothicBBB-Medium-EUC-H\n\ | |
--alias-gothic-bold-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,GothicBBB-Medium-EUC-H\n\ | |
--alias-gothic-medium-i-*--%d-*-*-*-*-*-jisx0208.1983-*,H,GothicBBB-Italic-EUC-H\n\ | |
--alias-gothic-bold-i-*--%d-*-*-*-*-*-jisx0208.1983-*,H,GothicBBB-Italic-EUC-H\n\ | |
-\n\ | |
--alias-mincho-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,V,Ryumin-Light-EUC-V\n\ | |
--alias-mincho-bold-r-*--%d-*-*-*-*-*-jisx0208.1983-*,V,Ryumin-Light-EUC-V\n\ | |
--alias-mincho-medium-i-*--%d-*-*-*-*-*-jisx0208.1983-*,V,Ryumin-Light-EUC-V\n\ | |
--alias-mincho-bold-i-*--%d-*-*-*-*-*-jisx0208.1983-*,V,Ryumin-Light-EUC-V\n\ | |
-\n\ | |
--alias-gothic-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,V,GothicBBB-Medium-EUC-V\n\ | |
--alias-gothic-bold-r-*--%d-*-*-*-*-*-jisx0208.1983-*,V,GothicBBB-Medium-EUC-V\n\ | |
--alias-gothic-medium-i-*--%d-*-*-*-*-*-jisx0208.1983-*,V,GothicBBB-Italic-EUC-V\n\ | |
--alias-gothic-bold-i-*--%d-*-*-*-*-*-jisx0208.1983-*,V,GothicBBB-Italic-EUC-V\n\ | |
-\n\ | |
--ricoh-lx marugothic-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,LX-MaruGothic--Regular-EUC-H\n\ | |
--ricoh-lx marugothic-bold-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,LX-MaruGothic--Regular-EUC-H\n\ | |
--ricoh-lx marugothic-medium-i-*--%d-*-*-*-*-*-jisx0208.1983-*,H,LX-MaruGothic--Italic-EUC-H\n\ | |
--ricoh-lx marugothic-bold-i-*--%d-*-*-*-*-*-jisx0208.1983-*,H,LX-MaruGothic--Italic-EUC-H\n\ | |
-\n\ | |
--ricoh-lx pop-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,LX-POP--Regular-EUC-H\n\ | |
--ricoh-lx pop-bold-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,LX-POP--Regular-EUC-H\n\ | |
--ricoh-lx pop-medium-i-*--%d-*-*-*-*-*-jisx0208.1983-*,H,LX-POP--Italic-EUC-H\n\ | |
--ricoh-lx pop-bold-i-*--%d-*-*-*-*-*-jisx0208.1983-*,H,LX-POP--Italic-EUC-H\n\ | |
-\n\ | |
--ricoh-lx gothic ub-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,LX-Gothic-UB--Regular-EUC-H\n\ | |
--ricoh-lx gothic ub-bold-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,LX-Gothic-UB--Regular-EUC-H\n\ | |
--ricoh-lx gothic ub-medium-i-*--%d-*-*-*-*-*-jisx0208.1983-*,H,LX-Gothic-UB--Italic-EUC-H\n\ | |
--ricoh-lx gothic ub-bold-i-*--%d-*-*-*-*-*-jisx0208.1983-*,H,LX-Gothic-UB--Italic-EUC-H\n\ | |
-\n\ | |
--ricoh-lx marugothic-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,V,LX-MaruGothic--Regular-EUC-V\n\ | |
--ricoh-lx marugothic-bold-r-*--%d-*-*-*-*-*-jisx0208.1983-*,V,LX-MaruGothic--Regular-EUC-V\n\ | |
--ricoh-lx marugothic-medium-i-*--%d-*-*-*-*-*-jisx0208.1983-*,V,LX-MaruGothic--Italic-EUC-V\n\ | |
--ricoh-lx marugothic-bold-i-*--%d-*-*-*-*-*-jisx0208.1983-*,V,LX-MaruGothic--Italic-EUC-V\n\ | |
-\n\ | |
--ricoh-lx pop-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,V,LX-POP--Regular-EUC-V\n\ | |
--ricoh-lx pop-bold-r-*--%d-*-*-*-*-*-jisx0208.1983-*,V,LX-POP--Regular-EUC-V\n\ | |
--ricoh-lx pop-medium-i-*--%d-*-*-*-*-*-jisx0208.1983-*,V,LX-POP--Italic-EUC-V\n\ | |
--ricoh-lx pop-bold-i-*--%d-*-*-*-*-*-jisx0208.1983-*,V,LX-POP--Italic-EUC-V\n\ | |
-\n\ | |
--ricoh-lx gothic ub-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,V,LX-Gothic-UB--Regular-EUC-V\n\ | |
--ricoh-lx gothic ub-bold-r-*--%d-*-*-*-*-*-jisx0208.1983-*,V,LX-Gothic-UB--Regular-EUC-V\n\ | |
--ricoh-lx gothic ub-medium-i-*--%d-*-*-*-*-*-jisx0208.1983-*,V,LX-Gothic-UB--Italic-EUC-V\n\ | |
--ricoh-lx gothic ub-bold-i-*--%d-*-*-*-*-*-jisx0208.1983-*,V,LX-Gothic-UB--Italic-EUC-V\n\ | |
-\n\ | |
--dynalab-dfmincho ub-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,DF-Mincho-UB--Regular-EUC-H\n\ | |
--dynalab-dfmincho ub-bold-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,DF-Mincho-UB--Regular-EUC-H\n\ | |
--dynalab-dfmincho ub-medium-i-*--%d-*-*-*-*-*-jisx0208.1983-*,H,DF-Mincho-ubUB--Italic-EUC-H\n\ | |
--dynalab-dfmincho ub-bold-i-*--%d-*-*-*-*-*-jisx0208.1983-*,H,DF-Mincho-UB--Italic-EUC-H\n\ | |
-\n\ | |
--dynalab-dfkaisho sb-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,DF-Kaisho-Bd--Regular-EUC-H\n\ | |
--dynalab-dfkaisho sb-bold-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,DF-Kaisho-Bd--Regular-EUC-H\n\ | |
--dynalab-dfkaisho sb-medium-i-*--%d-*-*-*-*-*-jisx0208.1983-*,H,DF-Kaisho-Bd--Italic-EUC-H\n\ | |
--dynalab-dfkaisho sb-bold-i-*--%d-*-*-*-*-*-jisx0208.1983-*,H,DF-Kaisho-Bd--Italic-EUC-H\n\ | |
-\n\ | |
--dynalab-dfpopstencil w7-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,DF-POPStencil-W7--Regular-EUC-H\n\ | |
--dynalab-dfpopstencil w7-bold-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,DF-POPStencil-W7--Regular-EUC-H\n\ | |
--dynalab-dfpopstencil w7-medium-i-*--%d-*-*-*-*-*-jisx0208.1983-*,H,DF-POPStencil-W7--Italic-EUC-H\n\ | |
--dynalab-dfpopstencil w7-bold-i-*--%d-*-*-*-*-*-jisx0208.1983-*,H,DF-POPStencil-W7--Italic-EUC-H\n\ | |
-\n\ | |
--dynalab-dfbrushrd w7-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,DF-BrushRD-W7--Regular-EUC-H\n\ | |
--dynalab-dfbrushrd w7-bold-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,DF-BrushRD-W7--Regular-EUC-H\n\ | |
--dynalab-dfbrushrd w7-medium-i-*--%d-*-*-*-*-*-jisx0208.1983-*,H,DF-BrushRD-W7--Italic-EUC-H\n\ | |
--dynalab-dfbrushrd w7-bold-i-*--%d-*-*-*-*-*-jisx0208.1983-*,H,DF-BrushRD-W7--Italic-EUC-H\n\ | |
-\n\ | |
--dynalab-dffreeryuyou lt-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,DF-FreeRyuyou-Lt--Regular-EUC-H\n\ | |
--dynalab-dffreeryuyou lt-bold-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,DF-FreeRyuyou-Lt--Regular-EUC-H\n\ | |
--dynalab-dffreeryuyou lt-medium-i-*--%d-*-*-*-*-*-jisx0208.1983-*,H,DF-FreeRyuyou-Lt--Italic-EUC-H\n\ | |
--dynalab-dffreeryuyou lt-bold-i-*--%d-*-*-*-*-*-jisx0208.1983-*,H,DF-FreeRyuyou-Lt--Italic-EUC-H\n\ | |
+-*-fixed-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,Ryumin-Light-EUC-H\n\ | |
+-*-fixed-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,Ryumin-Light-EUC-H\n\ | |
+-*-fixed-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,Ryumin-Light-EUC-H\n\ | |
+-*-fixed-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,Ryumin-Light-EUC-H\n\ | |
+\n\ | |
+-*-fixed-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,GothicBBB-Medium-EUC-H\n\ | |
+-*-fixed-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,GothicBBB-Medium-EUC-H\n\ | |
+-*-fixed-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,GothicBBB-Medium-EUC-H\n\ | |
+-*-fixed-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,H,GothicBBB-Medium-EUC-H\n\ | |
+\n\ | |
+-*-fixed-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,V,Ryumin-Light-EUC-V\n\ | |
+-*-fixed-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,V,Ryumin-Light-EUC-V\n\ | |
+-*-fixed-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,V,Ryumin-Light-EUC-V\n\ | |
+-*-fixed-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,V,Ryumin-Light-EUC-V\n\ | |
+\n\ | |
+-*-fixed-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,V,GothicBBB-Medium-EUC-V\n\ | |
+-*-fixed-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,V,GothicBBB-Medium-EUC-V\n\ | |
+-*-fixed-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,V,GothicBBB-Medium-EUC-V\n\ | |
+-*-fixed-medium-r-*--%d-*-*-*-*-*-jisx0208.1983-*,V,GothicBBB-Medium-EUC-V | |
!Tgif.DoubleByteInputMethod: kinput2 | |
Tgif.DoubleByteInputMethod: xim | |
@@ -103,7 +60,8 @@ | |
Tgif.UseNKF: true | |
Tgif.CopyAndPasteJIS: true | |
-Tgif.PreeditType: overthespot | |
-Tgif.Lang: ja_JP.eucJP | |
+!Tgif.PreeditType: overthespot | |
+!Tgif.Lang: ja_JP.eucJP | |
+Tgif.Lang: ja_JP.UTF-8 | |
Tgif.ConvSelection: JAPANESE_CONVERSION | |
Tgif.IconPixmap: /usr/share/tgif/tgificon.xpm | |
@@ -114,19 +72,5 @@ | |
Tgif.GridSystem: Metric | |
Tgif.InitialFont: Ryumin | |
-Tgif.RyuminShowFontChar: ÌÀ | |
-Tgif.GothicBBBShowFontChar: ³Ñ | |
- | |
-Tgif.DFPOPShowFontChar: £Ä¥Ý | |
-Tgif.DFGyoShoShowFontChar: £Ä¹Ô | |
-Tgif.DFLeiShoShowFontChar: £ÄÎì | |
- | |
-Tgif.LX-POPShowFontChar: £Ì¥Ý | |
-Tgif.LX-Gothic-UBShowFontChar: £Ì¥´ | |
-Tgif.LX-MaruGothicShowFontChar: £Ì´Ý | |
- | |
-Tgif.DF-Mincho-UBShowFontChar: ÂÀÌÀ | |
-Tgif.DF-Kaisho-BdShowFontChar: Ü´ | |
-Tgif.DF-POPStencil-W7ShowFontChar: ¥Ý¥¹ | |
-Tgif.DF-BrushRD-W7ShowFontChar: ¥ÖRD | |
-Tgif.DF-FreeRyuyou-LtShowFontChar: ήÍÕ | |
+Tgif.RyuminShowFontChar: \244\242 | |
+Tgif.GothicBBBShowFontChar: \263\321 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- font.c.a-urasim 2006-04-22 21:47:42.000000000 +0900 | |
+++ font.c 2006-04-22 21:48:34.000000000 +0900 | |
@@ -975,10 +975,10 @@ | |
(nOdd || ((*psz)&0x80) == nDoubleByte); | |
psz++, nSubStrIndex++) { | |
if (nOdd) { | |
- gpszTmpStr16[nDoubleByteIndex].byte2 = (unsigned char)(*psz); | |
+ gpszTmpStr16[nDoubleByteIndex].byte2 = (unsigned char)(*psz) & 0x7f; | |
nDoubleByteIndex++; | |
} else { | |
- gpszTmpStr16[nDoubleByteIndex].byte1 = (unsigned char)(*psz); | |
+ gpszTmpStr16[nDoubleByteIndex].byte1 = (unsigned char)(*psz) & 0x7f; | |
} | |
nOdd = !nOdd; | |
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Name: tgif | |
Version: 4.2.5 | |
Release: 8t1%{?dist} | |
Summary: 2-D drawing tool | |
Group: Applications/Multimedia | |
License: QPL | |
URL: http://bourbon.usc.edu/tgif/ | |
Source0: http://downloads.sourceforge.net/%{name}/%{name}-QPL-%{version}.tar.gz | |
Patch1: ftp://bourbon.usc.edu/pub/tgif/patches/tgif-QPL-4.2-patch5a.gz | |
Patch2: ftp://bourbon.usc.edu/pub/tgif/patches/tgif-QPL-4.2-patch5b.gz | |
# http://tyche.pu-toyama.ac.jp/~a-urasim/tgif/ | |
Patch10: tgif-textcursor-a-urasim.patch | |
# Check below later | |
Patch101: tgif-QPL-4.1.45-size-debug.patch | |
Patch102: tgif-QPL-4.2.5-format-security.patch | |
Patch200: tgif-4.2.5-utf8dirtyhack2.patch | |
Patch201: tgif-QPL-4.2.5-po-ja.patch | |
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n) | |
BuildRequires: imake | |
BuildRequires: desktop-file-utils | |
BuildRequires: gettext | |
BuildRequires: libXmu-devel | |
BuildRequires: libidn-devel | |
BuildRequires: zlib-devel | |
Requires: ghostscript | |
Requires: netpbm-progs | |
Requires: xorg-x11-fonts-75dpi | |
Requires: xorg-x11-fonts-ISO8859-1-75dpi | |
%description | |
Tgif - Xlib based interactive 2-D drawing facility under | |
X11. Supports hierarchical construction of drawings and | |
easy navigation between sets of drawings. It's also a | |
hyper-graphics (or hyper-structured-graphics) browser on | |
the World-Wide-Web. | |
%prep | |
%setup -q -n %{name}-QPL-%{version} | |
%patch1 -p0 -b .patch5a | |
%patch2 -p0 -b .patch5b | |
# Upstream says the below is wrong, for now dropping | |
#%%patch10 -p0 -b textcursor | |
# Check later | |
#%%patch101 -p1 -b .size | |
%patch102 -p1 -b .format | |
%patch200 -p1 -b .utf8dirtyhack2 | |
%patch201 -p1 -b .po-ja | |
# Fix installation path for icon files | |
%{__sed} -i.path \ | |
-e '/InstallNonExec.*hicolor/s|\$(TGIFDIR)|\$(DATADIR)/icons/|' \ | |
-e '/MakeDirectories.*hicolor/s|\$(TGIFDIR)|\$(DATADIR)/icons/|' \ | |
Imakefile | |
%build | |
%{__cp} -pf Tgif.tmpl-linux Tgif.tmpl | |
%{__sed} -i.mode -e 's|0664|0644|' Tgif.tmpl | |
xmkmf | |
%{__sed} -i.mode -e 's|0444|0644|' Makefile | |
DEFOPTS='-DOVERTHESPOT -DUSE_XT_INITIALIZE -D_ENABLE_NLS -DPRINT_CMD=\"lpr\" -DA4PAPER -DTGIF_DBG' | |
%{__make} %{?_smp_mflags} \ | |
CC="%{__cc} %{optflags}" \ | |
MOREDEFINES="$DEFOPTS" \ | |
TGIFDIR=%{_datadir}/tgif/ \ | |
LOCAL_LIBRARIES="-lXmu -lXt -lX11" \ | |
tgif | |
pushd po | |
xmkmf | |
%{__sed} -i.mode -e 's|0444|0644|' Makefile | |
%{__make} \ | |
Makefile \ | |
Makefiles \ | |
depend \ | |
all | |
popd | |
%install | |
%{__rm} -rf $RPM_BUILD_ROOT/ | |
%{__make} \ | |
DESTDIR=$RPM_BUILD_ROOT/ \ | |
BINDIR=%{_bindir}/ \ | |
TGIFDIR=%{_datadir}/tgif/ \ | |
INSTALLFLAGS="-cp" \ | |
DATADIR=%{_datadir} \ | |
install \ | |
install.man | |
%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/tgif/*.obj | |
%{__install} -cpm 0644 *.obj \ | |
$RPM_BUILD_ROOT%{_datadir}/tgif/ | |
# Japanese specific | |
%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/X11/ja/app-defaults/ | |
%{__install} -cpm 0644 \ | |
po/ja/Tgif.ad \ | |
$RPM_BUILD_ROOT%{_datadir}/X11/ja/app-defaults/Tgif | |
pushd po | |
%{__make} \ | |
DESTDIR=$RPM_BUILD_ROOT/ \ | |
INSTALLFLAGS="-cp" \ | |
install | |
popd | |
# desktop file & icon | |
%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications/ | |
desktop-file-install \ | |
--remove-category 'Application' \ | |
--remove-category 'X-Fedora' \ | |
%if 0%{?fedora} < 19 | |
--vendor 'fedora' \ | |
%endif | |
--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \ | |
po/ja/tgif.desktop | |
%{find_lang} tgif | |
%clean | |
%{__rm} -rf $RPM_BUILD_ROOT/ | |
%post | |
touch --no-create %{_datadir}/icons/hicolor | |
update-desktop-database -q %{_datadir}/applications/ | |
exit 0 | |
%postun | |
update-desktop-database -q %{_datadir}/applications/ | |
[ $1 -eq 0 ] || exit 0 | |
touch --no-create %{_datadir}/icons/hicolor | |
gtk-update-icon-cache -q %{_datadir}/icons/hicolor | |
exit 0 | |
%posttrans | |
gtk-update-icon-cache -q %{_datadir}/icons/hicolor | |
exit 0 | |
%files -f %{name}.lang | |
%defattr(-,root,root,-) | |
%doc AUTHORS | |
%doc ChangeLog | |
%doc Copyright | |
%doc HISTORY | |
%doc LICENSE.QPL | |
%doc README* | |
%doc VMS_MAKE_TGIF.COM | |
%doc example.tex | |
%doc po/ja/README.jp | |
%{_bindir}/%{name} | |
%{_mandir}/man1/%{name}.1x* | |
%{_datadir}/%{name}/ | |
# Currently no package owns the following directories | |
%dir %{_datadir}/X11/ja/ | |
%dir %{_datadir}/X11/ja/app-defaults/ | |
%{_datadir}/X11/ja/app-defaults/Tgif | |
%{_datadir}/icons/hicolor/*/apps/%{name}icon.png | |
%{_datadir}/applications/*%{name}.desktop | |
%changelog | |
* Sun Nov 02 2014 cat_in_136 - 4.2.5-8t1 | |
- Bug fix (Patch5a and Patch5b). | |
- UTF-8 japanese experimental build | |
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.5-8 | |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild | |
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.5-7 | |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild | |
* Wed Dec 4 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.2.5-6 | |
- Support -Werror=format-security | |
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.5-5 | |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild | |
* Sat Feb 9 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.2.5-4 | |
- F-19: kill vendorization of desktop file (fpc#247) | |
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.5-3 | |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild | |
* Thu Jan 5 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 4.2.5-2 | |
- F-17: rebuild against gcc47 | |
* Thu Jun 30 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 4.2.5-1 | |
- 4.2.5 | |
* Sun Jun 26 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 4.2.4-1 | |
- 4.2.4 | |
* Wed Jun 01 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 4.2.3-1 | |
- 4.2.3 | |
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.2-2 | |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild | |
* Sat Nov 21 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 4.2.2-1 | |
- 4.2.2 | |
* Thu Oct 15 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 4.2.1-1 | |
- Bug fix release 4.2.1 | |
* Thu Oct 8 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 4.2-1 | |
- Update to 4.2 | |
* Almost all patches/sources/etc in Fedora rpms (actually borrowed | |
from Vine Project) were applied upstream | |
* Stop to apply 1 left patch for now | |
* 1 patch does not apply, check later | |
* Sat Jul 25 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 4.1.45-10 | |
- F-12: Mass rebuild | |
* Tue Feb 24 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 4.1.45-9 | |
- F-11: Mass rebuild | |
* Sat Nov 15 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 4.1.45-8 | |
- Add fonts Requirement against xorg-x11-fonts-ISO8859-1-75dpi | |
* Fri Aug 29 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 4.1.45-7 | |
- Fuzz up | |
* Mon Mar 17 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 4.1.45-6 | |
- Require xorg-x11-fonts-75dpi | |
- Try to clean up size difference | |
- Don't ship Japanese related Tgif.ad for non Japanese | |
locale (may fix bug 436644, 427806?) | |
* Sat Feb 9 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> | |
- Rebuild against gcc43 (F-9) | |
* Wed Aug 22 2007 TASAKA Mamoru <mtasaka@ioa.s.u-tokyo.ac.jp> - 4.1.45-5 | |
- Set mode explicitly when open(2) is used with O_CREAT | |
due to recent glibc change | |
* Wed Aug 22 2007 TASAKA Mamoru <mtasaka@ioa.s.u-tokyo.ac.jp> - 4.1.45-4.dist.1 | |
- Mass rebuild (buildID or binutils issue) | |
* Wed Jul 11 2007 MATSUURA Takanori <t.matsuu at gmail.com> - 4.1.45-4 | |
- based on tgif-4.1.44-0vl6.src.rpm from VineSeed main | |
- use scalable bitmap font | |
* Mon Jul 9 2007 TASAKA Mamoru <mtasaka@ioa.s.u-tokyo.ac.jp> - 4.1.45-3 | |
- Clean up BuildRequires | |
* Thu Jul 5 2007 TASAKA Mamoru <mtasaka@ioa.s.u-tokyo.ac.jp> - 4.1.45-2 | |
- Explicitly set LANG=ja_JP.eucJP on ja_JP locale | |
- Add needed Requires | |
* Thu Jul 5 2007 TASAKA Mamoru <mtasaka@ioa.s.u-tokyo.ac.jp> - 4.1.45-1 | |
- Clean up for Fedora | |
* Sat Apr 07 2007 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 4.1.44-0vl6 | |
- add Patch20 to fix problems with {scim,uim}-anthy (<BTS:512>) | |
* Thu Jan 4 2007 MATSUURA Takanori <t.matsuu at gmail.com> - 4.1.45-0vl5.1 | |
- based on tgif-4.1.44-0vl5.src.rpm from VineSeed main | |
- update to 4.1.45 | |
- some ajustments for Fedora Core | |
* Wed Dec 27 2006 KAZUKI SHIMURA <kazuki@ma.ccnw.ne.jp> 4.1.44-0vl5 | |
- add tgificon.png (source4) | |
- update tgif.desktop (source3) | |
* Wed Oct 11 2006 Daisuke SUZUKI <daisuke@linux.or.jp> 4.1.44-0vl4 | |
- add Patch10 to fix text cursor problem (<BTS:250>) | |
http://tyche.pu-toyama.ac.jp/~a-urasim/tgif/ | |
* Fri Sep 08 2006 KAZUKI SHIMURA <kazuki@ma.ccnw.ne.jp> 4.1.44-0vl3 | |
- add and update desktop file (source3) | |
- move desktop file to %%{_datadir}/applications | |
- exec update-desktop-database at %%post,%%postun | |
- add Requires(post,postun): desktop-file-utils | |
* Sat Sep 02 2006 KAZUKI SHIMURA <kazuki@ma.ccnw.ne.jp> 4.1.44-0vl2 | |
- add BuildRequires: XOrg-devel | |
* Mon Jan 17 2005 Daisuke SUZUKI <daisuke@linux.or.jp> 4.1.44-0vl1 | |
- switch to QPL version | |
* Thu Jun 10 2004 KOBAYASHI R. Taizo <tkoba@vinelinux.org> 4.1.43-0vl1 | |
- source update | |
* Thu Jun 12 2003 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.1.42-0vl2 | |
- rebuild with new toolchains | |
* Fri Mar 29 2002 Jun Nishii <jun@vinelinux.org> 4.1.41-0vl3 | |
- add Tate-gaki entry for Ricoh fonts | |
* Sun Mar 17 2002 Shoji Matsumoto <shom@vinelinux.org> 4.1.41-0vl2 | |
- refine Tgif.ad for Vine 2.5 | |
* Fri Oct 19 2001 Jun Nishii <jun@vinelinux.org> 4.1.41-0vl1 | |
- ver.up | |
* Thu Jul 28 2001 Shoji Matsumoto <shom@vinelinux.org> | |
- 4.1.40-0vl2 | |
- tgif-4.1ja6 (-aliastt-{mincho,gothic}- -> -alias-{mincho,gothic}-) | |
* Thu Dec 7 2000 Jun Nishii <jun@vinelinux.org> | |
- 4.1.40-0vl1 | |
* Tue Oct 3 2000 Jun Nishii <jun@vinelinux.org> | |
- 4.1.39-0vl2 | |
- added documents | |
* Sun Sep 10 2000 Jun Nishii <jun@vinelinux.org> | |
- 4.1.39-0vl1 | |
* Thu Aug 17 2000 Yasuyuki Furukawa <furukawa@vinelinux.org> | |
- added overthespot_fix patch for XIM with OverTheSpot style. | |
* Fri Aug 11 2000 Jun Nishii <jun@vinelinux.org> | |
- 4.1.36-0vl1 | |
* Mon Aug 7 2000 Jun Nishii <jun@vinelinux.org> | |
- 4.1.35-0vl1 | |
* Sat Jul 15 2000 MATSUBAYASHI 'Shaolin' Kohji <shaolin@rhythmaning.org> | |
- 4.1.34-0vl2 | |
- modified %%files section to handle compressed man page | |
* Mon May 8 2000 Jun Nishii <jun@vinelinux.org> | |
- updated 4.0.33 | |
* Thu Apr 20 2000 Yasuyuki Furukawa <furukawa@vinelinux.org> | |
- updated 4.0.29 | |
- modified fontcheck patch to check signgle byte font, too. | |
* Thu Mar 9 2000 Yasuyuki Furukawa <furukawa@vinelinux.org> | |
- updated 4.0.28 | |
* Mon Feb 28 2000 Yasuyuki Furukawa <furukawa@vinelinux.org> | |
- updated 4.0.27 | |
* Thu Feb 24 2000 Yasuyuki Furukawa <furukawa@vinelinux.org> | |
- added tgif wmconfig, desktop file | |
* Fri Feb 18 2000 Yasuyuki Furukawa <furukawa@vinelinux.org> | |
- added xim unofficial patch from fj.sources to fix a bug about XIM. | |
* Wed Feb 16 2000 Jun Nishii <jun@vinelinux.org> | |
- 4.1.26-0vl3 | |
- bug fix in tgif-4.1.26-fontcheck.patch | |
* Mon Feb 14 2000 Jun Nishii <jun@vinelinux.org> | |
- 4.1.26-0vl2 | |
- merge tgif-4.1.26-fontcheck.patch by Mr. Yasuyuki Furukawa | |
which obsoletes trigger for Dynafonts and TrueTypeFonts ! | |
* Thu Jan 20 2000 Jun Nishii <jun@vinelinux.org> | |
- 4.1.26-0vl2 | |
- added trigger for Dynafonts and TrueTypeFonts | |
* Thu Jan 20 2000 Yasuyuki Furukawa <furukawa@vinelinux.org> | |
- updated to 4.1.26 | |
- change ja resource from ja_JP.ujis/app-defaults to ja/app-defaults | |
- modified font setting | |
* Wed Nov 17 1999 Jun Nishii <jun@flatout.org> | |
- updated to 4.1.25 | |
* Thu Nov 4 1999 Jun Nishii <jun@flatout.org> | |
- updated to 4.1.23 | |
* Thu Oct 28 1999 Jun Nishii <jun@flatout.org> | |
- rel.4 | |
- update ja.po | |
- more gettextize in choice.c and menu.c | |
* Wed Oct 27 1999 Jun Nishii <jun@flatout.org> | |
- rel.3 | |
- merge messages in strtbl.c and added japanese catalog | |
* Tue Oct 26 1999 Jun Nishii <jun@flatout.org> | |
- rel.2 | |
- enable nls in status buffer and added japanese catalog | |
* Tue Oct 26 1999 Jun Nishii <jun@flatout.org> | |
- updated to 4.1.22 | |
* Sun Aug 8 1999 Norihito Ohmori <ohmori@flatout.org> | |
- archive format change to bzip2 | |
- rebuild for glibc-2.1.x | |
* Wed Jun 30 1999 Jun Nishii <jun@flatout.org> | |
- updated to 4.1.16 | |
* Tue Apr 15 1999 Jun Nishii <jun@flatout.org> | |
- updated to 4.1.7 | |
* Tue Apr 8 1999 Jun Nishii <jun@flatout.org> | |
- updated to 4.1.6 | |
- Our menufontset-nls patch and xim patch were merged in original source! | |
* Tue Mar 9 1999 MATSUMOTO Shoji <vine@flatout.org> | |
- vertical font indicator bug fix | |
- modify resource and tgif.sh | |
* Mon Mar 8 1999 Jun Nishii <jun@flatout.org> | |
- updated to 4.1 | |
* Mon Mar 8 1999 Jun Nishii <jun@flatout.org> | |
- bug fix in showing shortcut key in menu | |
- modify document | |
* Wed Mar 4 1999 MATSUMOTO Shoji <vine@flatout.org> | |
- set Tgif.InitialFont Ryumin | |
* Wed Mar 3 1999 MATSUMOTO Shoji <vine@flatout.org> | |
- add XIM OverTheSpot patch | |
- modify Tgif-ja.ad | |
* Mon Mar 2 1999 Jun Nishii <jun@flatout.org> | |
- updated to 4.0.18 | |
* Mon Mar 1 1999 Jun Nishii <jun@flatout.org> | |
- make patch to support fontset and nls | |
- change version name as 4.0.17_jp | |
* Sat Feb 27 1999 Jun Nishii <jun@flatout.org> | |
- modify Tgif-ja.ad (use A4,cm,color-icon,etc...) | |
- correct document | |
* Wed Feb 24 1999 Jun Nishii <jun@flatout.org> | |
- updated to ver. 4.0.17 | |
- make wrapper to read Tgif-ja | |
* Sat Feb 20 1999 Jun Nishii <jun@flatout.org> | |
- updated to ver. 4.0.16 | |
* Tue Feb 16 1999 Jun Nishii <jun@flatout.org> | |
- build ver. 4.0.14 for Vine Linux |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment