vino/rocket
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleanup. Added version define

Browse Source
This commit is contained in:
Daniel Collin 2013-01-09 19:20:29 +01:00
parent 897af3fc4b
commit 53027b06bd
3 changed files with 11 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ogl_editor/src/Editor.c
View File

@ -13,13 +13,12 @@
#include "RemoteConnection.h" #include "RemoteConnection.h"
#include "Commands.h" #include "Commands.h"
#include "MinecraftiaFont.h" #include "MinecraftiaFont.h"
#include "Window.h"
#include "../../sync/sync.h" #include "../../sync/sync.h"
#include "../../sync/base.h" #include "../../sync/base.h"
#include "../../sync/data.h" #include "../../sync/data.h"
#include <emgui/emgui.h> #include <emgui/emgui.h>
extern void Window_setTitle(const text_t* title);
extern void Window_populateRecentList(const text_t** files);
static void updateNeedsSaving(); static void updateNeedsSaving();
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -837,14 +836,14 @@ static void setWindowTitle(const text_t* path, bool needsSave)
text_t windowTitle[4096]; text_t windowTitle[4096];
#if defined(_WIN32) #if defined(_WIN32)
if (needsSave) if (needsSave)
swprintf_s(windowTitle, sizeof(windowTitle), L"RocketEditor - (%s) *", path); swprintf_s(windowTitle, sizeof(windowTitle), L"RocketEditor" EDITOR_VERSION "- (%s) *", path);
else else
swprintf_s(windowTitle, sizeof(windowTitle), L"RocketEditor - (%s)", path); swprintf_s(windowTitle, sizeof(windowTitle), L"RocketEditor" EDITOR_VERSION " - (%s)", path);
#else #else
if (needsSave) if (needsSave)
sprintf(windowTitle, "RocketEditor - (%s) *", path); sprintf(windowTitle, "RocketEditor" EDITOR_VERSION "- (%s) *", path);
else else
sprintf(windowTitle, "RocketEditor - (%s)", path); sprintf(windowTitle, "RocketEditor" EDITOR_VERSION "- (%s)", path);
#endif #endif
Window_setTitle(windowTitle); Window_setTitle(windowTitle);

8
ogl_editor/src/Editor.h
View File

@ -23,11 +23,5 @@ text_t** Editor_getRecentFiles();
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
enum #define EDITOR_VERSION _T(" 1.0 Beta ")
{
EDITOR_KEY_SHIFT = 1,
EDITOR_KEY_ALT = 2,
EDITOR_KEY_CTRL = 4,
EDITOR_KEY_COMMAND = 8,
};

70
ogl_editor/src/macosx/RocketView.m
View File

@ -10,75 +10,17 @@
NSOpenGLContext* g_context = 0; NSOpenGLContext* g_context = 0;
NSWindow* g_window = 0; NSWindow* g_window = 0;
void Window_setTitle(const char* title);
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Scan codes on Mac taken from http://boredzo.org/blog/archives/2007-05-22/virtual-key-codes // Scan codes on Mac taken from http://boredzo.org/blog/archives/2007-05-22/virtual-key-codes
#define KEY_A 0
#define KEY_S 1
#define KEY_D 2
#define KEY_F 3
#define KEY_H 4
#define KEY_G 5
#define KEY_Z 6
#define KEY_X 7
#define KEY_C 8
#define KEY_V 9
#define KEY_B 11
#define KEY_Q 12
#define KEY_W 13
#define KEY_E 14
#define KEY_R 15
#define KEY_Y 16
#define KEY_T 17
#define KEY_1 18
#define KEY_2 19
#define KEY_3 20
#define KEY_4 21
#define KEY_6 22
#define KEY_5 23
#define KEY_EQUALS 24
#define KEY_9 25
#define KEY_7 26
#define KEY_MINUS 27
#define KEY_8 28
#define KEY_0 29
#define KEY_RIGHTBRACKET 30
#define KEY_O 31
#define KEY_U 32
#define KEY_LEFTBRACKET 33
#define KEY_I 34
#define KEY_P 35
#define KEY_RETURN 36 #define KEY_RETURN 36
#define KEY_L 37
#define KEY_J 38
#define KEY_APOSTROPHE 39
#define KEY_K 40
#define KEY_SEMICOLON 41
#define KEY_FRONTSLASH 42
#define KEY_COMMA 43
#define KEY_BACKSLASH 44
#define KEY_N 45
#define KEY_M 46
#define KEY_PERIOD 47
#define KEY_TAB 48 #define KEY_TAB 48
#define KEY_SPACE 49
#define KEY_BACKAPOSTROPHE 50
#define KEY_DELETE 51 #define KEY_DELETE 51
#define KEY_ESCAPE 53 #define KEY_ESCAPE 53
#define KEY_COMMAND 55 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
#define KEY_SHIFT 56
#define KEY_CAPSLOCK 57
#define KEY_OPTION 58
#define KEY_CONTROL 59
#define KEY_UP 126
#define KEY_DOWN 125
#define KEY_LEFT 123
#define KEY_RIGHT 124
@interface MyMenuItem : NSMenuItem @interface MyMenuItem : NSMenuItem
{ {
@ -184,10 +126,6 @@ static int getModifierFlags(int flags)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- (void)keyDown:(NSEvent *)theEvent - (void)keyDown:(NSEvent *)theEvent
{ {
NSString* key = [theEvent charactersIgnoringModifiers]; NSString* key = [theEvent charactersIgnoringModifiers];
@ -520,6 +458,8 @@ void Window_buildMenu()
buildSubMenu(fileMenu, g_fileMenu); buildSubMenu(fileMenu, g_fileMenu);
buildSubMenu(editMenu, g_editMenu); buildSubMenu(editMenu, g_editMenu);
buildSubMenu(viewMenu, g_viewMenu); buildSubMenu(viewMenu, g_viewMenu);
Window_setTitle("RocketEditor" EDITOR_VERSION);
} }
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////