Merge ~azzar1/nux:fix-ftbs into nux:master

[Andrea Azzarone]

Unmerged commits

3e1285e... by Andrea Azzarone on 2019-02-19

XICClient: Update signature of preedit callbacks

539c191... by Andrea Azzarone on 2019-02-19

events: Use value-initialization instead of memset

a52383c... by Andrea Azzarone on 2019-02-19

textEntry: fix FTBS

diff --git a/Nux/TextEntry.cpp b/Nux/TextEntry.cpp
index 26086fb..2554647 100644
--- a/Nux/TextEntry.cpp
+++ b/Nux/TextEntry.cpp
@@ -1140,8 +1140,10 @@ namespace nux
     }
   }
 
-  bool TextEntry::CursorBlinkCallback(TextEntry *self)
+  gboolean TextEntry::CursorBlinkCallback(gpointer data)
   {
+    TextEntry *self = static_cast<TextEntry*>(data);
+
     if (self->cursor_blink_status_)
       self->ShowCursor();
     else
@@ -1150,7 +1152,7 @@ namespace nux
     if (--self->cursor_blink_status_ < 0)
       self->cursor_blink_status_ = 2;
 
-    return true;
+    return TRUE;
   }
 
   void TextEntry::QueueCursorBlink()
@@ -1160,7 +1162,7 @@ namespace nux
 
     if (!cursor_blink_timer_)
       cursor_blink_timer_ = g_timeout_add(kCursorBlinkTimeout,
-                                          (GSourceFunc)&CursorBlinkCallback,
+                                          &TextEntry::CursorBlinkCallback,
                                           this);
   }
 
diff --git a/Nux/TextEntry.h b/Nux/TextEntry.h
index 6880e10..142d670 100644
--- a/Nux/TextEntry.h
+++ b/Nux/TextEntry.h
@@ -292,7 +292,7 @@ namespace nux
     void ResetPreedit();
     /** Send out a request to blink the cursor if necessary */
     void QueueCursorBlink();
-    static bool CursorBlinkCallback(TextEntry* data);
+    static gboolean CursorBlinkCallback(gpointer data);
 
     void ShowCursor();
     void HideCursor();
diff --git a/Nux/WindowThread.cpp b/Nux/WindowThread.cpp
index a043142..add0a20 100644
--- a/Nux/WindowThread.cpp
+++ b/Nux/WindowThread.cpp
@@ -1343,7 +1343,6 @@ DECLARE_LOGGER(logger, "nux.windows.thread");
     }
 
     Event nux_event;
-    memset(&nux_event, 0, sizeof(Event));
 #if defined(NUX_OS_WINDOWS)
     graphics_display_->ProcessForeignWin32Event(hWnd, msg, wParam, lParam, &nux_event);
 #elif defined(USE_X11)
diff --git a/Nux/XICClient.cpp b/Nux/XICClient.cpp
index a010504..e2d5a10 100644
--- a/Nux/XICClient.cpp
+++ b/Nux/XICClient.cpp
@@ -44,18 +44,16 @@ void XICClient::SetCurrentTextEntry(TextEntry* text_entry)
   text_entry_ = text_entry;
 }
 
-static int preedit_caret_callback(XIC xic,
-                                  XPointer clientdata,
-                                  XIMPreeditCaretCallbackStruct* call_data)
+static void preedit_caret_callback(XIC xic,
+                                   XPointer clientdata,
+                                   XIMPreeditCaretCallbackStruct* call_data)
 {
-  return 0;
 }
 
