Rename jmouse_[gs]et_cursor() to ui::[gs]et_mouse_cursor()

src/app/app.cpp

@@ -187,7 +187,7 @@ void App::initialize(int argc, const char* argv[])
     ui::set_use_native_cursors(
       ctx->settings()->experimental()->useNativeCursor());
 
-    jmouse_set_cursor(kArrowCursor);
+    ui::set_mouse_cursor(kArrowCursor);
 
     ui::Manager::getDefault()->invalidate();
 

src/app/commands/cmd_play_animation.cpp

@@ -100,7 +100,7 @@ protected:
     switch (msg->type()) {
 
       case kOpenMessage:
-        jmouse_set_cursor(kNoCursor);
+        ui::set_mouse_cursor(kNoCursor);
         break;
 
       case kCloseMessage:
@@ -123,7 +123,7 @@ protected:
       }
 
       case kSetCursorMessage:
-        jmouse_set_cursor(kNoCursor);
+        ui::set_mouse_cursor(kNoCursor);
         return true;
     }
 

src/app/commands/cmd_preview.cpp

@@ -173,7 +173,7 @@ protected:
       }
 
       case kSetCursorMessage:
-        jmouse_set_cursor(kNoCursor);
+        ui::set_mouse_cursor(kNoCursor);
         return true;
     }
 

src/app/commands/filters/color_curve_editor.cpp

@@ -128,7 +128,7 @@ bool ColorCurveEditor::onProcessMessage(Message* msg)
       // Edit node
       else {
         m_status = STATUS_MOVING_POINT;
-        jmouse_set_cursor(kHandCursor);
+        ui::set_mouse_cursor(kHandCursor);
       }
 
       captureMouse();
@@ -167,7 +167,7 @@ bool ColorCurveEditor::onProcessMessage(Message* msg)
         switch (m_status) {
 
           case STATUS_MOVING_POINT:
-            jmouse_set_cursor(kArrowCursor);
+            ui::set_mouse_cursor(kArrowCursor);
             CurveEditorChange();
             m_editPoint = NULL;
             invalidate();

src/app/ui/color_button.cpp

@@ -151,7 +151,7 @@ bool ColorButton::onProcessMessage(Message* msg)
 
     case kSetCursorMessage:
       if (hasCapture()) {
-        jmouse_set_cursor(kEyedropperCursor);
+        ui::set_mouse_cursor(kEyedropperCursor);
         return true;
       }
       break;

src/app/ui/editor/drawing_state.cpp

@@ -162,10 +162,10 @@ bool DrawingState::onSetCursor(Editor* editor)
 {
   if (m_toolLoop->getInk()->isEyedropper()) {
     editor->hideDrawingCursor();
-    jmouse_set_cursor(kEyedropperCursor);
+    ui::set_mouse_cursor(kEyedropperCursor);
   }
   else {
-    jmouse_set_cursor(kNoCursor);
+    ui::set_mouse_cursor(kNoCursor);
     editor->showDrawingCursor();
   }
   return true;

src/app/ui/editor/editor.cpp

@@ -1317,7 +1317,7 @@ void Editor::editor_setcursor()
 
   if (!used) {
     hideDrawingCursor();
-    jmouse_set_cursor(kArrowCursor);
+    ui::set_mouse_cursor(kArrowCursor);
   }
 }
 

src/app/ui/editor/moving_pixels_state.cpp

@@ -311,7 +311,7 @@ bool MovingPixelsState::onSetCursor(Editor* editor)
   // Move selection
   if (m_pixelsMovement->isDragging()) {
     editor->hideDrawingCursor();
-    jmouse_set_cursor(kMoveCursor);
+    ui::set_mouse_cursor(kMoveCursor);
     return true;
   }
 

src/app/ui/editor/scrolling_state.cpp

@@ -81,7 +81,7 @@ bool ScrollingState::onMouseMove(Editor* editor, MouseMessage* msg)
 bool ScrollingState::onSetCursor(Editor* editor)
 {
   editor->hideDrawingCursor();
-  jmouse_set_cursor(kScrollCursor);
+  ui::set_mouse_cursor(kScrollCursor);
   return true;
 }
 

src/app/ui/editor/select_box_state.cpp

@@ -124,8 +124,8 @@ bool SelectBoxState::onSetCursor(Editor* editor)
 {
   if (m_movingRuler >= 0) {
     switch (m_rulers[m_movingRuler].getOrientation()) {
-      case Ruler::Horizontal: jmouse_set_cursor(kSizeNSCursor); return true;
+      case Ruler::Horizontal: ui::set_mouse_cursor(kSizeNSCursor); return true;
-      case Ruler::Vertical: jmouse_set_cursor(kSizeWECursor); return true;
+      case Ruler::Vertical: ui::set_mouse_cursor(kSizeWECursor); return true;
     }
   }
 
@@ -136,10 +136,10 @@ bool SelectBoxState::onSetCursor(Editor* editor)
     if (touchRuler(editor, *it, x, y)) {
       switch (it->getOrientation()) {
         case Ruler::Horizontal:
-          jmouse_set_cursor(kSizeNSCursor);
+          ui::set_mouse_cursor(kSizeNSCursor);
           return true;
         case Ruler::Vertical:
-          jmouse_set_cursor(kSizeWECursor);
+          ui::set_mouse_cursor(kSizeWECursor);
           return true;
       }
     }

src/app/ui/editor/standby_state.cpp

@@ -434,35 +434,35 @@ bool StandbyState::onSetCursor(Editor* editor)
         editor->hideDrawingCursor();
 
         if (customization && customization->isCopySelectionKeyPressed())
-          jmouse_set_cursor(kArrowPlusCursor);
+          ui::set_mouse_cursor(kArrowPlusCursor);
         else
-          jmouse_set_cursor(kMoveCursor);
+          ui::set_mouse_cursor(kMoveCursor);
 
         return true;
       }
     }
     else if (ink->isEyedropper()) {
       editor->hideDrawingCursor();
-      jmouse_set_cursor(kEyedropperCursor);
+      ui::set_mouse_cursor(kEyedropperCursor);
       return true;
     }
     else if (ink->isZoom()) {
       editor->hideDrawingCursor();
-      jmouse_set_cursor(kMagnifierCursor);
+      ui::set_mouse_cursor(kMagnifierCursor);
       return true;
     }
     else if (ink->isScrollMovement()) {
       editor->hideDrawingCursor();
-      jmouse_set_cursor(kScrollCursor);
+      ui::set_mouse_cursor(kScrollCursor);
       return true;
     }
     else if (ink->isCelMovement()) {
       editor->hideDrawingCursor();
-      jmouse_set_cursor(kMoveCursor);
+      ui::set_mouse_cursor(kMoveCursor);
       return true;
     }
     else if (ink->isSlice()) {
-      jmouse_set_cursor(kNoCursor);
+      ui::set_mouse_cursor(kNoCursor);
       editor->showDrawingCursor();
       return true;
     }
