Author: hbelusca
Date: Thu Dec 5 01:00:49 2013
New Revision: 61226
URL: http://svn.reactos.org/svn/reactos?rev=61226&view=rev
Log:
[VGAFONTEDIT]
- Convert resource file in the Amine way ;)
- Remove legacy .rbuild file.
- Just start to introduce cpi.h header for future support of CPI font files.
- Split up precompiled header into raw, psf and cpi headers for each supported
font format.
Added:
trunk/rosapps/applications/devutils/vgafontedit/cpi.h (with props)
trunk/rosapps/applications/devutils/vgafontedit/psf.h (with props)
trunk/rosapps/applications/devutils/vgafontedit/raw.h (with props)
Removed:
trunk/rosapps/applications/devutils/vgafontedit/rsrc.rc
trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rbuild
Modified:
trunk/rosapps/applications/devutils/vgafontedit/precomp.h
trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rc
Added: trunk/rosapps/applications/devutils/vgafontedit/cpi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgafontedit/cpi.h?rev=61226
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/cpi.h (added)
+++ trunk/rosapps/applications/devutils/vgafontedit/cpi.h [iso-8859-1]
Thu Dec 5 01:00:49 2013
@@ -0,0 +1,12 @@
+/*
+ * PROJECT: ReactOS VGA Font Editor
+ * LICENSE: GNU General Public License Version 2.0 or any later version
+ * FILE: devutils/vgafontedit/cpi.h
+ * PURPOSE: CPI (Code Page Information) MS-DOS-compatible Fonts
+ * COPYRIGHT: Copyright 2014 Hermes Belusca-Maito <[email protected]>
+ */
+
+#ifndef __CPI_H
+#define __CPI_H
+
+#endif
Propchange: trunk/rosapps/applications/devutils/vgafontedit/cpi.h
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/rosapps/applications/devutils/vgafontedit/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgafontedit/precomp.h?rev=61226&r1=61225&r2=61226&view=diff
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/precomp.h [iso-8859-1]
(original)
+++ trunk/rosapps/applications/devutils/vgafontedit/precomp.h [iso-8859-1]
Thu Dec 5 01:00:49 2013
@@ -15,16 +15,15 @@
#include "resource.h"
#include "customwndclasses.h"
+#include "raw.h"
+#include "psf.h"
+#include "cpi.h"
+
// Forward declarations
typedef struct _FONT_WND_INFO FONT_WND_INFO, *PFONT_WND_INFO;
typedef struct _EDIT_GLYPH_INFO EDIT_GLYPH_INFO, *PEDIT_GLYPH_INFO;
// Structure declarations
-typedef struct _BITMAP_FONT
-{
- UCHAR Bits[2048];
-} BITMAP_FONT, *PBITMAP_FONT;
-
typedef struct _MAIN_WND_INFO
{
HWND hMainWnd;
@@ -106,17 +105,6 @@
#define TOOLBAR_EDIT_GLYPH 0
#define TOOLBOX_PEN 0
-// PSFv1 file handling
-#define PSF1_MAGIC0 0x36
-#define PSF1_MAGIC1 0x04
-
-typedef struct _PSF1_HEADER
-{
- UCHAR uMagic[2];
- UCHAR uMode;
- UCHAR uCharSize;
-} PSF1_HEADER, *PPSF1_HEADER;
-
//
// Function prototypes
Added: trunk/rosapps/applications/devutils/vgafontedit/psf.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgafontedit/psf.h?rev=61226
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/psf.h (added)
+++ trunk/rosapps/applications/devutils/vgafontedit/psf.h [iso-8859-1]
Thu Dec 5 01:00:49 2013
@@ -0,0 +1,22 @@
+/*
+ * PROJECT: ReactOS VGA Font Editor
+ * LICENSE: GNU General Public License Version 2.0 or any later version
+ * FILE: devutils/vgafontedit/psf.h
+ * PURPOSE: PSFv1 (PC Screen) Fonts - Version 1
+ * COPYRIGHT: Copyright 2008 Colin Finck <[email protected]>
+ */
+
+#ifndef __PSF_H
+#define __PSF_H
+
+#define PSF1_MAGIC0 0x36
+#define PSF1_MAGIC1 0x04
+
+typedef struct _PSF1_HEADER
+{
+ UCHAR uMagic[2];
+ UCHAR uMode;
+ UCHAR uCharSize;
+} PSF1_HEADER, *PPSF1_HEADER;
+
+#endif
Propchange: trunk/rosapps/applications/devutils/vgafontedit/psf.h
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/rosapps/applications/devutils/vgafontedit/raw.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgafontedit/raw.h?rev=61226
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/raw.h (added)
+++ trunk/rosapps/applications/devutils/vgafontedit/raw.h [iso-8859-1]
Thu Dec 5 01:00:49 2013
@@ -0,0 +1,17 @@
+/*
+ * PROJECT: ReactOS VGA Font Editor
+ * LICENSE: GNU General Public License Version 2.0 or any later version
+ * FILE: devutils/vgafontedit/raw.h
+ * PURPOSE: Raw bitmap fonts
+ * COPYRIGHT: Copyright 2008 Colin Finck <[email protected]>
+ */
+
+#ifndef __RAW_H
+#define __RAW_H
+
+typedef struct _BITMAP_FONT
+{
+ UCHAR Bits[2048];
+} BITMAP_FONT, *PBITMAP_FONT;
+
+#endif
Propchange: trunk/rosapps/applications/devutils/vgafontedit/raw.h
------------------------------------------------------------------------------
svn:eol-style = native
Removed: trunk/rosapps/applications/devutils/vgafontedit/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgafontedit/rsrc.rc?rev=61225
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/rsrc.rc [iso-8859-1]
(original)
+++ trunk/rosapps/applications/devutils/vgafontedit/rsrc.rc (removed)
@@ -1,48 +0,0 @@
-/*
- * PROJECT: ReactOS VGA Font Editor
- * LICENSE: GNU General Public License Version 2.0 or any later version
- * FILE: devutils/vgafontedit/rsrc.rc
- * PURPOSE: Localized resource file
- * COPYRIGHT: Copyright 2008 Colin Finck <[email protected]>
- */
-
-#include <windows.h>
-#include "resource.h"
-#include "customwndclasses.h"
-
-/* include localised resources */
-// UTF-8
-#pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
- #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
- #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EN_US
- #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
- #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
- #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
- #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_NO_NO
- #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
- #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
- #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
- #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
- #include "lang/zh-CN.rc"
-#endif
Removed: trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rbuild?rev=61225
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rbuild
[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rbuild
(removed)
@@ -1,18 +0,0 @@
-<module name="vgafontedit" type="win32gui" installname="vgafontedit.exe"
unicode="yes">
- <include base="vgafontedit">.</include>
-
- <library>user32</library>
- <library>gdi32</library>
- <library>comdlg32</library>
-
- <file>aboutdlg.c</file>
- <file>editglyphdlg.c</file>
- <file>fontboxeswnd.c</file>
- <file>fontwnd.c</file>
- <file>main.c</file>
- <file>vgafontedit.rc</file>
- <file>mainwnd.c</file>
- <file>misc.c</file>
- <file>opensave.c</file>
- <pch>precomp.h</pch>
-</module>
Modified: trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rc?rev=61226&r1=61225&r2=61226&view=diff
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rc
[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rc
[iso-8859-1] Thu Dec 5 01:00:49 2013
@@ -9,8 +9,8 @@
#include <windows.h>
#include <commctrl.h>
#include "resource.h"
+#include "customwndclasses.h"
-/* define language neutral resources */
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS VGA Font Editor"
@@ -32,4 +32,39 @@
IDI_MAIN ICON "res/main.ico"
IDI_DOC ICON "res/doc.ico"
-#include "rsrc.rc"
+/* UTF-8 */
+#pragma code_page(65001)
+
+#ifdef LANGUAGE_BG_BG
+ #include "lang/bg-BG.rc"
+#endif
+#ifdef LANGUAGE_DE_DE
+ #include "lang/de-DE.rc"
+#endif
+#ifdef LANGUAGE_EN_US
+ #include "lang/en-US.rc"
+#endif
+#ifdef LANGUAGE_ES_ES
+ #include "lang/es-ES.rc"
+#endif
+#ifdef LANGUAGE_FR_FR
+ #include "lang/fr-FR.rc"
+#endif
+#ifdef LANGUAGE_IT_IT
+ #include "lang/it-IT.rc"
+#endif
+#ifdef LANGUAGE_NO_NO
+ #include "lang/no-NO.rc"
+#endif
+#ifdef LANGUAGE_PL_PL
+ #include "lang/pl-PL.rc"
+#endif
+#ifdef LANGUAGE_RU_RU
+ #include "lang/ru-RU.rc"
+#endif
+#ifdef LANGUAGE_UK_UA
+ #include "lang/uk-UA.rc"
+#endif
+#ifdef LANGUAGE_ZH_CN
+ #include "lang/zh-CN.rc"
+#endif
