wdw->stop_video();
}
- int x = subwindow->get_screen_x(0, -1);
- int y = subwindow->get_screen_y(0, -1);
- int w = root_w;
- int h = root_h;
- if( mwindow->screens == 1 && root_w > scr_w0 ) {
- // Xinerama
- if( subwindow->get_x() >= scr_w0 ) {
- // assumes right side is the big one
- w = root_w - scr_w0;
- h = root_h;
- }
- else {
- // use same aspect ratio to compute left height
- w = scr_w0;
- h = (w*root_h) / (root_w-scr_w0);
- }
- }
+ int x, y, w, h;
+ wdw->get_fullscreen_geometry(x, y, w, h);
if( canvas_fullscreen )
{
int Canvas::keypress_event(BC_WindowBase *caller)
{
- int caller_is_canvas = (caller == get_canvas());
int key = caller->get_keypress();
switch( key ) {
case 'f':
stop_fullscreen();
else
start_fullscreen();
- if(!caller_is_canvas) caller->lock_window("Canvas::keypress_event 1");
+ caller->lock_window("Canvas::keypress_event 1");
break;
case ESC:
caller->unlock_window();
if(get_fullscreen())
stop_fullscreen();
- if(!caller_is_canvas) caller->lock_window("Canvas::keypress_event 2");
+ caller->lock_window("Canvas::keypress_event 2");
break;
default:
return 0;
int CanvasOutput::cursor_leave_event()
{
- return canvas->cursor_leave_event_base(this);
+ return canvas->cursor_leave_event_base(canvas->get_canvas());
}
int CanvasOutput::cursor_enter_event()
{
- return canvas->cursor_enter_event_base(this);
+ return canvas->cursor_enter_event_base(canvas->get_canvas());
}
int CanvasOutput::button_press_event()
{
- return canvas->button_press_event_base(this);
+ return canvas->button_press_event_base(canvas->get_canvas());
}
int CanvasOutput::button_release_event()
int CanvasOutput::keypress_event()
{
- return canvas->keypress_event(this);
+ return canvas->keypress_event(canvas->get_canvas());
}