diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-04-28 08:55:26 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-04-28 08:55:26 +0000 |
commit | 8949c3abab612ebf590983f9e7f439d8aafefa2a (patch) | |
tree | ccda4dd00ecdff1d43e7ad792761b65becfaebc6 /krandr/lowlevel_randr.h | |
parent | 3be8f38c8216094c12a7910ab09be94394a5e2db (diff) | |
download | tdelibs-8949c3abab612ebf590983f9e7f439d8aafefa2a.tar.gz tdelibs-8949c3abab612ebf590983f9e7f439d8aafefa2a.zip |
Fixed rather embarrassing function naming conflict with low level RANDR library
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1120049 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'krandr/lowlevel_randr.h')
-rw-r--r-- | krandr/lowlevel_randr.h | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/krandr/lowlevel_randr.h b/krandr/lowlevel_randr.h index a9a519125..54538aa44 100644 --- a/krandr/lowlevel_randr.h +++ b/krandr/lowlevel_randr.h @@ -1,16 +1,16 @@ /* * Copyright © 2007 Intel Corporation - * + * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal * in the Software without restriction, including without limitation the rights * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -34,9 +34,9 @@ struct CrtcInfo { Rotation cur_rotation; Rotation rotations; int cur_noutput; - + int changed; - + struct ScreenInfo *screen_info; }; @@ -44,7 +44,7 @@ struct OutputInfo { RROutput id; XRROutputInfo *info; struct CrtcInfo *cur_crtc; - + int auto_set; int off_set; }; @@ -59,15 +59,15 @@ struct ScreenInfo { int cur_height; int cur_mmWidth; int cur_mmHeight; - + int n_output; int n_crtc; struct OutputInfo **outputs; struct CrtcInfo **crtcs; - + int clone; struct CrtcInfo *primary_crtc; - + struct CrtcInfo *cur_crtc; struct OutputInfo *cur_output; }; @@ -80,22 +80,22 @@ extern "C" { #endif void free_screen_info (struct ScreenInfo *screen_info); -struct ScreenInfo* read_screen_info (Display *); - -int set_screen_size (struct ScreenInfo *screen_info); -void output_auto (struct ScreenInfo *screen_info, struct OutputInfo *output_info); -void output_off (struct ScreenInfo *screen_info, struct OutputInfo *output); -struct CrtcInfo* auto_find_crtc (struct ScreenInfo *screen_info, struct OutputInfo *output_info); - -XRRModeInfo *find_mode_by_xid (struct ScreenInfo *screen_info, RRMode mode_id); -int mode_height (XRRModeInfo *mode_info, Rotation rotation); -int mode_width (XRRModeInfo *mode_info, Rotation rotation); -int get_width_by_output_id (struct ScreenInfo *screen_info, RROutput output_id); -int get_height_by_output_id (struct ScreenInfo *screen_info, RROutput output_id); -char *get_output_name (struct ScreenInfo *screen_info, RROutput id); -Status crtc_apply (struct CrtcInfo *crtc_info); -Status crtc_disable (struct CrtcInfo *crtc); -int main_low_apply (struct ScreenInfo *screen_info); +struct ScreenInfo* internal_read_screen_info (Display *); + +int internal_set_screen_size (struct ScreenInfo *screen_info); +void internal_output_auto (struct ScreenInfo *screen_info, struct OutputInfo *output_info); +void internal_output_off (struct ScreenInfo *screen_info, struct OutputInfo *output); +struct CrtcInfo* internal_auto_find_crtc (struct ScreenInfo *screen_info, struct OutputInfo *output_info); + +XRRModeInfo *internal_find_mode_by_xid (struct ScreenInfo *screen_info, RRMode mode_id); +int internal_mode_height (XRRModeInfo *mode_info, Rotation rotation); +int internal_mode_width (XRRModeInfo *mode_info, Rotation rotation); +int internal_get_width_by_output_id (struct ScreenInfo *screen_info, RROutput output_id); +int internal_get_height_by_output_id (struct ScreenInfo *screen_info, RROutput output_id); +char *internal_get_output_name (struct ScreenInfo *screen_info, RROutput id); +Status internal_crtc_apply (struct CrtcInfo *crtc_info); +Status internal_crtc_disable (struct CrtcInfo *crtc); +int internal_main_low_apply (struct ScreenInfo *screen_info); #ifdef __cplusplus } |