summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonsta <[email protected]>2015-09-02 16:40:34 +0300
committerMonsta <[email protected]>2015-09-02 16:40:34 +0300
commitb0aeb32b14f8768e65de4da4db713fafcacba718 (patch)
treed911bbf773eb35ea9029267b25b19be6c7b4e090
parent8d1554eac921b5d65b6977614146eef2ca136f8a (diff)
downloadmate-desktop-b0aeb32b14f8768e65de4da4db713fafcacba718.tar.bz2
mate-desktop-b0aeb32b14f8768e65de4da4db713fafcacba718.tar.xz
mate-rr: annotation fixes
mostly ported from https://git.gnome.org/browse/gnome-desktop/commit?id=6f1368bbc7d6649ed9340806def01ff00c407121
-rw-r--r--libmate-desktop/mate-rr-labeler.c2
-rw-r--r--libmate-desktop/mate-rr-output-info.c10
-rw-r--r--libmate-desktop/mate-rr.c54
3 files changed, 65 insertions, 1 deletions
diff --git a/libmate-desktop/mate-rr-labeler.c b/libmate-desktop/mate-rr-labeler.c
index e65ced5..7f0075b 100644
--- a/libmate-desktop/mate-rr-labeler.c
+++ b/libmate-desktop/mate-rr-labeler.c
@@ -520,7 +520,7 @@ setup_from_config (MateRRLabeler *labeler)
* for configuring multiple monitors.
* The labels will be shown by default, use mate_rr_labeler_hide to hide them.
*
- * Returns: A new #GnomeRRLabeler
+ * Returns: A new #MateRRLabeler
*/
MateRRLabeler *
mate_rr_labeler_new (MateRRConfig *config)
diff --git a/libmate-desktop/mate-rr-output-info.c b/libmate-desktop/mate-rr-output-info.c
index 7e5a8ee..02ea16a 100644
--- a/libmate-desktop/mate-rr-output-info.c
+++ b/libmate-desktop/mate-rr-output-info.c
@@ -116,6 +116,16 @@ void mate_rr_output_info_get_geometry (MateRROutputInfo *self, int *x, int *y, i
*height = self->priv->height;
}
+/**
+ * mate_rr_output_info_set_geometry:
+ * @self: a #MateRROutputInfo
+ * @x: x offset for monitor
+ * @y: y offset for monitor
+ * @width: monitor width
+ * @height: monitor height
+ *
+ * Set the geometry for the monitor connected to the specified output.
+ */
void mate_rr_output_info_set_geometry (MateRROutputInfo *self, int x, int y, int width, int height)
{
g_return_if_fail (MATE_IS_RR_OUTPUT_INFO (self));
diff --git a/libmate-desktop/mate-rr.c b/libmate-desktop/mate-rr.c
index e654122..e26523d 100644
--- a/libmate-desktop/mate-rr.c
+++ b/libmate-desktop/mate-rr.c
@@ -1426,6 +1426,11 @@ mate_rr_screen_get_output_by_name (MateRRScreen *screen,
return NULL;
}
+/**
+ * mate_rr_output_get_crtc:
+ * @output: a #MateRROutput
+ * Returns: (transfer none):
+ */
MateRRCrtc *
mate_rr_output_get_crtc (MateRROutput *output)
{
@@ -1434,6 +1439,11 @@ mate_rr_output_get_crtc (MateRROutput *output)
return output->current_crtc;
}
+/**
+ * mate_rr_output_get_possible_crtcs:
+ * @output: a #MateRROutput
+ * Returns: (array zero-terminated=1) (transfer none):
+ */
MateRRCrtc **
mate_rr_output_get_possible_crtcs (MateRROutput *output)
{
@@ -1482,6 +1492,11 @@ mate_rr_output_is_laptop (MateRROutput *output)
return FALSE;
}
+/**
+ * mate_rr_output_get_current_mode:
+ * @output: a #MateRROutput
+ * Returns: (transfer none): the current mode of this output
+ */
MateRRMode *
mate_rr_output_get_current_mode (MateRROutput *output)
{
@@ -1495,6 +1510,12 @@ mate_rr_output_get_current_mode (MateRROutput *output)
return NULL;
}
+/**
+ * mate_rr_output_get_position:
+ * @output: a #MateRROutput
+ * @x: (out) (allow-none):
+ * @y: (out) (allow-none):
+ */
void
mate_rr_output_get_position (MateRROutput *output,
int *x,
@@ -1529,6 +1550,11 @@ mate_rr_output_get_height_mm (MateRROutput *output)
return output->height_mm;
}
+/**
+ * mate_rr_output_get_preferred_mode:
+ * @output: a #MateRROutput
+ * Returns: (transfer none):
+ */
MateRRMode *
mate_rr_output_get_preferred_mode (MateRROutput *output)
{
@@ -1539,6 +1565,12 @@ mate_rr_output_get_preferred_mode (MateRROutput *output)
return NULL;
}
+/**
+ * mate_rr_output_list_modes:
+ * @output: a #MateRROutput
+ * Returns: (array zero-terminated=1) (transfer none):
+ */
+
MateRRMode **
mate_rr_output_list_modes (MateRROutput *output)
{
@@ -1763,6 +1795,11 @@ mate_rr_crtc_set_config_with_time (MateRRCrtc *crtc,
#endif /* HAVE_RANDR */
}
+/**
+ * mate_rr_crtc_get_current_mode:
+ * @crtc: a #MateRRCrtc
+ * Returns: (transfer none): the current mode of this crtc
+ */
MateRRMode *
mate_rr_crtc_get_current_mode (MateRRCrtc *crtc)
{
@@ -1798,6 +1835,13 @@ mate_rr_crtc_can_drive_output (MateRRCrtc *crtc,
}
/* FIXME: merge with get_mode()? */
+
+/**
+ * mate_rr_crtc_get_position:
+ * @crtc: a #MateRRCrtc
+ * @x: (out) (allow-none):
+ * @y: (out) (allow-none):
+ */
void
mate_rr_crtc_get_position (MateRRCrtc *crtc,
int *x,
@@ -2064,6 +2108,16 @@ mate_rr_crtc_set_gamma (MateRRCrtc *crtc, int size,
#endif /* HAVE_RANDR */
}
+/**
+ * mate_rr_crtc_get_gamma:
+ * @crtc: a #MateRRCrtc
+ * @size:
+ * @red: (out): the minimum width
+ * @green: (out): the maximum width
+ * @blue: (out): the minimum height
+ *
+ * Returns: %TRUE for success
+ */
gboolean
mate_rr_crtc_get_gamma (MateRRCrtc *crtc, int *size,
unsigned short **red, unsigned short **green,