@@ -470,13 +470,13 @@ bool StandbyState::onSetCursor(Editor* editor)
 
   // Draw
   if (editor->canDraw()) {
-    jmouse_set_cursor(kNoCursor);
+    ui::set_mouse_cursor(kNoCursor);
     editor->showDrawingCursor();
   }
   // Forbidden
   else {
     editor->hideDrawingCursor();
-    jmouse_set_cursor(kForbiddenCursor);
+    ui::set_mouse_cursor(kForbiddenCursor);
   }
 
   return true;
@@ -575,7 +575,7 @@ void StandbyState::transformSelection(Editor* editor, MouseMessage* msg, HandleT
 
     // TODO steal the PixelsMovement of the other editor and use it for this one.
     StatusBar::instance()->showTip(1000, "The sprite is locked in other editor");
-    jmouse_set_cursor(kForbiddenCursor);
+    ui::set_mouse_cursor(kForbiddenCursor);
   }
 }
 
@@ -680,7 +680,7 @@ bool StandbyState::Decorator::onSetCursor(Editor* editor)
 
   // Hide the drawing cursor (just in case) and show the new system cursor.
   editor->hideDrawingCursor();
-  jmouse_set_cursor(newCursor);
+  ui::set_mouse_cursor(newCursor);
   return true;
 }
 

src/app/ui/editor/zooming_state.cpp

@@ -76,7 +76,7 @@ bool ZoomingState::onMouseMove(Editor* editor, MouseMessage* msg)
 bool ZoomingState::onSetCursor(Editor* editor)
 {
   editor->hideDrawingCursor();
-  jmouse_set_cursor(kMagnifierCursor);
+  ui::set_mouse_cursor(kMagnifierCursor);
   return true;
 }
 

src/app/ui/mini_editor.cpp

@@ -103,7 +103,7 @@ protected:
     switch (msg->type()) {
 
       case kSetCursorMessage:
-        jmouse_set_cursor(kArrowCursor);
+        ui::set_mouse_cursor(kArrowCursor);
         return true;
     }
 

src/app/ui/skin/skin_theme.cpp

