fix set_file_list a bit + add clipboard paste
This commit is contained in:
insofaras
Allen Webster
parent
2f1486c9dd
commit
edd6ead966
163
linux_4ed.cpp
163
linux_4ed.cpp
|
|
@ -72,6 +72,10 @@ struct Linux_Vars{
|
|||
Mouse_State mouse_data;
|
||||
|
||||
String clipboard_contents;
|
||||
String clipboard_outgoing;
|
||||
|
||||
Atom atom_CLIPBOARD;
|
||||
Atom atom_UTF8_STRING;
|
||||
|
||||
void *app_code;
|
||||
void *custom;
|
||||
|
|
@ -89,6 +93,8 @@ struct Linux_Vars{
|
|||
Font_Load_System fnt;
|
||||
};
|
||||
|
||||
#define LINUX_MAX_PASTE_CHARS 0x10000L
|
||||
|
||||
globalvar Linux_Vars linuxvars;
|
||||
globalvar Application_Memory memory_vars;
|
||||
globalvar Exchange exchange_vars;
|
||||
|
|
@ -180,6 +186,21 @@ Sys_Free_Memory_Sig(system_free_memory){
|
|||
LinuxFreeMemory(block);
|
||||
}
|
||||
|
||||
internal void
|
||||
LinuxStringDup(String* str, void* data, size_t size){
|
||||
if(str->memory_size < size){
|
||||
if(str->str){
|
||||
LinuxFreeMemory(str->str);
|
||||
}
|
||||
str->memory_size = size;
|
||||
str->str = (char*)LinuxGetMemory(size);
|
||||
//TODO(inso): handle alloc failure case
|
||||
}
|
||||
|
||||
str->size = size;
|
||||
memcpy(str->str, data, size);
|
||||
}
|
||||
|
||||
#if (defined(_BSD_SOURCE) || defined(_SVID_SOURCE))
|
||||
#define TimeBySt
|
||||
#endif
|
||||
|
|
@ -231,9 +252,11 @@ Sys_Set_File_List_Sig(system_set_file_list){
|
|||
i32 count, file_count, size, required_size;
|
||||
|
||||
terminate_with_null(&directory);
|
||||
|
||||
d = opendir(directory.str);
|
||||
if (d){
|
||||
count = 0;
|
||||
file_count = 0;
|
||||
for (entry = readdir(d);
|
||||
entry != 0;
|
||||
entry = readdir(d)){
|
||||
|
|
@ -242,7 +265,6 @@ Sys_Set_File_List_Sig(system_set_file_list){
|
|||
for (size = 0; fname[size]; ++size);
|
||||
count += size + 1;
|
||||
}
|
||||
closedir(d);
|
||||
|
||||
required_size = count + file_count * sizeof(File_Info);
|
||||
if (file_list->block_size < required_size){
|
||||
|
|
@ -253,8 +275,7 @@ Sys_Set_File_List_Sig(system_set_file_list){
|
|||
file_list->infos = (File_Info*)file_list->block;
|
||||
cursor = (char*)(file_list->infos + file_count);
|
||||
|
||||
d = opendir(directory.str);
|
||||
if (d){
|
||||
rewinddir(d);
|
||||
info_ptr = file_list->infos;
|
||||
for (entry = readdir(d);
|
||||
entry != 0;
|
||||
|
|
@ -263,23 +284,32 @@ Sys_Set_File_List_Sig(system_set_file_list){
|
|||
cursor_start = cursor;
|
||||
for (; *fname; ) *cursor++ = *fname++;
|
||||
|
||||
// TODO(allen): detect file/folder status
|
||||
// (also make sure this even GETS folders!!!)
|
||||
#ifdef _DIRENT_HAVE_D_TYPE
|
||||
if(entry->d_type != DT_UNKNOWN){
|
||||
info_ptr->folder = entry->d_type == DT_DIR;
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
struct stat st;
|
||||
if(lstat(entry->d_name, &st) != -1){
|
||||
info_ptr->folder = S_ISDIR(st.st_mode);
|
||||
} else {
|
||||
info_ptr->folder = 0;
|
||||
}
|
||||
}
|
||||
|
||||
info_ptr->filename.str = cursor_start;
|
||||
info_ptr->filename.size = (i32)(cursor - cursor_start);
|
||||
*cursor++ = 0;
|
||||
info_ptr->filename.memory_size = info_ptr->filename.size + 1;
|
||||
}
|
||||
}
|
||||
closedir(d);
|
||||
}
|
||||
closedir(d);
|
||||
}
|
||||
|
||||
Sys_Post_Clipboard_Sig(system_post_clipboard){
|
||||
// TODO(allen): Implement
|
||||
AllowLocal(str);
|
||||
LinuxStringDup(&linuxvars.clipboard_outgoing, str.str, str.size);
|
||||
XSetSelectionOwner(linuxvars.XDisplay, linuxvars.atom_CLIPBOARD, linuxvars.XWindow, CurrentTime);
|
||||
}
|
||||
|
||||
Sys_CLI_Call_Sig(system_cli_call){
|
||||
|
|
@ -573,6 +603,8 @@ LinuxLoadSystemCode(){
|
|||
linuxvars.system->internal_sentinel = internal_sentinel;
|
||||
linuxvars.system->internal_get_thread_states = internal_get_thread_states;
|
||||
linuxvars.system->internal_debug_message = internal_debug_message;
|
||||
|
||||
linuxvars.system->slash = '/';
|
||||
}
|
||||
|
||||
internal void
|
||||
|
|
@ -591,7 +623,7 @@ LinuxRedrawTarget(){
|
|||
system_acquire_lock(RENDER_LOCK);
|
||||
launch_rendering(&linuxvars.target);
|
||||
system_release_lock(RENDER_LOCK);
|
||||
glFlush();
|
||||
// glFlush();
|
||||
glXSwapBuffers(linuxvars.XDisplay, linuxvars.XWindow);
|
||||
}
|
||||
|
||||
|
|
@ -1258,21 +1290,27 @@ main(int argc, char **argv)
|
|||
}
|
||||
}
|
||||
|
||||
if (!window_setup_success){
|
||||
fprintf(stderr, "Error creating window.");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
XSetICFocus(linuxvars.input_context);
|
||||
|
||||
if (window_setup_success){
|
||||
linuxvars.app.init(linuxvars.system, &linuxvars.target,
|
||||
&memory_vars, &exchange_vars, &linuxvars.key_codes,
|
||||
linuxvars.clipboard_contents, current_directory,
|
||||
linuxvars.custom_api);
|
||||
|
||||
LinuxResizeTarget(WinWidth, WinHeight);
|
||||
linuxvars.atom_CLIPBOARD = XInternAtom(linuxvars.XDisplay, "CLIPBOARD", False);
|
||||
linuxvars.atom_UTF8_STRING = XInternAtom(linuxvars.XDisplay, "UTF8_STRING", False);
|
||||
|
||||
Atom WM_DELETE_WINDOW = XInternAtom(linuxvars.XDisplay, "WM_DELETE_WINDOW", False);
|
||||
if(WM_DELETE_WINDOW != None){
|
||||
XSetWMProtocols(linuxvars.XDisplay, linuxvars.XWindow, &WM_DELETE_WINDOW, 1);
|
||||
}
|
||||
|
||||
linuxvars.app.init(linuxvars.system, &linuxvars.target,
|
||||
&memory_vars, &exchange_vars, &linuxvars.key_codes,
|
||||
linuxvars.clipboard_contents, current_directory,
|
||||
linuxvars.custom_api);
|
||||
|
||||
LinuxResizeTarget(WinWidth, WinHeight);
|
||||
b32 keep_running = 1;
|
||||
|
||||
while(keep_running)
|
||||
|
|
@ -1399,11 +1437,101 @@ main(int argc, char **argv)
|
|||
keep_running = false;
|
||||
}
|
||||
}break;
|
||||
|
||||
// NOTE(inso): Someone wants us to give them the clipboard data.
|
||||
case SelectionRequest: {
|
||||
XSelectionRequestEvent request = Event.xselectionrequest;
|
||||
|
||||
XSelectionEvent response = {};
|
||||
response.type = SelectionNotify;
|
||||
response.requestor = request.requestor;
|
||||
response.selection = request.selection;
|
||||
response.target = request.target;
|
||||
response.time = request.time;
|
||||
response.property = None;
|
||||
|
||||
//TODO(inso): handle TARGETS negotiation instead of requiring UTF8_STRING
|
||||
if (
|
||||
linuxvars.clipboard_outgoing.size &&
|
||||
request.target == linuxvars.atom_UTF8_STRING &&
|
||||
request.selection == linuxvars.atom_CLIPBOARD &&
|
||||
request.property != None &&
|
||||
request.display &&
|
||||
request.requestor
|
||||
){
|
||||
XChangeProperty(
|
||||
request.display,
|
||||
request.requestor,
|
||||
request.property,
|
||||
request.target,
|
||||
8,
|
||||
PropModeReplace,
|
||||
(unsigned char*)linuxvars.clipboard_outgoing.str,
|
||||
linuxvars.clipboard_outgoing.size
|
||||
);
|
||||
|
||||
response.property = request.property;
|
||||
}
|
||||
|
||||
XSendEvent(request.display, request.requestor, True, 0, (XEvent*)&response);
|
||||
|
||||
}break;
|
||||
|
||||
// NOTE(inso): Another program is now the clipboard owner.
|
||||
case SelectionClear: {
|
||||
if(Event.xselectionclear.selection == linuxvars.atom_CLIPBOARD){
|
||||
linuxvars.clipboard_outgoing.size = 0;
|
||||
}
|
||||
}break;
|
||||
|
||||
// NOTE(inso): A program is giving us the clipboard data we asked for.
|
||||
case SelectionNotify: {
|
||||
XSelectionEvent* e = (XSelectionEvent*)&Event;
|
||||
if(
|
||||
e->selection == linuxvars.atom_CLIPBOARD &&
|
||||
e->target == linuxvars.atom_UTF8_STRING &&
|
||||
e->property != None
|
||||
){
|
||||
Atom type;
|
||||
int fmt;
|
||||
unsigned long nitems, bytes_left;
|
||||
u8 *data;
|
||||
|
||||
XGetWindowProperty(
|
||||
linuxvars.XDisplay,
|
||||
linuxvars.XWindow,
|
||||
linuxvars.atom_CLIPBOARD,
|
||||
0L,
|
||||
LINUX_MAX_PASTE_CHARS/4L,
|
||||
False,
|
||||
linuxvars.atom_UTF8_STRING,
|
||||
&type,
|
||||
&fmt,
|
||||
&nitems,
|
||||
&bytes_left,
|
||||
&data
|
||||
);
|
||||
|
||||
LinuxStringDup(&linuxvars.clipboard_contents, data, nitems);
|
||||
|
||||
XFree(data);
|
||||
}
|
||||
}break;
|
||||
}
|
||||
|
||||
PrevEvent = Event;
|
||||
}
|
||||
|
||||
// FIXME(inso): is getting the clipboard every frame a bad idea?
|
||||
XConvertSelection(
|
||||
linuxvars.XDisplay,
|
||||
linuxvars.atom_CLIPBOARD,
|
||||
linuxvars.atom_UTF8_STRING,
|
||||
linuxvars.atom_CLIPBOARD,
|
||||
linuxvars.XWindow,
|
||||
CurrentTime
|
||||
);
|
||||
|
||||
b32 redraw = 1;
|
||||
|
||||
Key_Input_Data input_data;
|
||||
|
|
@ -1438,7 +1566,6 @@ main(int argc, char **argv)
|
|||
linuxvars.mouse_data.right_button_pressed = 0;
|
||||
linuxvars.mouse_data.right_button_released = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// BOTTOM
|
||||
|
|
|
|||
Loading…
Reference in New Issue