mr4th-public
/
4coder
1
Fork 0
Code Issues Releases Activity

get file list working

master
insofaras 2016-02-23 02:01:26 +00:00 committed by Allen Webster
parent edd6ead966
commit 79aad5ebfd
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
4ed_color_view.cpp
View File

@ -1429,11 +1429,12 @@ do_checkbox_list_option(i32 id, UI_State *state, UI_Layout *layout, String text,
internal b32 internal b32
do_file_option(i32 id, UI_State *state, UI_Layout *layout, String filename, b32 is_folder, String extra){ do_file_option(i32 id, UI_State *state, UI_Layout *layout, String filename, b32 is_folder, String extra, char slash){
b32 result = 0; b32 result = 0;
Style *style = state->style; Style *style = state->style;
i16 font_id = style->font_id; i16 font_id = style->font_id;
i32 character_h = get_font_info(state->font_set, font_id)->height; i32 character_h = get_font_info(state->font_set, font_id)->height;
char slash_buf[2] = { slash, 0 };
i32_Rect box = layout_rect(layout, character_h*2); i32_Rect box = layout_rect(layout, character_h*2);
Widget_ID wid = make_id(state, id); Widget_ID wid = make_id(state, id);
@ -1456,7 +1457,7 @@ do_file_option(i32 id, UI_State *state, UI_Layout *layout, String filename, b32
draw_rectangle(target, inner, back); draw_rectangle(target, inner, back);
i32 x = inner.x0, y = box.y0 + character_h/2; i32 x = inner.x0, y = box.y0 + character_h/2;
x = draw_string(target, font_id, filename, x, y, fore); x = draw_string(target, font_id, filename, x, y, fore);
if (is_folder) x = draw_string(target, font_id, "\\", x, y, fore); if (is_folder) x = draw_string(target, font_id, slash_buf, x, y, fore);
draw_string(target, font_id, extra, x, y, pop); draw_string(target, font_id, extra, x, y, pop);
draw_margin(target, box, inner, outline); draw_margin(target, box, inner, outline);
} }
@ -1522,13 +1523,13 @@ do_file_list_box(System_Functions *system, UI_State *state, UI_Layout *layout,
} }
if ((is_folder || !has_filter || ext_match) && name_match){ if ((is_folder || !has_filter || ext_match) && name_match){
if (do_file_option(100+i, state, layout, filename, is_folder, message)){ if (do_file_option(100+i, state, layout, filename, is_folder, message, system->slash)){
result = 1; result = 1;
hot_directory_clean_end(hot_dir); hot_directory_clean_end(hot_dir);
append(&hot_dir->string, filename); append(&hot_dir->string, filename);
if (is_folder){ if (is_folder){
*new_dir = 1; *new_dir = 1;
append(&hot_dir->string, "\\"); append(&hot_dir->string, system->slash);
} }
else{ else{
*selected = 1; *selected = 1;
@ -1572,7 +1573,7 @@ do_live_file_list_box(System_Functions *system, UI_State *state, UI_Layout *layo
} }
if (filename_match(*string, &absolutes, file->name.live_name, 1)){ if (filename_match(*string, &absolutes, file->name.live_name, 1)){
if (do_file_option(100+i, state, layout, file->name.live_name, 0, message)){ if (do_file_option(100+i, state, layout, file->name.live_name, 0, message, system->slash)){
result = 1; result = 1;
*selected = 1; *selected = 1;
copy(string, file->name.source_path); copy(string, file->name.source_path);

12
linux_4ed.cpp
View File

@ -303,6 +303,9 @@ Sys_Set_File_List_Sig(system_set_file_list){
*cursor++ = 0; *cursor++ = 0;
info_ptr->filename.memory_size = info_ptr->filename.size + 1; info_ptr->filename.memory_size = info_ptr->filename.size + 1;
} }
file_list->count = file_count;
closedir(d); closedir(d);
} }
} }
@ -1497,7 +1500,7 @@ main(int argc, char **argv)
unsigned long nitems, bytes_left; unsigned long nitems, bytes_left;
u8 *data; u8 *data;
XGetWindowProperty( int result = XGetWindowProperty(
linuxvars.XDisplay, linuxvars.XDisplay,
linuxvars.XWindow, linuxvars.XWindow,
linuxvars.atom_CLIPBOARD, linuxvars.atom_CLIPBOARD,
@ -1512,9 +1515,10 @@ main(int argc, char **argv)
&data &data
); );
LinuxStringDup(&linuxvars.clipboard_contents, data, nitems); if(result == Success && fmt == 8){
LinuxStringDup(&linuxvars.clipboard_contents, data, nitems);
XFree(data); XFree(data);
}
} }
}break; }break;
} }