@@ -90,7 +90,7 @@ protected:
     switch (msg->type()) {
 
       case kSetCursorMessage:
-        jmouse_set_cursor(kArrowCursor);
+        ui::set_mouse_cursor(kArrowCursor);
         return true;
 
       case kKeyDownMessage:

src/app/ui/styled_button.cpp

@@ -40,7 +40,7 @@ StyledButton::StyledButton(const std::string& styleName) : Button("") {
 bool StyledButton::onProcessMessage(Message* msg) {
   switch (msg->type()) {
     case kSetCursorMessage:
-      jmouse_set_cursor(kHandCursor);
+      ui::set_mouse_cursor(kHandCursor);
       return true;
   }
   return Button::onProcessMessage(msg);

src/app/ui/timeline.cpp

@@ -1003,32 +1003,32 @@ void Timeline::setCursor(ui::Message* msg, const gfx::Point& mousePos)
 {
   // Scrolling.
   if (m_state == STATE_SCROLLING || m_scroll) {
-    jmouse_set_cursor(kScrollCursor);
+    ui::set_mouse_cursor(kScrollCursor);
   }
   // Moving.
   else if (m_state == STATE_MOVING_RANGE) {
     if (isCopyKeyPressed(msg))
-      jmouse_set_cursor(kArrowPlusCursor);
+      ui::set_mouse_cursor(kArrowPlusCursor);
     else
-      jmouse_set_cursor(kMoveCursor);
+      ui::set_mouse_cursor(kMoveCursor);
   }
   // Normal state.
   else if (m_hot_part == A_PART_HEADER_ONIONSKIN_RANGE_LEFT
     || m_state == STATE_MOVING_ONIONSKIN_RANGE_LEFT) {
-    jmouse_set_cursor(kSizeWCursor);
+    ui::set_mouse_cursor(kSizeWCursor);
   }
   else if (m_hot_part == A_PART_HEADER_ONIONSKIN_RANGE_RIGHT
     || m_state == STATE_MOVING_ONIONSKIN_RANGE_RIGHT) {
-    jmouse_set_cursor(kSizeECursor);
+    ui::set_mouse_cursor(kSizeECursor);
   }
   else if (m_hot_part == A_PART_RANGE_OUTLINE) {
-    jmouse_set_cursor(kMoveCursor);
+    ui::set_mouse_cursor(kMoveCursor);
   }
   else if (m_hot_part == A_PART_SEPARATOR) {
-    jmouse_set_cursor(kSizeWECursor);
+    ui::set_mouse_cursor(kSizeWECursor);
   }
   else {
-    jmouse_set_cursor(kArrowCursor);
+    ui::set_mouse_cursor(kArrowCursor);
   }
 }
 

src/ui/link_label.cpp

@@ -42,7 +42,7 @@ bool LinkLabel::onProcessMessage(Message* msg)
     case kSetCursorMessage:
       // TODO theme stuff
       if (isEnabled()) {
-        jmouse_set_cursor(kHandCursor);
+        set_mouse_cursor(kHandCursor);
         return true;
       }
       break;

src/ui/manager.cpp

@@ -119,7 +119,7 @@ Manager::~Manager()
   // Finish the main manager.
   if (m_defaultManager == this) {
     // No more cursor
-    jmouse_set_cursor(kNoCursor);
+    set_mouse_cursor(kNoCursor);
 
     // Destroy timers
     Timer::checkNoTimers();
@@ -161,7 +161,7 @@ void Manager::run()
     first_time = false;
 
     Manager::getDefault()->invalidate();
-    jmouse_set_cursor(kArrowCursor);
+    set_mouse_cursor(kArrowCursor);
   }
 
   while (!getChildren().empty())
@@ -221,7 +221,7 @@ void Manager::generateSetCursorMessage(const gfx::Point& mousePos)
     enqueueMessage(newMouseMessage(kSetCursorMessage, dst,
         mousePos, currentMouseButtons(0)));
   else
-    jmouse_set_cursor(kArrowCursor);
+    set_mouse_cursor(kArrowCursor);
 }
 
 static MouseButtons mouse_buttons_from_she_to_ui(const she::Event& sheEvent)
@@ -276,12 +276,12 @@ void Manager::generateMessagesFromSheEvents()
       }
 
       case she::Event::MouseEnter: {
-        jmouse_set_cursor(kArrowCursor);
+        set_mouse_cursor(kArrowCursor);
         break;
       }
 
       case she::Event::MouseLeave: {
-        jmouse_set_cursor(kOutsideDisplay);
+        set_mouse_cursor(kOutsideDisplay);
         setMouse(NULL);
 
         _internal_no_mouse_position();

src/ui/slider.cpp

@@ -229,12 +229,12 @@ void Slider::setupSliderCursor()
 {
   if (hasCapture()) {
     if (slider_press_left)
-      jmouse_set_cursor(kArrowCursor);
+      set_mouse_cursor(kArrowCursor);
     else
-      jmouse_set_cursor(kSizeWECursor);
+      set_mouse_cursor(kSizeWECursor);
   }
   else
-    jmouse_set_cursor(kArrowCursor);
+    set_mouse_cursor(kArrowCursor);
 }
 
 } // namespace ui

src/ui/splitter.cpp

@@ -166,9 +166,9 @@ bool Splitter::onProcessMessage(Message* msg)
 
         if (change_cursor) {
           if (getAlign() & JI_HORIZONTAL)
-            jmouse_set_cursor(kSizeWECursor);
+            set_mouse_cursor(kSizeWECursor);
           else
-            jmouse_set_cursor(kSizeNSCursor);
+            set_mouse_cursor(kSizeNSCursor);
           return true;
         }
       }

