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

Merge branch 'master' of https://bitbucket.org/4coder/4coder

This commit is contained in:
Allen Webster 2016-07-01 01:42:37 -04:00
parent 982ce836af 1757cf65d9
commit 6f81e5d3d5
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
linux_4ed.cpp
View File

@ -194,6 +194,8 @@ struct Linux_Vars{
b32 keep_running; b32 keep_running;
Application_Mouse_Cursor cursor; Application_Mouse_Cursor cursor;
b32 hide_cursor;
Cursor hidden_cursor;
void *app_code; void *app_code;
void *custom; void *custom;
@ -697,6 +699,12 @@ GET_4ED_PATH_SIG(system_get_4ed_path){
return(system_get_binary_path(&str)); return(system_get_binary_path(&str));
} }
internal
SHOW_MOUSE_CURSOR_SIG(system_show_mouse_cursor){
linuxvars.hide_cursor = !show;
XDefineCursor(linuxvars.XDisplay, linuxvars.XWindow, show ? None : linuxvars.hidden_cursor);
}
// //
// Clipboard // Clipboard
// //
@ -1231,6 +1239,7 @@ LinuxLoadSystemCode(){
linuxvars.system.file_exists = system_file_exists; linuxvars.system.file_exists = system_file_exists;
linuxvars.system.directory_cd = system_directory_cd; linuxvars.system.directory_cd = system_directory_cd;
linuxvars.system.get_4ed_path = system_get_4ed_path; linuxvars.system.get_4ed_path = system_get_4ed_path;
linuxvars.system.show_mouse_cursor = system_show_mouse_cursor;
linuxvars.system.post_clipboard = system_post_clipboard; linuxvars.system.post_clipboard = system_post_clipboard;
linuxvars.system.now_time_stamp = system_now_time_stamp; linuxvars.system.now_time_stamp = system_now_time_stamp;
@ -2683,6 +2692,16 @@ main(int argc, char **argv)
XCreateFontCursor(linuxvars.XDisplay, XC_sb_v_double_arrow) XCreateFontCursor(linuxvars.XDisplay, XC_sb_v_double_arrow)
}; };
{
char data = 0;
XColor c = {};
Pixmap p = XCreateBitmapFromData(linuxvars.XDisplay, linuxvars.XWindow, &data, 1, 1);
linuxvars.hidden_cursor = XCreatePixmapCursor(linuxvars.XDisplay, p, p, &c, &c, 0, 0);
XFreePixmap(linuxvars.XDisplay, p);
}
// //
// DPI // DPI
// //
@ -2870,7 +2889,9 @@ main(int argc, char **argv)
if(result.mouse_cursor_type != linuxvars.cursor && !linuxvars.input.mouse.l){ if(result.mouse_cursor_type != linuxvars.cursor && !linuxvars.input.mouse.l){
Cursor c = xcursors[result.mouse_cursor_type]; Cursor c = xcursors[result.mouse_cursor_type];
if(!linuxvars.hide_cursor){
XDefineCursor(linuxvars.XDisplay, linuxvars.XWindow, c); XDefineCursor(linuxvars.XDisplay, linuxvars.XWindow, c);
}
linuxvars.cursor = result.mouse_cursor_type; linuxvars.cursor = result.mouse_cursor_type;
} }