-static int status_start_callback(XIC xic,
-                                 XPointer clientdata,
-                                 XIMPreeditDrawCallbackStruct* call_data)
+static void status_start_callback(XIC xic,
+                                  XPointer clientdata,
+                                  XIMPreeditDrawCallbackStruct* call_data)
 {
-  return 0;
 }
 
 static void status_draw_callback(XIC xic,
diff --git a/Nux/XICClient.h b/Nux/XICClient.h
index c64e69b..f1b92c8 100644
--- a/Nux/XICClient.h
+++ b/Nux/XICClient.h
@@ -55,11 +55,11 @@ private:
   XVaNestedList GetStatusCallbacks();
   XIMStyle FilterXIMStyle();
 
-  static int PreeditStartCallback(XIC xic, XPointer clientdata, XPointer data);
-  static int PreeditDoneCallback(XIC xic, XPointer clientdata, XPointer data);
+  static void PreeditStartCallback(XIC xic, XPointer clientdata, XPointer data);
+  static void PreeditDoneCallback(XIC xic, XPointer clientdata, XPointer data);
 
-  static int PreeditDrawCallback(XIC xic, XPointer clientdata,
-                                 XIMPreeditDrawCallbackStruct* call_data);
+  static void PreeditDrawCallback(XIC xic, XPointer clientdata,
+                                  XIMPreeditDrawCallbackStruct* call_data);
 
   TextEntry* text_entry_;
   XIC xic_;
diff --git a/Nux/XIMCallbacks.cpp b/Nux/XIMCallbacks.cpp
index aa54103..afd6cc2 100644
--- a/Nux/XIMCallbacks.cpp
+++ b/Nux/XIMCallbacks.cpp
@@ -38,30 +38,26 @@ namespace nux
 
 int const FEEDBACK_MASK = (XIMUnderline | XIMReverse);
 
-int XICClient::PreeditStartCallback(XIC xic,
-                                    XPointer clientdata,
-                                    XPointer call_data)
+void XICClient::PreeditStartCallback(XIC xic,
+                                     XPointer clientdata,
+                                     XPointer call_data)
 {
   TextEntry* text_entry = (TextEntry*)clientdata;
   if (text_entry)
   {
     text_entry->PreeditStarted();
   }
-
-  return 0;
 }
 
-int XICClient::PreeditDoneCallback(XIC xic,
-                                   XPointer clientdata,
-                                   XPointer call_data)
+void XICClient::PreeditDoneCallback(XIC xic,
+                                    XPointer clientdata,
+                                    XPointer call_data)
 {
   TextEntry* text_entry = (TextEntry*)clientdata;
   if (text_entry)
   {
     text_entry->ClearPreedit();
   }
-
-  return 0;
 }
 
 void add_feedback_attr(PangoAttrList* attrs,
@@ -154,9 +150,9 @@ void feedback_to_pango_list(PangoAttrList** attrs,
   }
 }
 
-int XICClient::PreeditDrawCallback(XIC xic,
-                                   XPointer clientdata,
-                                   XIMPreeditDrawCallbackStruct* call_data)
+void XICClient::PreeditDrawCallback(XIC xic,
+                                    XPointer clientdata,
+                                    XIMPreeditDrawCallbackStruct* call_data)
 {
   TextEntry* text_entry = (TextEntry*)clientdata;
 
@@ -182,8 +178,6 @@ int XICClient::PreeditDrawCallback(XIC xic,
     text_entry->UpdatePreeditAttribs(preedit_attr);
     text_entry->UpdatePreedit(preedit, call_data->caret);
   }
-
-  return 0;
 }
 
 }
diff --git a/NuxGraphics/Events.cpp b/NuxGraphics/Events.cpp
index a9a5c09..ebef5f8 100644
--- a/NuxGraphics/Events.cpp
+++ b/NuxGraphics/Events.cpp
@@ -58,47 +58,6 @@ namespace nux
     return((key_modifiers_states & key_modifier) != 0);
   }
 
-  Event::Event()
-  {
-    Memset(text, 0, sizeof(text));
-    dtext = nullptr;
-
-    for (int i = 0; i < NUX_MAX_VK; i++)
-    {
-      VirtualKeycodeState[i] = 0;
-    }
-
-    ascii_code = 0;
-    virtual_code = 0;
-    key_modifiers = 0;
-    key_repeat_count = 0;
-    mouse_state = 0;
-    x = -1;
-    y = -1;
-    x_root = 0;
-    y_root = 0;
-    dx = 0;
-    dy = 0;
-    clicks = 0;
-    is_click = 0;
-    wheel_delta = 0;
-
-#if defined(NUX_OS_WINDOWS)
-    win32_keycode = 0;
-    win32_keysym = 0;
-#endif
-
-#if defined(USE_X11)
-    x11_keycode = 0;
-    x11_keysym = 0;
-    x11_timestamp = 0;
-    x11_window = 0;
-    x11_key_state = 0;
-#endif
-
-    //Application = 0;
-  }
-
   void Event::Reset()
   {
     type = NUX_NO_EVENT;
diff --git a/NuxGraphics/Events.h b/NuxGraphics/Events.h
index b9e4edc..b383f14 100644
--- a/NuxGraphics/Events.h
+++ b/NuxGraphics/Events.h
@@ -313,8 +313,6 @@ namespace nux
   class Event
   {
   public:
-    Event();
-
     // Because an event is save in event_type instead of calling immediately the handling function,
     // we must clear the previous event each time before we test for new event in Gfx_OpenGLImpl::get_event.
     /*virtual*/ void Reset();
@@ -383,39 +381,39 @@ namespace nux
     */
     unsigned long GetVirtualKeyState(unsigned long VirtualKey) const;
 
-    unsigned long VirtualKeycodeState[NUX_MAX_VK];
-    int width, height;
-    unsigned int ascii_code;
-    int virtual_code;
+    unsigned long VirtualKeycodeState[NUX_MAX_VK] = {};
+    int width = 0, height = 0;
+    unsigned int ascii_code = 0;
+    int virtual_code = 0;
 
-    int x;
-    int y;
-    int x_root;
-    int y_root;
-    int dx;
-    int dy;
-    int clicks;
-    int is_click;
+    int x = -1;
+    int y = -1;
+    int x_root = 0;
+    int y_root = 0;
+    int dx = 0;
+    int dy = 0;
+    int clicks = 0;
+    int is_click = 0;
 
 #if defined(NUX_OS_WINDOWS)
-    int win32_keycode; // Not used. Just a place holder.
-    int win32_keysym;
+    int win32_keycode = 0; // Not used. Just a place holder.
+    int win32_keysym = 0;
 #elif defined(USE_X11)
-    Time          x11_timestamp;  //!< X11 timestamp.
-    Window        x11_window;     //!< X11 window.
-    unsigned int  x11_key_state;  //!< X11 key state (xevent.xkey.state).
-    unsigned int  x11_keycode;    //!< X11 raw keycode.
-    KeySym        x11_keysym;     //!< X11 keysym.
+    Time          x11_timestamp = 0;  //!< X11 timestamp.
+    Window        x11_window = 0;     //!< X11 window.
+    unsigned int  x11_key_state = 0;  //!< X11 key state (xevent.xkey.state).
+    unsigned int  x11_keycode = 0;    //!< X11 raw keycode.
+    KeySym        x11_keysym = 0;     //!< X11 keysym.
 #endif
 
-    int wheel_delta;              //!< Wheel delta.
+    int wheel_delta = 0;              //!< Wheel delta.
 
-    char            text[NUX_EVENT_TEXT_BUFFER_SIZE];
-    char*           dtext;            //!< Dynamically allocated
-    unsigned long   key_modifiers;    //!< Key modifiers. A bitwise inclusive OR of values in KeyModifier.
-    unsigned long   mouse_state;
-    unsigned short  key_repeat_count; //!< Number of time a key is repeated;
-    EventType    type;
+    char            text[NUX_EVENT_TEXT_BUFFER_SIZE] = {};
+    char*           dtext = nullptr;            //!< Dynamically allocated
+    unsigned long   key_modifiers = 0;    //!< Key modifiers. A bitwise inclusive OR of values in KeyModifier.
+    unsigned long   mouse_state = 0;
+    unsigned short  key_repeat_count  = 0; //!< Number of time a key is repeated;
+    EventType    type = EVENT_NONE;
   };
 };
 