src/ui/system.cpp

@@ -165,9 +165,9 @@ int clock()
 
 void set_display(she::Display* display)
 {
-  CursorType cursor = jmouse_get_cursor();
+  CursorType cursor = get_mouse_cursor();
 
-  jmouse_set_cursor(kNoCursor);
+  set_mouse_cursor(kNoCursor);
   mouse_display = display;
 
   if (display) {
@@ -182,7 +182,7 @@ void set_display(she::Display* display)
       }
     }
 
-    jmouse_set_cursor(cursor);  // Restore mouse cursor
+    set_mouse_cursor(cursor);  // Restore mouse cursor
   }
 }
 
@@ -220,12 +220,12 @@ void set_use_native_cursors(bool state)
   use_native_mouse_cursor = state;
 }
 
-CursorType jmouse_get_cursor()
+CursorType get_mouse_cursor()
 {
   return mouse_cursor_type;
 }
 
-void jmouse_set_cursor(CursorType type)
+void set_mouse_cursor(CursorType type)
 {
   if (mouse_cursor_type == type)
     return;

src/ui/system.h

@@ -38,8 +38,8 @@ namespace ui {
   void update_cursor_overlay();
 
   void set_use_native_cursors(bool state);
-  CursorType jmouse_get_cursor();
+  CursorType get_mouse_cursor();
-  void jmouse_set_cursor(CursorType type);
+  void set_mouse_cursor(CursorType type);
 
   void jmouse_hide();
   void jmouse_show();

src/ui/textbox.cpp

@@ -96,7 +96,7 @@ bool TextBox::onProcessMessage(Message* msg)
       if (view) {
         captureMouse();
         m_oldPos = static_cast<MouseMessage*>(msg)->position();
-        jmouse_set_cursor(kScrollCursor);
+        set_mouse_cursor(kScrollCursor);
         return true;
       }
       break;
@@ -120,7 +120,7 @@ bool TextBox::onProcessMessage(Message* msg)
       View* view = View::getView(this);
       if (view && hasCapture()) {
         releaseMouse();
-        jmouse_set_cursor(kArrowCursor);
+        set_mouse_cursor(kArrowCursor);
         return true;
       }
       break;

src/ui/theme.cpp

@@ -42,12 +42,12 @@ Theme::~Theme()
 
 void Theme::regenerate()
 {
-  CursorType type = jmouse_get_cursor();
+  CursorType type = get_mouse_cursor();
-  jmouse_set_cursor(kNoCursor);
+  set_mouse_cursor(kNoCursor);
 
   onRegenerate();
 
-  jmouse_set_cursor(type);
+  set_mouse_cursor(type);
 }
 
 //////////////////////////////////////////////////////////////////////

src/ui/widget.cpp

@@ -1365,7 +1365,7 @@ bool Widget::onProcessMessage(Message* msg)
       if (getParent() != NULL)
         return getParent()->sendMessage(msg);
       else {
-        jmouse_set_cursor(kArrowCursor);
+        set_mouse_cursor(kArrowCursor);
         return true;
       }
 

src/ui/window.cpp

@@ -309,7 +309,7 @@ bool Window::onProcessMessage(Message* msg)
     case kMouseUpMessage:
       if (hasCapture()) {
         releaseMouse();
-        jmouse_set_cursor(kArrowCursor);
+        set_mouse_cursor(kArrowCursor);
 
         if (clickedWindowPos != NULL) {
           delete clickedWindowPos;
@@ -409,7 +409,7 @@ bool Window::onProcessMessage(Message* msg)
           case HitTestBorderS: cursor = kSizeSCursor; break;
         }
 
-        jmouse_set_cursor(cursor);
+        set_mouse_cursor(cursor);
         return true;
       }
       break;