TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
dxx-rebirth/common/ui/scroll.cpp

297 lines
8.4 KiB
C++
Raw Normal View History

initial import
2006-03-20 17:12:09 +00:00
/*
Changed custom D1X license to GPLv3
2014-06-01 17:55:23 +00:00
* Portions of this file are copyright Rebirth contributors and licensed as
* described in COPYING.txt.
* Portions of this file are copyright Parallax Software and licensed
* according to the Parallax license below.
* See COPYING.txt for license details.
initial import
2006-03-20 17:12:09 +00:00
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A
ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS
IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS
SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE
FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE
CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS
AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE.
COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
*/
#include <stdlib.h>
Remove fix.h
2012-07-01 02:54:33 +00:00
#include "maths.h"
initial import
2006-03-20 17:12:09 +00:00
#include "pstypes.h"
Pass the event to the individual gadgets' 'do' functions, fix compile warnings introduced in last commit
2011-10-25 01:39:35 +00:00
#include "event.h"
initial import
2006-03-20 17:12:09 +00:00
#include "gr.h"
#include "ui.h"
Make B1_JUST_PRESSED event-based, leave ui_dialog_do_gadgets early if a key makes another gadget current, make ui_button_do fully event-responsive (but won't *send* events yet)
2011-11-05 09:08:17 +00:00
#include "mouse.h"
initial import
2006-03-20 17:12:09 +00:00
#include "key.h"
#include "timer.h"
Uninline namespace dcx
2015-12-13 18:00:49 +00:00
namespace dcx {
Use inline namespace dcx for common/ui
2015-12-05 22:57:24 +00:00
All gadgets now send events
2012-03-03 12:19:15 +00:00
void ui_draw_scrollbar( UI_DIALOG *dlg, UI_GADGET_SCROLLBAR * scrollbar )
initial import
2006-03-20 17:12:09 +00:00
{
Make the editor draw the same for the non-ogl build as the ogl build, since I just made it draw the grey background over everything in the last commit. If you want to see what it's *supposed* to look like, go to yesterday's commit :P
2012-03-31 12:25:09 +00:00
#if 0 //ndef OGL
initial import
2006-03-20 17:12:09 +00:00
if (scrollbar->status==0)
return;
Make the main stuff (gadgets, two viewers) draw for the editor in ogl, still more tweaking required
2012-03-31 10:36:07 +00:00
#endif
initial import
2006-03-20 17:12:09 +00:00
scrollbar->status = 0;
gr_set_current_canvas( scrollbar->canvas );
Cache canvas in ui_draw_scrollbar
2017-02-11 21:42:37 +00:00
auto &canvas = *grd_curcanv;
initial import
2006-03-20 17:12:09 +00:00
Pass color to gr_rect
2016-02-12 04:02:28 +00:00
uint8_t color = (dlg->keyboard_focus_gadget == scrollbar)
? CRED
: CGREY;
initial import
2006-03-20 17:12:09 +00:00
Cache canvas in ui_draw_scrollbar
2017-02-11 21:42:37 +00:00
gr_rect(canvas, 0, 0, scrollbar->width - 1, scrollbar->fake_position - 1, color);
gr_rect(canvas, 0, scrollbar->fake_position + scrollbar->fake_size, scrollbar->width - 1, scrollbar->height - 1, color);
ui_draw_box_out(canvas, 0, scrollbar->fake_position, scrollbar->width - 1, scrollbar->fake_position + scrollbar->fake_size - 1);
initial import
2006-03-20 17:12:09 +00:00
}
Return unique_ptr from ui_add_gadget_scrollbar
2014-12-20 04:36:10 +00:00
std::unique_ptr<UI_GADGET_SCROLLBAR> ui_add_gadget_scrollbar(UI_DIALOG * dlg, short x, short y, short w, short h, int start, int stop, int position, int window_size)
initial import
2006-03-20 17:12:09 +00:00
{
Allow nullptr for gr_get_string_size
2015-09-29 02:41:22 +00:00
int tw;
initial import
2006-03-20 17:12:09 +00:00
Move ui_add_gadget_scrollbar arrows off stack
2015-04-02 02:36:56 +00:00
auto &up = "\x1e";
auto &down = "\x1f";
initial import
2006-03-20 17:12:09 +00:00
Pass font to gr_get_string_size
2017-01-08 22:31:59 +00:00
gr_get_string_size(*grd_curcanv->cv_font, up, &tw, nullptr, nullptr);
initial import
2006-03-20 17:12:09 +00:00
w = tw + 10;
if (stop < start ) stop = start;
Return unique_ptr from ui_add_gadget_scrollbar
2014-12-20 04:36:10 +00:00
std::unique_ptr<UI_GADGET_SCROLLBAR> scrollbar{ui_gadget_add<UI_GADGET_SCROLLBAR>(dlg, x, y+w, x+w-1, y+h-w-1)};
initial import
2006-03-20 17:12:09 +00:00
Rename ui/window.c to ui/dialog.c to avoid confusion with arch/sdl/window.c, also rename UI_WINDOW to UI_DIALOG, rename all associated functions, constants, parameters, local variables etc too; make a window when making a UI_DIALOG (does nothing yet)
2011-01-17 14:42:18 +00:00
scrollbar->up_button = ui_add_gadget_button( dlg, x, y, w, w, up, NULL );
Return unique_ptr from ui_add_gadget_scrollbar
2014-12-20 04:36:10 +00:00
scrollbar->up_button->parent = scrollbar.get();
initial import
2006-03-20 17:12:09 +00:00
Rename ui/window.c to ui/dialog.c to avoid confusion with arch/sdl/window.c, also rename UI_WINDOW to UI_DIALOG, rename all associated functions, constants, parameters, local variables etc too; make a window when making a UI_DIALOG (does nothing yet)
2011-01-17 14:42:18 +00:00
scrollbar->down_button =ui_add_gadget_button( dlg, x, y+h-w, w, w, down, NULL );
Return unique_ptr from ui_add_gadget_scrollbar
2014-12-20 04:36:10 +00:00
scrollbar->down_button->parent = scrollbar.get();
initial import
2006-03-20 17:12:09 +00:00
scrollbar->horz = 0;
scrollbar->width = scrollbar->x2-scrollbar->x1+1;
scrollbar->height = scrollbar->y2-scrollbar->y1+1;
scrollbar->start = start;
scrollbar->stop = stop;
scrollbar->position = position;
scrollbar->window_size = window_size;
scrollbar->fake_length = scrollbar->height;
scrollbar->fake_position = 0;
if (stop!=start)
scrollbar->fake_size = (window_size * scrollbar->height)/(stop-start+1+window_size);
else
scrollbar->fake_size = scrollbar->height;
if (scrollbar->fake_size < 7) scrollbar->fake_size = 7;
scrollbar->dragging = 0;
scrollbar->moved=0;
scrollbar->last_scrolled = 0;
return scrollbar;
}
Pass d_event arg by const&
2014-10-04 21:47:13 +00:00
window_event_result ui_scrollbar_do( UI_DIALOG *dlg, UI_GADGET_SCROLLBAR * scrollbar,const d_event &event )
initial import
2006-03-20 17:12:09 +00:00
{
int OnMe, OnSlider, keyfocus;
int oldpos, op;
Make ui_scroll_do fully event-responsive, make sure scrolling actually works by calling all controls' ui_*_do functions (like before)
2011-11-12 04:48:26 +00:00
int x, y, z;
Use enum for window event result
2014-08-06 02:10:49 +00:00
window_event_result rval = window_event_result::ignored;
Pass the event to the individual gadgets' 'do' functions, fix compile warnings introduced in last commit
2011-10-25 01:39:35 +00:00
Pass d_event arg by const&
2014-10-04 21:47:13 +00:00
if (event.type == EVENT_WINDOW_DRAW)
Make the main stuff (gadgets, two viewers) draw for the editor in ogl, still more tweaking required
2012-03-31 10:36:07 +00:00
{
ui_draw_scrollbar( dlg, scrollbar );
Use enum for window event result
2014-08-06 02:10:49 +00:00
return window_event_result::ignored;
Make the main stuff (gadgets, two viewers) draw for the editor in ogl, still more tweaking required
2012-03-31 10:36:07 +00:00
}
initial import
2006-03-20 17:12:09 +00:00
keyfocus = 0;
Remove unnecessary UI_GADGET* casts
2014-10-04 22:13:47 +00:00
if (dlg->keyboard_focus_gadget==scrollbar)
initial import
2006-03-20 17:12:09 +00:00
keyfocus = 1;
if (scrollbar->start==scrollbar->stop)
{
scrollbar->position = 0;
scrollbar->fake_position = 0;
All gadgets now send events
2012-03-03 12:19:15 +00:00
ui_draw_scrollbar( dlg, scrollbar );
Use enum for window event result
2014-08-06 02:10:49 +00:00
return window_event_result::ignored;
initial import
2006-03-20 17:12:09 +00:00
}
op = scrollbar->position;
oldpos = scrollbar->fake_position;
scrollbar->moved = 0;
Pass d_event arg by const&
2014-10-04 21:47:13 +00:00
if (keyfocus && event.type == EVENT_KEY_COMMAND)
Make ui_scroll_do fully event-responsive, make sure scrolling actually works by calling all controls' ui_*_do functions (like before)
2011-11-12 04:48:26 +00:00
{
int key;
key = event_key_get(event);
if (key & KEY_UP)
{
scrollbar->up_button->position = 2;
Use enum for window event result
2014-08-06 02:10:49 +00:00
rval = window_event_result::handled;
Make ui_scroll_do fully event-responsive, make sure scrolling actually works by calling all controls' ui_*_do functions (like before)
2011-11-12 04:48:26 +00:00
}
else if (key & KEY_DOWN)
{
scrollbar->down_button->position = 2;
Use enum for window event result
2014-08-06 02:10:49 +00:00
rval = window_event_result::handled;
Make ui_scroll_do fully event-responsive, make sure scrolling actually works by calling all controls' ui_*_do functions (like before)
2011-11-12 04:48:26 +00:00
}
}
Pass d_event arg by const&
2014-10-04 21:47:13 +00:00
else if (keyfocus && event.type == EVENT_KEY_RELEASE)
Make ui_scroll_do fully event-responsive, make sure scrolling actually works by calling all controls' ui_*_do functions (like before)
2011-11-12 04:48:26 +00:00
{
int key;
key = event_key_get(event);
if (key & KEY_UP)
{
scrollbar->up_button->position = 0;
Use enum for window event result
2014-08-06 02:10:49 +00:00
rval = window_event_result::handled;
Make ui_scroll_do fully event-responsive, make sure scrolling actually works by calling all controls' ui_*_do functions (like before)
2011-11-12 04:48:26 +00:00
}
else if (key & KEY_DOWN)
{
scrollbar->down_button->position = 0;
Use enum for window event result
2014-08-06 02:10:49 +00:00
rval = window_event_result::handled;
Make ui_scroll_do fully event-responsive, make sure scrolling actually works by calling all controls' ui_*_do functions (like before)
2011-11-12 04:48:26 +00:00
}
}
if (scrollbar->up_button->position!=0)
initial import
2006-03-20 17:12:09 +00:00
{
Introduced new data type fix64 to be used for new timers which can last 4462756 years instead of 9 hours; Introduced new timer functions to update and query program time; Used new timer all over the program except GameTime (which comes next)
2010-12-10 23:18:17 +00:00
if (timer_query() > scrollbar->last_scrolled + 1)
initial import
2006-03-20 17:12:09 +00:00
{
Introduced new data type fix64 to be used for new timers which can last 4462756 years instead of 9 hours; Introduced new timer functions to update and query program time; Used new timer all over the program except GameTime (which comes next)
2010-12-10 23:18:17 +00:00
scrollbar->last_scrolled = timer_query();
initial import
2006-03-20 17:12:09 +00:00
scrollbar->position--;
if (scrollbar->position < scrollbar->start )
scrollbar->position = scrollbar->start;
scrollbar->fake_position = scrollbar->position-scrollbar->start;
scrollbar->fake_position *= scrollbar->height-scrollbar->fake_size;
scrollbar->fake_position /= (scrollbar->stop-scrollbar->start);
}
}
Make ui_scroll_do fully event-responsive, make sure scrolling actually works by calling all controls' ui_*_do functions (like before)
2011-11-12 04:48:26 +00:00
if (scrollbar->down_button->position!=0)
initial import
2006-03-20 17:12:09 +00:00
{
Introduced new data type fix64 to be used for new timers which can last 4462756 years instead of 9 hours; Introduced new timer functions to update and query program time; Used new timer all over the program except GameTime (which comes next)
2010-12-10 23:18:17 +00:00
if (timer_query() > scrollbar->last_scrolled + 1)
initial import
2006-03-20 17:12:09 +00:00
{
Introduced new data type fix64 to be used for new timers which can last 4462756 years instead of 9 hours; Introduced new timer functions to update and query program time; Used new timer all over the program except GameTime (which comes next)
2010-12-10 23:18:17 +00:00
scrollbar->last_scrolled = timer_query();
initial import
2006-03-20 17:12:09 +00:00
scrollbar->position++;
if (scrollbar->position > scrollbar->stop )
scrollbar->position = scrollbar->stop;
scrollbar->fake_position = scrollbar->position-scrollbar->start;
scrollbar->fake_position *= scrollbar->height-scrollbar->fake_size;
scrollbar->fake_position /= (scrollbar->stop-scrollbar->start);
}
}
Remove unnecessary UI_GADGET* casts
2014-10-04 22:13:47 +00:00
OnMe = ui_mouse_on_gadget( scrollbar );
initial import
2006-03-20 17:12:09 +00:00
//gr_ubox(0, scrollbar->fake_position, scrollbar->width-1, scrollbar->fake_position+scrollbar->fake_size-1 );
Make ui_scroll_do fully event-responsive, make sure scrolling actually works by calling all controls' ui_*_do functions (like before)
2011-11-12 04:48:26 +00:00
if (B1_JUST_RELEASED)
initial import
2006-03-20 17:12:09 +00:00
scrollbar->dragging = 0;
//if (B1_PRESSED && OnMe )
// listbox->dragging = 1;
Make ui_scroll_do fully event-responsive, make sure scrolling actually works by calling all controls' ui_*_do functions (like before)
2011-11-12 04:48:26 +00:00
mouse_get_pos(&x, &y, &z);
initial import
2006-03-20 17:12:09 +00:00
OnSlider = 0;
Make ui_scroll_do fully event-responsive, make sure scrolling actually works by calling all controls' ui_*_do functions (like before)
2011-11-12 04:48:26 +00:00
if ((y >= scrollbar->fake_position+scrollbar->y1) && \
(y < scrollbar->fake_position+scrollbar->y1+scrollbar->fake_size) && OnMe )
initial import
2006-03-20 17:12:09 +00:00
OnSlider = 1;
if (B1_JUST_PRESSED && OnSlider )
{
scrollbar->dragging = 1;
Make ui_scroll_do fully event-responsive, make sure scrolling actually works by calling all controls' ui_*_do functions (like before)
2011-11-12 04:48:26 +00:00
scrollbar->drag_x = x;
scrollbar->drag_y = y;
initial import
2006-03-20 17:12:09 +00:00
scrollbar->drag_starting = scrollbar->fake_position;
Use enum for window event result
2014-08-06 02:10:49 +00:00
rval = window_event_result::handled;
Make ui_scroll_do fully event-responsive, make sure scrolling actually works by calling all controls' ui_*_do functions (like before)
2011-11-12 04:48:26 +00:00
}
else if (B1_JUST_PRESSED && OnMe)
{
scrollbar->dragging = 2; // outside the slider
Use enum for window event result
2014-08-06 02:10:49 +00:00
rval = window_event_result::handled;
initial import
2006-03-20 17:12:09 +00:00
}
Make ui_scroll_do fully event-responsive, make sure scrolling actually works by calling all controls' ui_*_do functions (like before)
2011-11-12 04:48:26 +00:00
if ((scrollbar->dragging == 2) && OnMe && !OnSlider && (timer_query() > scrollbar->last_scrolled + 4))
initial import
2006-03-20 17:12:09 +00:00
{
Introduced new data type fix64 to be used for new timers which can last 4462756 years instead of 9 hours; Introduced new timer functions to update and query program time; Used new timer all over the program except GameTime (which comes next)
2010-12-10 23:18:17 +00:00
scrollbar->last_scrolled = timer_query();
initial import
2006-03-20 17:12:09 +00:00
Make ui_scroll_do fully event-responsive, make sure scrolling actually works by calling all controls' ui_*_do functions (like before)
2011-11-12 04:48:26 +00:00
if ( y < scrollbar->fake_position+scrollbar->y1 )
initial import
2006-03-20 17:12:09 +00:00
{
// Page Up
scrollbar->position -= scrollbar->window_size;
if (scrollbar->position < scrollbar->start )
scrollbar->position = scrollbar->start;
} else {
// Page Down
scrollbar->position += scrollbar->window_size;
if (scrollbar->position > scrollbar->stop )
scrollbar->position = scrollbar->stop;
}
scrollbar->fake_position = scrollbar->position-scrollbar->start;
scrollbar->fake_position *= scrollbar->height-scrollbar->fake_size;
scrollbar->fake_position /= (scrollbar->stop-scrollbar->start);
}
Remove unnecessary UI_GADGET* casts
2014-10-04 22:13:47 +00:00
if ((selected_gadget==scrollbar) && (scrollbar->dragging == 1))
initial import
2006-03-20 17:12:09 +00:00
{
Make ui_scroll_do fully event-responsive, make sure scrolling actually works by calling all controls' ui_*_do functions (like before)
2011-11-12 04:48:26 +00:00
//x = scrollbar->drag_x;
scrollbar->fake_position = scrollbar->drag_starting + (y - scrollbar->drag_y );
initial import
2006-03-20 17:12:09 +00:00
if (scrollbar->fake_position<0)
{
scrollbar->fake_position = 0;
Make ui_scroll_do fully event-responsive, make sure scrolling actually works by calling all controls' ui_*_do functions (like before)
2011-11-12 04:48:26 +00:00
//y = scrollbar->fake_position + scrollbar->drag_y - scrollbar->drag_starting;
initial import
2006-03-20 17:12:09 +00:00
}
if (scrollbar->fake_position > (scrollbar->height-scrollbar->fake_size))
{
scrollbar->fake_position = (scrollbar->height-scrollbar->fake_size);
Make ui_scroll_do fully event-responsive, make sure scrolling actually works by calling all controls' ui_*_do functions (like before)
2011-11-12 04:48:26 +00:00
//y = scrollbar->fake_position + scrollbar->drag_y - scrollbar->drag_starting;
initial import
2006-03-20 17:12:09 +00:00
}
Make ui_scroll_do fully event-responsive, make sure scrolling actually works by calling all controls' ui_*_do functions (like before)
2011-11-12 04:48:26 +00:00
//mouse_set_pos( x, y );
initial import
2006-03-20 17:12:09 +00:00
scrollbar->position = scrollbar->fake_position;
scrollbar->position *= (scrollbar->stop-scrollbar->start);
scrollbar->position /= ( scrollbar->height-scrollbar->fake_size ) ;
scrollbar->position += scrollbar->start;
if (scrollbar->position > scrollbar->stop )
scrollbar->position = scrollbar->stop;
if (scrollbar->position < scrollbar->start )
scrollbar->position = scrollbar->start;
//scrollbar->fake_position = scrollbar->position-scrollbar->start;
//scrollbar->fake_position *= scrollbar->height-scrollbar->fake_size;
//scrollbar->fake_position /= (scrollbar->stop-scrollbar->start);
}
if (op != scrollbar->position )
scrollbar->moved = 1;
All gadgets now send events
2012-03-03 12:19:15 +00:00
if (scrollbar->moved)
{
Pass window_event_result from a dialog handler all the way to the event system In particular, window_event_result::deleted so the event system doesn't have to rely on the somewhat problematic window_exists. If a gadget is manipulated, it still returns at least window_event_result::handled so all the other gadgets in all the other windows don't have to be checked (that weren't already checked).
2016-10-27 11:42:48 +00:00
rval = ui_gadget_send_event(dlg, EVENT_UI_GADGET_PRESSED, scrollbar);
if (rval == window_event_result::ignored)
rval = window_event_result::handled;
All gadgets now send events
2012-03-03 12:19:15 +00:00
}
initial import
2006-03-20 17:12:09 +00:00
if (oldpos != scrollbar->fake_position)
scrollbar->status = 1;
Pass the event to the individual gadgets' 'do' functions, fix compile warnings introduced in last commit
2011-10-25 01:39:35 +00:00
return rval;
initial import
2006-03-20 17:12:09 +00:00
}
Use inline namespace dcx for common/ui
2015-12-05 22:57:24 +00:00
}
Reference in a new issue Copy permalink