diff --git a/include/justui/jevent.h b/include/justui/jevent.h index 989a604..97a0624 100644 --- a/include/justui/jevent.h +++ b/include/justui/jevent.h @@ -41,7 +41,7 @@ typedef struct { /* Event details or data */ union { - /* Downward JWIDGET_KEY event or upwards JSCENE_KEY */ + /* JWIDGET_KEY events */ key_event_t key; }; diff --git a/include/justui/jscene.h b/include/justui/jscene.h index 47fbf19..885460c 100644 --- a/include/justui/jscene.h +++ b/include/justui/jscene.h @@ -37,7 +37,7 @@ typedef struct { /* Events */ extern uint16_t JSCENE_NONE; extern uint16_t JSCENE_PAINT; -extern uint16_t JSCENE_KEY; +extern uint16_t JSCENE_KEY; /* Deprecated, merged with JWIDGET_KEY */ /* jscene_create(): Create a new scene at that specified screen position */ jscene *jscene_create(int x, int y, int w, int h, void *parent); @@ -104,7 +104,7 @@ bool jscene_process_event(jscene *scene, jevent event); scene. If a scene event occurs, returns it. If a key event occurs, an event of type - JSCENE_KEY is return and its .key attribute contains the details of the + JWIDGET_KEY is return and its .key attribute contains the details of the forwarded keyboard event. */ jevent jscene_run(jscene *scene); diff --git a/src/jscene.c b/src/jscene.c index fdf9149..17bb5de 100644 --- a/src/jscene.c +++ b/src/jscene.c @@ -197,7 +197,7 @@ jevent jscene_run(jscene *s) } #endif if(k.type != KEYEV_NONE && !jscene_process_key_event(s, k)) { - e.type = JSCENE_KEY; + e.type = JWIDGET_KEY; e.key = k; break; } @@ -225,5 +225,5 @@ static void j_register_jscene(void) jscene_type_id = j_register_widget(&type_jscene, "jwidget"); JSCENE_NONE = j_register_event(); JSCENE_PAINT = j_register_event(); - JSCENE_KEY = j_register_event(); + JSCENE_KEY = JWIDGET_KEY; }