ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop'

This commit is contained in:
Jack Punter 2022-06-06 15:03:42 +01:00
parent c38c7384b9 4a8265048d
commit 362a85373a
3 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
custom/4coder_lister_base.cpp
View File

@ -295,6 +295,9 @@ lister_render(Application_Links *app, Frame_Info frame_info, View_ID view){
i32 first_index = (i32)(scroll_y/block_height);
y_pos += first_index*block_height;
i32 max_count = first_index + lister->visible_count + 3;
count = clamp_top(lister->filtered.count, max_count);
for (i32 i = first_index; i < count; i += 1){
Lister_Node *node = lister->filtered.node_ptrs[i];

46
platform_win32/win32_4ed.cpp
View File

@ -9,8 +9,8 @@
// TOP
#define FPS 60
#define frame_useconds (1000000 / FPS)
// #define FPS 144
// #define frame_useconds (1000000 / FPS)
#include <stdio.h>
@ -299,14 +299,35 @@ system_get_proc_sig(){
return((Void_Func*)(GetProcAddress(lib, proc_name)));
}
////////////////////////////////
//-
internal void
system_schedule_step(u32 code){
PostMessage(win32vars.window_handle, WM_4coder_ANIMATE, code, 0);
}
////////////////////////////////
//-
// NOTE(jack): Query win32 API to get montior refresh rate.
internal u64
win32_get_frame_rate() {
u64 frame_rate = 60;
DEVMODE device_mode = { 0 };
// memset(&device_mode, 0, sizeof(DEVMODE));
device_mode.dmSize = sizeof(DEVMODE);
device_mode.dmDriverExtra = 0;
// If the Display settings can be retrieved use the device's refresh rate
if(EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &device_mode) != 0){
frame_rate = device_mode.dmDisplayFrequency;
}
return frame_rate;
}
//-
internal void
win32_toggle_fullscreen(){
@ -369,7 +390,7 @@ system_set_key_mode_sig(){
win32vars.key_mode = mode;
}
////////////////////////////////
//-
// NOTE(allen): Clipboard
internal String_Const_u8
@ -870,7 +891,7 @@ win32_free_object(Win32_Object *object){
dll_insert(&win32vars.free_win32_objects, &object->node);
}
////////////////////////////////
//-
internal
system_now_time_sig(){
@ -977,7 +998,7 @@ system_sleep_sig(){
Sleep(milliseconds);
}
////////////////////////////////
//-
internal DWORD CALL_CONVENTION
win32_thread_wrapper(void *ptr){
@ -1117,7 +1138,7 @@ system_condition_variable_free_sig(){
}
}
////////////////////////////////
//-
internal LRESULT CALL_CONVENTION
win32_proc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam){
@ -1415,7 +1436,7 @@ win32_proc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam){
return(result);
}
////////////////////////////////
//-
internal b32
win32_wgl_good(Void_Func *f){
@ -1664,7 +1685,7 @@ win32_gl_create_window(HWND *wnd_out, HGLRC *context_out, DWORD style, RECT rect
return(result);
}
////////////////////////////////
//-
int CALL_CONVENTION
WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow){
@ -2007,6 +2028,11 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdS
SetActiveWindow(win32vars.window_handle);
ShowWindow(win32vars.window_handle, SW_SHOW);
//- @Added by jack
u64 frame_rate = win32_get_frame_rate();
u64 frame_useconds = (1000000 / frame_rate);
//-
win32vars.global_frame_mutex = system_mutex_make();
system_acquire_global_frame_mutex(win32vars.tctx);

3
platform_win32/win32_4ed_functions.cpp
View File

@ -335,6 +335,7 @@ system_get_file_list_sig(){
result.infos[counter] = node;
counter += 1;
}
FindClose(search);
}
return(result);
@ -474,7 +475,7 @@ color_picker_hook(HWND Window, UINT Message, WPARAM WParam, LPARAM LParam){
if(GetDlgCtrlID(swatch_window) == 0x2c5)
{
CHOOSECOLORW *win32_params =
(CHOOSECOLORW *)GetWindowLongPtr(Window, GWLP_USERDATA);
(CHOOSECOLORW *)GetWindowLongPtr(Window, GWLP_USERDATA);
if(win32_params)
{
Color_Picker *picker = (Color_Picker*)win32_params->lCustData;