Skip to content

xcb: Implement fullscreen option (-f) #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vsyrjala wants to merge 1 commit into
base: master
Choose a base branch
from
Open

xcb: Implement fullscreen option (-f) #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ struct model {
struct vkcube {
struct model model;

bool fullscreen;
bool protected;

int fd;
Expand All @@ -66,6 +67,8 @@ struct vkcube {
xcb_window_t window;
xcb_atom_t atom_wm_protocols;
xcb_atom_t atom_wm_delete_window;
xcb_atom_t atom_net_wm_state;
xcb_atom_t atom_net_wm_state_fullscreen;
} xcb;
#endif

Expand Down
19 changes: 18 additions & 1 deletion main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ enum display_mode {
static enum display_mode display_mode = DISPLAY_MODE_AUTO;
static uint32_t width = 1024, height = 768;
static const char *arg_out_file = "./cube.png";
static bool fullscreen = false;
static bool protected_chain = false;

void noreturn
Expand Down Expand Up @@ -876,6 +877,18 @@ init_xcb(struct vkcube *vc)
8, // sizeof(char),
strlen(title), title);

if (vc->fullscreen) {
vc->xcb.atom_net_wm_state = get_atom(vc->xcb.conn, "_NET_WM_STATE"),
vc->xcb.atom_net_wm_state_fullscreen = get_atom(vc->xcb.conn, "_NET_WM_STATE_FULLSCREEN"),
xcb_change_property(vc->xcb.conn,
XCB_PROP_MODE_REPLACE,
vc->xcb.window,
vc->xcb.atom_net_wm_state,
XCB_ATOM_ATOM,
32,
1, &vc->xcb.atom_net_wm_state_fullscreen);
}

xcb_map_window(vc->xcb.conn, vc->xcb.window);

xcb_flush(vc->xcb.conn);
Expand Down Expand Up @@ -1645,7 +1658,7 @@ parse_args(int argc, char *argv[])
* The initial ':' in the optstring makes getopt return ':' when an option
* is missing a required argument.
*/
static const char *optstring = "+:nm:w:h:o:k:p";
static const char *optstring = "+:nm:w:h:o:k:fp";

int opt;
bool found_arg_headless = false;
Expand Down Expand Up @@ -1684,6 +1697,9 @@ parse_args(int argc, char *argv[])
case 'o':
arg_out_file = xstrdup(optarg);
break;
case 'f':
fullscreen = true;
break;
case 'p':
protected_chain = true;
break;
Expand Down Expand Up @@ -1813,6 +1829,7 @@ int main(int argc, char *argv[])
#endif
vc.width = width;
vc.height = height;
vc.fullscreen = fullscreen;
vc.protected = protected_chain;
gettimeofday(&vc.start_tv, NULL);

Expand Down