diff --git a/gputests/framebufferobject.cpp b/gputests/framebufferobject.cpp
index 9bbca5d..9b64a7f 100644
--- a/gputests/framebufferobject.cpp
+++ b/gputests/framebufferobject.cpp
@@ -58,7 +58,6 @@ void RenderToFrameBufferObject ()
   graphics_engine->Push2DWindow(w, h);
 
   nux::Event event;
-  memset(&event, 0, sizeof(nux::Event));
 
   bool first_time = true;
   do
diff --git a/gputests/quad_2texmod.cpp b/gputests/quad_2texmod.cpp
index 6170015..638b3f9 100755
--- a/gputests/quad_2texmod.cpp
+++ b/gputests/quad_2texmod.cpp
@@ -87,7 +87,6 @@ void QuadRendering_2TexMod ()
 
   int w, h;
   nux::Event event;
-  memset(&event, 0, sizeof(nux::Event));
   graphics_engine->GetWindowSize(w, h);
   graphics_engine->SetViewport(0, 0, w, h);
   graphics_engine->SetScissor(0, 0, w, h);
diff --git a/gputests/texture_blur.cpp b/gputests/texture_blur.cpp
index de15aae..355050e 100644
--- a/gputests/texture_blur.cpp
+++ b/gputests/texture_blur.cpp
@@ -60,7 +60,6 @@ void RenderBlurredTexture ()
   graphics_engine->Push2DWindow(w, h);
 
   nux::Event event;
-  memset(&event, 0, sizeof(nux::Event));
   
   /*char fps [25];
   int frame_counter = 0;
diff --git a/gputests/texture_copy_blur.cpp b/gputests/texture_copy_blur.cpp
index 54f1cf7..8e79e36 100644
--- a/gputests/texture_copy_blur.cpp
+++ b/gputests/texture_copy_blur.cpp
@@ -60,7 +60,6 @@ void RenderBlurredCopyOfRenderTarget ()
   graphics_engine->Push2DWindow(w, h);
 
   nux::Event event;
-  memset(&event, 0, sizeof(nux::Event));
 
   /*char fps [25];
   int frame_counter = 0;
diff --git a/gputests/texture_data.cpp b/gputests/texture_data.cpp
index f8248d2..6bd22f3 100644
--- a/gputests/texture_data.cpp
+++ b/gputests/texture_data.cpp
@@ -95,9 +95,7 @@ void RenderTexturePowerOfTwo ()
   m_GraphicsContext->Push2DWindow(w, h);
 
   nux::Event event;
-  memset(&event, 0, sizeof(nux::Event));
 
-  
   {
     CHECKGL( glClearColor(0, 0, 0, 1) );
     CHECKGL( glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT) );
diff --git a/gputests/texture_power_of_2.cpp b/gputests/texture_power_of_2.cpp
index 98eb833..392ee97 100644
--- a/gputests/texture_power_of_2.cpp
+++ b/gputests/texture_power_of_2.cpp
@@ -93,7 +93,6 @@ void RenderTexturePowerOfTwo ()
   m_GraphicsContext->Push2DWindow(w, h);
 
   nux::Event event;
-  memset(&event, 0, sizeof(nux::Event));
 
   do
   {