Read about our upcoming Code of Conduct on this issue

Commit ef927eae authored by a1ex's avatar a1ex
Browse files

600D: gui.h from 550D

--HG--
branch : unified
parent 54f09ad9d9dc
......@@ -48,14 +48,10 @@ typedef enum {
INITIALIZE_CONTROLLER = 0x802,
TERMINATE_WINSYS = 0x804,
DELETE_DIALOG_REQUEST = 0x805,
PRESS_RIGHT_BUTTON = 0x83c,
PRESS_LEFT_BUTTON = 0x840,
PRESS_UP_BUTTON = 0x83a,
PRESS_DOWN_BUTTON = 0x83e,
PRESS_UP_RIGHT = 0x83b,
PRESS_DOWN_RIGHT = 0x83d,
PRESS_UP_LEFT = 0x841,
PRESS_DOWN_LEFT = 0x83f,
PRESS_RIGHT_BUTTON = 0x807,
PRESS_LEFT_BUTTON = 0x809,
PRESS_UP_BUTTON = 0x80B,
PRESS_DOWN_BUTTON = 0x80D,
PRESS_MENU_BUTTON = 0x80F,
UNPRESS_SET_BUTTON = 0x810,
PRESS_SET_BUTTON = 0x812, // also joy center?
......@@ -68,11 +64,7 @@ typedef enum {
PRESS_JOY_UP = 0x822,
PRESS_JOY_DOWN = 0x824,
PRESS_JOY_RIGHT = 0x826,
PRESS_JOY_UP_LEFT = 0x82b,
PRESS_JOY_UP_RIGHT = 0x825,
PRESS_JOY_DOWN_LEFT = 0x829,
PRESS_JOY_DOWN_RIGHT = 0x827,
JOY_CENTER = 0x82C,
JOY_CENTER = 0x828,
PRESS_INFO_BUTTON = 0x829,
ELECTRONIC_SUB_DIAL_RIGHT = 0x82B,
ELECTRONIC_SUB_DIAL_LEFT = 0x82C,
......@@ -80,7 +72,7 @@ typedef enum {
DIAL_RIGHT = 0x82F,
PRESS_DISP_BUTTON = 0x10000000, // also play?
PRESS_ERASE_BUTTON = 0x10000001,
PRESS_DIRECT_PRINT_BUTTON = 0x1000000C,
PRESS_DIRECT_PRINT_BUTTON = 0x10000005,
PRESS_FUNC_BUTTON = 0x10000007,
PRESS_PICTURE_STYLE_BUTTON = 0x10000009,
GUICMD_OPEN_SLOT_COVER = 0x1000000B,
......@@ -97,8 +89,8 @@ typedef enum {
GUICMD_START_AS_CHECK = 0x100000A2,
GUICMD_LOCK_OFF = 0x100000A3,
GUICMD_LOCK_ON = 0x100000A4,
PRESS_HALFSHUTTER_MAYBE = 0x10000041,
UNPRESS_HALFSHUTTER_MAYBE = 0x10000042,
PRESS_HALFSHUTTER_MAYBE = 0x10000048,
UNPRESS_HALFSHUTTER_MAYBE = 0x10000049,
EVENTID_METERING_START = 0x10000039,
EVENTID_94 = 0x10000094,
......@@ -233,13 +225,7 @@ gui_lock(
);
static inline void
gui_unlock( void )
{
//~ gui_lock( 0, 1, 2 );
uint32_t x = 0x41000000;
prop_request_change(0x80020009, &x, 4);
}
void gui_unlock( void );
......@@ -335,14 +321,11 @@ gui_stop_menu( void );
extern void
gui_hide_menu( int redisplay_time );
#define GUISTATE_INIT -1
#define GUISTATE_IDLE 0
#define GUISTATE_PLAYMENU 1
#define GUISTATE_MENUDISP 2 // warning
#define GUISTATE_QR 3 // QuickReview
// 3: lockoff warning (?)
// 4: QR?
// 5: QR erase?
// 6: OLC?
// 7: LV?
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment