XSetErrorHandler(x_error_handler);
+ int screen=DefaultScreen(display);
+
int nmodes;
XF86VidModeModeInfo **infos;
- XF86VidModeGetAllModeLines(display, DefaultScreen(display), &nmodes, &infos);
+ XF86VidModeGetAllModeLines(display, screen, &nmodes, &infos);
for(int i=0; i<nmodes; ++i)
{
XF86VidModeModeInfo &info=*infos[i];
- VideoMode mode;
- mode.width=info.hdisplay;
- mode.height=info.vdisplay;
+ VideoMode mode(info.hdisplay, info.vdisplay);
mode.rate=info.dotclock/(info.htotal*info.vtotal);
modes.push_back(mode);
}
+
+ XF86VidModeModeLine modeline;
+ int dotclock;
+ XF86VidModeGetModeLine(display, screen, &dotclock, &modeline);
+ orig_mode=VideoMode(modeline.hdisplay, modeline.vdisplay);
+ orig_mode.rate=dotclock/(modeline.htotal*modeline.vtotal);
}
Display::~Display()
XF86VidModeModeInfo &info=*infos[i];
unsigned rate=info.dotclock/(info.htotal*info.vtotal);
- if(info.hdisplay==mode.width && info.vdisplay==mode.height && rate==mode.rate)
+ if(info.hdisplay==mode.width && info.vdisplay==mode.height && (mode.rate==0 || rate==mode.rate))
{
XF86VidModeSwitchToMode(display, screen, &info);
+ XF86VidModeSetViewPort(display, screen, 0, 0);
return;
}
}