AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-16 11:06:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Input on table barely works now

Browse Source
This commit is contained in:
UnknownShadow200 2018-12-26 20:44:24 +11:00
parent 71fe0ea6fe
commit a52f45a5ca
3 changed files with 102 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/LScreens.c
View File

@ -50,19 +50,8 @@ static void LScreen_Tick(struct LScreen* s) {
if (w && w->VTABLE->Tick) w->VTABLE->Tick(w); if (w && w->VTABLE->Tick) w->VTABLE->Tick(w);
} }
CC_NOINLINE static void LScreen_HoverWidget(struct LScreen* s, struct LWidget* w) { static void LScreen_HoverWidget(struct LScreen* s, struct LWidget* w) { }
if (!w) return; static void LScreen_UnhoverWidget(struct LScreen* s, struct LWidget* w) { }
w->Hovered = true;
s->HoveredWidget = w;
if (w->VTABLE->OnHover) w->VTABLE->OnHover(w);
}
CC_NOINLINE static void LScreen_UnhoverWidget(struct LScreen* s, struct LWidget* w) {
if (!w) return;
w->Hovered = false;
s->HoveredWidget = NULL;
if (w->VTABLE->OnUnhover) w->VTABLE->OnUnhover(w);
}
CC_NOINLINE static void LScreen_SelectWidget(struct LScreen* s, struct LWidget* w, bool was) { CC_NOINLINE static void LScreen_SelectWidget(struct LScreen* s, struct LWidget* w, bool was) {
if (!w) return; if (!w) return;
@ -110,13 +99,13 @@ static void LScreen_KeyDown(struct LScreen* s, Key key) {
s->OnEnterWidget->OnClick(s->OnEnterWidget, Mouse_X, Mouse_Y); s->OnEnterWidget->OnClick(s->OnEnterWidget, Mouse_X, Mouse_Y);
} }
} else if (s->SelectedWidget) { } else if (s->SelectedWidget) {
s->SelectedWidget->VTABLE->OnKeyDown(s->SelectedWidget, key); s->SelectedWidget->VTABLE->KeyDown(s->SelectedWidget, key);
} }
} }
static void LScreen_KeyPress(struct LScreen* s, char key) { static void LScreen_KeyPress(struct LScreen* s, char key) {
if (!s->SelectedWidget) return; if (!s->SelectedWidget) return;
s->SelectedWidget->VTABLE->OnKeyPress(s->SelectedWidget, key); s->SelectedWidget->VTABLE->KeyPress(s->SelectedWidget, key);
} }
static void LScreen_MouseDown(struct LScreen* s, MouseButton btn) { static void LScreen_MouseDown(struct LScreen* s, MouseButton btn) {
@ -142,10 +131,25 @@ static void LScreen_MouseUp(struct LScreen* s, MouseButton btn) {
static void LScreen_MouseMove(struct LScreen* s, int deltaX, int deltaY) { static void LScreen_MouseMove(struct LScreen* s, int deltaX, int deltaY) {
struct LWidget* over = LScreen_WidgetAt(s, Mouse_X, Mouse_Y); struct LWidget* over = LScreen_WidgetAt(s, Mouse_X, Mouse_Y);
struct LWidget* prev = s->HoveredWidget; struct LWidget* prev = s->HoveredWidget;
if (over == prev) return; /* TODO: ... */
if (over == prev) return; if (prev) {
if (prev) s->UnhoverWidget(s, prev); prev->Hovered = false;
if (over) s->HoverWidget(s, over); s->HoveredWidget = NULL;
s->UnhoverWidget(s, prev);
if (!prev->VTABLE->MouseLeft) return;
prev->VTABLE->MouseLeft(prev);
}
if (over) {
over->Hovered = true;
s->HoveredWidget = over;
s->HoverWidget(s, over);
if (!over->VTABLE->MouseMove) return;
over->VTABLE->MouseMove(over, deltaX, deltaY);
}
} }
static void LScreen_MouseWheel(struct LScreen* s, float delta) { } static void LScreen_MouseWheel(struct LScreen* s, float delta) { }
@ -790,8 +794,6 @@ static void MainScreen_HoverWidget(struct LScreen* s_, struct LWidget* w) {
String str; char strBuffer[STRING_SIZE]; String str; char strBuffer[STRING_SIZE];
struct MainScreen* s = (struct MainScreen*)s_; struct MainScreen* s = (struct MainScreen*)s_;
struct ResumeInfo info; struct ResumeInfo info;
LScreen_HoverWidget(s_, w);
if (s->SigningIn || w != (struct LWidget*)&s->BtnResume) return; if (s->SigningIn || w != (struct LWidget*)&s->BtnResume) return;
MainScreen_UNSAFE_GetResume(&info, false); MainScreen_UNSAFE_GetResume(&info, false);
@ -812,7 +814,6 @@ static void MainScreen_HoverWidget(struct LScreen* s_, struct LWidget* w) {
static void MainScreen_UnhoverWidget(struct LScreen* s_, struct LWidget* w) { static void MainScreen_UnhoverWidget(struct LScreen* s_, struct LWidget* w) {
struct MainScreen* s = (struct MainScreen*)s_; struct MainScreen* s = (struct MainScreen*)s_;
LScreen_UnhoverWidget(s_, w);
if (s->SigningIn || w != (struct LWidget*)&s->BtnResume) return; if (s->SigningIn || w != (struct LWidget*)&s->BtnResume) return;
LLabel_SetText(&s->LblStatus, &String_Empty); LLabel_SetText(&s->LblStatus, &String_Empty);
@ -1162,6 +1163,12 @@ static void ServersScreen_HashChanged(struct LInput* w) {
LWidget_Draw(&s->Table); LWidget_Draw(&s->Table);
} }
static void ServersScreen_OnSelectedChanged(void) {
struct ServersScreen* s = &ServersScreen_Instance;
LWidget_Redraw(&s->IptHash);
LWidget_Draw(&s->Table);
}
static void ServersScreen_InitWidgets(struct LScreen* s_) { static void ServersScreen_InitWidgets(struct LScreen* s_) {
struct ServersScreen* s = (struct ServersScreen*)s_; struct ServersScreen* s = (struct ServersScreen*)s_;
s->Widgets = s->_widgets; s->Widgets = s->_widgets;
@ -1184,6 +1191,7 @@ static void ServersScreen_InitWidgets(struct LScreen* s_) {
LTable_Init(&s->Table, &Launcher_TextFont, &s->RowFont); LTable_Init(&s->Table, &Launcher_TextFont, &s->RowFont);
s->Table.Filter = &s->IptSearch.Text; s->Table.Filter = &s->IptSearch.Text;
s->Table.SelectedHash = &s->IptHash.Text; s->Table.SelectedHash = &s->IptHash.Text;
s->Table.OnSelectedChanged = ServersScreen_OnSelectedChanged;
s->Widgets[s->NumWidgets++] = (struct LWidget*)&s->Table; s->Widgets[s->NumWidgets++] = (struct LWidget*)&s->Table;
} }

207
src/LWidgets.c
View File

@ -126,11 +126,12 @@ static void LButton_Draw(void* widget) {
if (!w->Hovered) Drawer2D_Cols['f'] = Drawer2D_Cols['F']; if (!w->Hovered) Drawer2D_Cols['f'] = Drawer2D_Cols['F'];
Launcher_MarkDirty(w->X, w->Y, w->Width, w->Height); Launcher_MarkDirty(w->X, w->Y, w->Width, w->Height);
} }
static void LButton_Hover(void* w, int x, int y) { LButton_Draw(w); }
static struct LWidgetVTABLE lbutton_VTABLE = { static struct LWidgetVTABLE lbutton_VTABLE = {
LButton_Draw, NULL, LButton_Draw, NULL,
NULL, NULL, /* Key */ NULL, NULL, /* Key */
LButton_Draw, LButton_Draw, /* Hover */ LButton_Hover, LButton_Draw, /* Hover */
NULL, NULL /* Select */ NULL, NULL /* Select */
}; };
void LButton_Init(struct LButton* w, const FontDesc* font, int width, int height) { void LButton_Init(struct LButton* w, const FontDesc* font, int width, int height) {
@ -706,8 +707,9 @@ static void LTable_SetSelectedTo(struct LTable* w, int index) {
if (index >= w->RowsCount) index = w->RowsCount - 1; if (index >= w->RowsCount) index = w->RowsCount - 1;
if (index < 0) index = 0; if (index < 0) index = 0;
String_Copy(w->Filter, &LTable_Get(index)->Hash); String_Copy(w->SelectedHash, &LTable_Get(index)->Hash);
LTable_ShowSelected(w); LTable_ShowSelected(w);
w->OnSelectedChanged();
} }
#define GRIDLINE_SIZE 2 #define GRIDLINE_SIZE 2
@ -749,18 +751,18 @@ static BitmapCol LTable_RowCol(struct LTable* w, struct ServerInfo* row) {
static void LTable_DrawRowsBackground(struct LTable* w) { static void LTable_DrawRowsBackground(struct LTable* w) {
struct ServerInfo* entry; struct ServerInfo* entry;
BitmapCol col; BitmapCol col;
int y, height, row, end; int y, height, row;
y = w->RowsBegY; y = w->RowsBegY;
end = w->TopRow + w->VisibleRows; for (row = w->TopRow; ; row++, y += w->RowHeight) {
for (row = w->TopRow; row < end; row++, y += w->RowHeight) {
entry = row < w->RowsCount ? LTable_Get(row) : NULL; entry = row < w->RowsCount ? LTable_Get(row) : NULL;
col = LTable_RowCol(w, entry); col = LTable_RowCol(w, entry);
if (!col.A) continue; if (!col.A) continue;
/* last row may get chopped off */ /* last row may get chopped off */
height = min(y + w->RowHeight, w->RowsEndY) - y; height = min(y + w->RowHeight, w->RowsEndY) - y;
/* hit the end of the table */
if (height < 0) break;
Drawer2D_Clear(&Launcher_Framebuffer, col, Drawer2D_Clear(&Launcher_Framebuffer, col,
w->X, y, w->Width, height); w->X, y, w->Width, height);
@ -863,16 +865,16 @@ static void LTable_DrawScrollbar(struct LTable* w) {
x, w->Y + y, SCROLLBAR_WIDTH, height); x, w->Y + y, SCROLLBAR_WIDTH, height);
} }
static void LTable_HandleKeyDown(struct LTable* w, Key key) { static void LTable_KeyDown(struct LTable* w, Key key) {
int index = LTable_GetSelectedIndex(w); int index = LTable_GetSelectedIndex(w);
if (key == KEY_UP) { if (key == KEY_UP) {
index++;
} else if (key == KEY_DOWN) {
index--; index--;
} else if (key == KEY_DOWN) {
index++;
} else if (key == KEY_PAGEUP) { } else if (key == KEY_PAGEUP) {
index += w->VisibleRows;
} else if (key == KEY_PAGEDOWN) {
index -= w->VisibleRows; index -= w->VisibleRows;
} else if (key == KEY_PAGEDOWN) {
index += w->VisibleRows;
} else { return; } } else { return; }
LTable_SetSelectedTo(w, index); LTable_SetSelectedTo(w, index);
@ -897,150 +899,62 @@ static void LTable_MouseMove(struct LTable* w, int deltaX, int deltaY) {
} }
} }
static void LTable_MouseDown(struct LTable* w) { static void LTable_RowsClick(struct LTable* w) {
int x = Mouse_X - w->X, y = Mouse_Y - w->Y; int mouseY = Mouse_Y - w->RowsBegY;
LTable_SetSelectedTo(w, w->TopRow + mouseY / w->RowHeight);
if (x >= w->X + w->Width - SCROLLBAR_WIDTH) {
//ScrollbarClick(mouseY);
w->DraggingScrollbar = true;
//lastIndex = -10; return;
}
if (y < w->HdrHeight) {
//SelectHeader(mouseX, mouseY);
} else {
//GetSelectedServer(mouseX, mouseY);
}
} }
/*void TableNeedsRedrawHandler(); static void LTable_HeadersClick(struct LTable* w) {
int x, i, mouseX = Mouse_X - w->X;
DefaultComparer defComp = new DefaultComparer(); for (i = 0, x = w->X; i < w->NumColumns; i++) {
NameComparer nameComp = new NameComparer(); /* clicked on gridline, begin dragging */
PlayersComparer playerComp = new PlayersComparer(); if (mouseX >= (x - 8) && mouseX < (x + 8) && w->Columns[i].Interactable) {
UptimeComparer uptimeComp = new UptimeComparer(); w->DraggingColumn = i;
SoftwareComparer softwareComp = new SoftwareComparer();
internal int DraggingColumn = -1;
internal bool DraggingScrollbar = false;
internal int mouseOffset;
void SortDefault() {
SortEntries(defComp, true);
}
void SelectHeader(int mouseX, int mouseY) {
int x = X + 15;
for (int i = 0; i < ColumnWidths.Length; i++) {
x += ColumnWidths[i] + 10;
if (mouseX >= x - 8 && mouseX < x + 8) {
DraggingColumn = i;
lastIndex = -10; return;
}
}
TrySortColumns(mouseX);
}
void TrySortColumns(int mouseX) {
int x = X + TableView.flagPadding;
if (mouseX >= x && mouseX < x + ColumnWidths[0]) {
SortEntries(nameComp, false); return;
}
x += ColumnWidths[0] + 10;
if (mouseX >= x && mouseX < x + ColumnWidths[1]) {
SortEntries(playerComp, false); return;
}
x += ColumnWidths[1] + 10;
if (mouseX >= x && mouseX < x + ColumnWidths[2]) {
SortEntries(uptimeComp, false); return;
}
x += ColumnWidths[2] + 10;
if (mouseX >= x) {
SortEntries(softwareComp, false); return;
}
}
void SortEntries(TableEntryComparer comparer, bool noRedraw) {
Array.Sort(entries, 0, entries.Length, comparer);
lastIndex = -10;
if (curFilter != null && curFilter.Length > 0) {
FilterEntries(curFilter);
}
if (noRedraw) return;
comparer.Invert = !comparer.Invert;
SetSelected(SelectedHash);
NeedRedraw();
}
void GetSelectedServer(int mouseX, int mouseY) {
for (int i = 0; i < Count; i++) {
TableEntry entry = Get(i);
if (mouseY < entry.Y || mouseY >= entry.Y + entry.Height + 2) continue;
if (lastIndex == i) {
Launcher_ConnectToServer(entry.Hash);
return; return;
} }
SetSelected(i); x += w->Columns[i].Width;
NeedRedraw(); if (w->Columns[i].ColumnGridline) x += GRIDLINE_SIZE;
break; }
for (i = 0, x = w->X; i < w->NumColumns; i++) {
if (mouseX >= x && mouseX < (x + w->Columns[i].Width) && w->Columns[i].Interactable) {
/* TODO: Fix this.. */
//LTable_Sort(w);
return;
}
} }
} }
void MouseDown(int mouseX, int mouseY) { /* Handles clicking on the scrollbar on right edge of table */
if (mouseX >= Window.Width - 10) { static void LTable_ScrollbarClick(struct LTable* w) {
ScrollbarClick(mouseY); int y, height, mouseY = Mouse_Y - w->Y;
DraggingScrollbar = true; LTable_GetScrollbarCoords(w, &y, &height);
lastIndex = -10; return;
}
if (mouseY >= view.headerStartY && mouseY < view.headerEndY) {
SelectHeader(mouseX, mouseY);
} else {
GetSelectedServer(mouseX, mouseY);
}
}
int lastIndex = -10;
void MouseMove(int x, int y, int deltaX, int deltaY) {
if (DraggingScrollbar) {
y -= Y;
float scale = Height / (float)Count;
CurrentIndex = (int)((y - mouseOffset) / scale);
ClampIndex();
NeedRedraw();
} else if (DraggingColumn >= 0) {
if (x >= Window.Width - 20) return;
int col = DraggingColumn;
ColumnWidths[col] += deltaX;
Utils.Clamp(ref ColumnWidths[col], 20, Window.Width - 20);
NeedRedraw();
}
}
void ScrollbarClick(int mouseY) {
mouseY -= Y;
int y, height;
GetScrollbarCoords(out y, out height);
int delta = (view.maxIndex - CurrentIndex);
if (mouseY < y) { if (mouseY < y) {
CurrentIndex -= delta; w->TopRow -= w->VisibleRows;
} else if (mouseY >= y + height) { } else if (mouseY >= y + height) {
CurrentIndex += delta; w->TopRow += w->VisibleRows;
} else { } else {
DraggingScrollbar = true; w->MouseOffset = mouseY - y;
mouseOffset = mouseY - y;
}
ClampIndex();
NeedRedraw();
} }
LTable_ClampTopRow(w);
}
static void LTable_MouseDown(struct LTable* w, bool wasSelected) {
if (Mouse_X >= Game_Width - SCROLLBAR_WIDTH) {
LTable_ScrollbarClick(w);
w->DraggingScrollbar = true;
//lastIndex = -10;
} else if (Mouse_Y < w->RowsBegY) {
LTable_HeadersClick(w);
} else {
LTable_RowsClick(w);
}
LWidget_Draw(w);
} }
*/
/* Default sort order. (most active server, then by highest uptime) */ /* Default sort order. (most active server, then by highest uptime) */
static int LTable_DefaultSort(struct ServerInfo* a, struct ServerInfo* b) { static int LTable_DefaultSort(struct ServerInfo* a, struct ServerInfo* b) {
@ -1064,7 +978,7 @@ void LTable_Reposition(struct LTable* w) {
w->RowsEndY = w->Y + w->Height; w->RowsEndY = w->Y + w->Height;
rowsHeight = w->Height - (w->RowsBegY - w->Y); rowsHeight = w->Height - (w->RowsBegY - w->Y);
w->VisibleRows = Math_CeilDiv(rowsHeight, w->RowHeight); w->VisibleRows = rowsHeight / w->RowHeight;
LTable_ClampTopRow(w); LTable_ClampTopRow(w);
} }
@ -1079,9 +993,9 @@ static void LTable_Draw(void* widget) {
static struct LWidgetVTABLE ltable_VTABLE = { static struct LWidgetVTABLE ltable_VTABLE = {
LTable_Draw, NULL, LTable_Draw, NULL,
NULL, NULL, /* Key */ LTable_KeyDown, NULL, /* Key */
NULL, NULL, /* Hover */ LTable_MouseMove, NULL, /* Hover */
NULL, NULL /* Select */ LTable_MouseDown, LTable_StopDragging /* Select */
}; };
void LTable_Init(struct LTable* w, const FontDesc* hdrFont, const FontDesc* rowFont) { void LTable_Init(struct LTable* w, const FontDesc* hdrFont, const FontDesc* rowFont) {
w->VTABLE = &ltable_VTABLE; w->VTABLE = &ltable_VTABLE;
@ -1155,8 +1069,7 @@ void LTable_ShowSelected(struct LTable* w) {
if (i == -1) return; if (i == -1) return;
if (i >= w->TopRow + w->VisibleRows) { if (i >= w->TopRow + w->VisibleRows) {
/* leave one row below selected NOPE TODO FIX... */ w->TopRow = i - (w->VisibleRows - 1);
w->TopRow = i - w->VisibleRows;
} }
if (i < w->TopRow) w->TopRow = i; if (i < w->TopRow) w->TopRow = i;
LTable_ClampTopRow(w); LTable_ClampTopRow(w);

11
src/LWidgets.h
View File

@ -13,13 +13,13 @@ struct LWidgetVTABLE {
/* Called repeatedly to update this widget when selected. */ /* Called repeatedly to update this widget when selected. */
void (*Tick)(void* widget); void (*Tick)(void* widget);
/* Called when key is pressed and this widget is selected. */ /* Called when key is pressed and this widget is selected. */
void (*OnKeyDown)(void* widget, Key key); void (*KeyDown)(void* widget, Key key);
/* Called when key is pressed and this widget is selected. */ /* Called when key is pressed and this widget is selected. */
void (*OnKeyPress)(void* widget, char c); void (*KeyPress)(void* widget, char c);
/* Called when mouse hovers over this widget. */ /* Called when mouse hovers/moves over this widget. */
void (*OnHover)(void* widget); void (*MouseMove)(void* widget, int deltaX, int deltaY);
/* Called when mouse moves away from this widget. */ /* Called when mouse moves away from this widget. */
void (*OnUnhover)(void* widget); void (*MouseLeft)(void* widget);
/* Called when mouse clicks on this widget. */ /* Called when mouse clicks on this widget. */
/* NOTE: This function is just for general widget behaviour. */ /* NOTE: This function is just for general widget behaviour. */
/* OnClick callback is for per-widget instance behaviour. */ /* OnClick callback is for per-widget instance behaviour. */
@ -169,6 +169,7 @@ struct LTable {
int DraggingColumn; int DraggingColumn;
/* Whether scrollbar is currently being dragged up or down. */ /* Whether scrollbar is currently being dragged up or down. */
bool DraggingScrollbar; bool DraggingScrollbar;
/* Offset of mouse for scrollbar dragging. */
int MouseOffset; int MouseOffset;
}; };
/* Initialises a table. */ /* Initialises a table. */