Commit: b0026dd9765c4d5999978e9ba10d6533c17183fa
Author: Severin
Date: Thu Dec 4 22:16:40 2014 +0100
Branches: input_method_editor_partial_support
https://developer.blender.org/rBb0026dd9765c4d5999978e9ba10d6533c17183fa
IME: Cleanup - Rename wmImeData to wmIMEData
- picky -
===================================================================
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_intern.h
M source/blender/editors/interface/interface_widgets.c
M source/blender/makesdna/DNA_windowmanager_types.h
M source/blender/windowmanager/WM_types.h
===================================================================
diff --git a/source/blender/editors/interface/interface_handlers.c
b/source/blender/editors/interface/interface_handlers.c
index 097fdb2..1046646 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -2456,7 +2456,7 @@ void ui_but_ime_reposition(uiBut *but, int x, int y, int
complete)
}
/* should be ui_but_ime_data_get */
-wmImeData *ui_but_get_ime_data(uiBut *but)
+wmIMEData *ui_but_get_ime_data(uiBut *but)
{
if (but->active && but->active->window)
return but->active->window->ime_data;
@@ -2635,7 +2635,7 @@ static void ui_do_but_textedit(bContext *C, uiBlock
*block, uiBut *but, uiHandle
bool changed = false, inbox = false, update = false;
wmWindow *win = CTX_wm_window(C);
- wmImeData *ime_data = win->ime_data;
+ wmIMEData *ime_data = win->ime_data;
bool is_ime_composing = ime_data && ime_data->is_ime_composite;
switch (event->type) {
diff --git a/source/blender/editors/interface/interface_intern.h
b/source/blender/editors/interface/interface_intern.h
index 3a42ca5..e0f538b 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -628,7 +628,7 @@ uiBut *ui_but_find_old(uiBlock *block_old, const uiBut
*but_new);
uiBut *ui_but_find_new(uiBlock *block_old, const uiBut *but_new);
void ui_but_ime_reposition(uiBut *but, int x, int y, int complete);
-struct wmImeData *ui_but_get_ime_data(uiBut *but);
+struct wmIMEData *ui_but_get_ime_data(uiBut *but);
/* interface_widgets.c */
void ui_draw_anti_tria(float x1, float y1, float x2, float y2, float x3, float
y3);
diff --git a/source/blender/editors/interface/interface_widgets.c
b/source/blender/editors/interface/interface_widgets.c
index 97f3567..2cb1b29 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1237,7 +1237,7 @@ static void ui_text_clip_right_label(uiFontStyle *fstyle,
uiBut *but, const rcti
}
#ifdef WITH_INPUT_IME
-static void widget_draw_text_ime_underline(uiFontStyle *fstyle, uiWidgetColors
*wcol, uiBut *but, rcti *rect, wmImeData *ime_data, char *drawstr)
+static void widget_draw_text_ime_underline(uiFontStyle *fstyle, uiWidgetColors
*wcol, uiBut *but, rcti *rect, wmIMEData *ime_data, char *drawstr)
{
int ofs_x, width;
int rect_x = BLI_rcti_size_x(rect);
@@ -1285,7 +1285,7 @@ static void widget_draw_text(uiFontStyle *fstyle,
uiWidgetColors *wcol, uiBut *b
const char *drawstr_right = NULL;
char *drawstr_edit = NULL;
bool use_right_only = false;
- wmImeData *ime_data;
+ wmIMEData *ime_data;
UI_fontstyle_set(fstyle);
diff --git a/source/blender/makesdna/DNA_windowmanager_types.h
b/source/blender/makesdna/DNA_windowmanager_types.h
index 7d11b2f..143daa7 100644
--- a/source/blender/makesdna/DNA_windowmanager_types.h
+++ b/source/blender/makesdna/DNA_windowmanager_types.h
@@ -191,7 +191,7 @@ typedef struct wmWindow {
short last_pie_event; /* exception to the above rule for nested
pies, store last pie event for operators
* that spawn a new pie right after
destruction of last pie */
- struct wmImeData *ime_data; /* Input Method Editor data - complex
character input (esp. for asian character input) */
+ struct wmIMEData *ime_data; /* Input Method Editor data - complex
character input (esp. for asian character input) */
struct wmEvent *eventstate; /* storage for event system */
diff --git a/source/blender/windowmanager/WM_types.h
b/source/blender/windowmanager/WM_types.h
index e0d23e1..47b110e 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -472,7 +472,7 @@ typedef struct wmTabletData {
/* similar to GHOST_TEventImeData */
/* XXX - names, comments */
-typedef struct wmImeData {
+typedef struct wmIMEData {
size_t result_len, composite_len;
char *result; /* utf8 encoding */
@@ -485,7 +485,7 @@ typedef struct wmImeData {
int cursor_pos_text; /* cursor pos in text (console space only) */
bool is_ime_composite; /* for uiBut only */
-} wmImeData;
+} wmIMEData;
typedef enum { /* motion progress, for modal handlers */
P_NOT_STARTED,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
