Commit Graph

154 Commits

Author SHA1 Message Date
Christopher Michael 0658fda5a7 Backport: 1d10a38 :: Actually, allow move/resize/rotate for disabled monitors so things can be adjusted (NB: Will not actually mattery on Apply anyway).
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84197
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:51 -04:00
Christopher Michael 3a3cea80b6 Backport: c5254ce :: Set current size and position text when we set current values. Add function for setting current geometry. If a monitor is disabled, do not allow rotate, resize, move events. Fix resize start/stop functions to use current geometry.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84196
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:51 -04:00
Christopher Michael 39ab375a64 Backport: f487724 :: Fix move_stop to use current geometry.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84194
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:51 -04:00
Christopher Michael f30acdc4ee Backport: 2819733 :: Handle setting monitor to enabled/disabled based on crtc mode.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84193
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:50 -04:00
Christopher Michael 9ab072cd4e Backport: 2acdd3f :: Add 'current' field values so we can use these durring apply for comparison to old values. Fix move, resize, rotate code to use "current" values.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84191
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:50 -04:00
Christopher Michael 88110ca30a Backport: aee6393 :: Add code to handle manual monitor movement. Fix up coordinate functions to not need doubles. Update monitor position text when moving. Fix up rotation code to allow rotating when mouse is outside the frame (thank you Daniel) ;)
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84190
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:50 -04:00
Christopher Michael 138323d6b1 Backport: b33401f :: Add in refresh_rate code for filling refresh rate list and listening for changes. Break map_apply function into frame_map_apply and thumb_map_apply for rotating just the wallpaper. Fix resize code to work with a rotated monitor.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84188
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:50 -04:00
Christopher Michael c1a6c1c6aa Backport: 39bc25b :: Use ecore_x_randr_crtc_info_free function to free returned crtc_info. When comparing refresh rates for mode searches, cast to int.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84187
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:50 -04:00
Christopher Michael bda7510577 Backport: 2e0f4e7 :: Reduce variable usage
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84186
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:50 -04:00
Christopher Michael 4c512aa526 Backport: e02c9fc :: Fix comment. Remove orientation comparison.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84185
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:50 -04:00
Christopher Michael ae9cbd4e9f Backport: af59660 :: Add ROTATE_FUZZ amount. Add inline function to get orientation based on rotation amount. Add function to apply an evas_map for rotation. If we are rotating, we don't need to set livethumb size. When we start rotating, set initial rotation amount to 0. When rotation stops, update the map and monitor position where needed. Apply map during rotation.
NB: This commit also adds a debugging red rectangle behind the
monitor. This will be removed when debugging is complete

Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84184
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:50 -04:00
Christopher Michael 63163546d8 Backport: c2b2be5 :: Add current rotation to smart_data structure. Fill in current rotation on crtc set. Update current rotation when we get a rotation event.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84183
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:50 -04:00
Christopher Michael ab05ef5335 Backport: 3585513 :: Add inline function to return the degree of rotation based on orientation.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84182
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:50 -04:00
Christopher Michael 85d7ef2fbe Backport: 87daec4 :: Remove Big Fat Fixme warning as it's fixed now :)
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84181
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:50 -04:00
Christopher Michael 853de9c660 Backport: ed84b96 :: Add code to check EFL version. If we are using a newer version, then we can use the new ecore_x_randr_crtc_info_get() function which will save us a lot of X round-trips.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84180
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:50 -04:00
Christopher Michael 4772dd90e8 Backport: 93ad1fa :: Add current mode and refresh rate to crtc field. Add function prototype for getting a mode refresh rate. Add Big Fat FIXME for crtc_set function. Get the crtc current mode & refresh rate when crtc is set. Simplify monitor_mode_find function. Add function for getting a mode refresh rate. Start on rotation event code.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84179
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:50 -04:00
Christopher Michael 48308853d3 Backport: 1ec01f9 :: Add function to get the amount of rotation from a mouse event. Simplify mouse movement check in resize_event and add some better comments.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84178
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:50 -04:00
Christopher Michael d44ba20579 Backport: 3526741c :: Turn 'crtc' field into a structure (mainly for making code easier to read/maintain).
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84177
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:50 -04:00
Christopher Michael f53cc4a5f2 Backport: 5b47415 :: Add code to check if rotations for a given crtc are possible, and disable the rotation in edje if not.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84176
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:50 -04:00
Christopher Michael ddc4c39e43 Backport: 9edea3c :: Only get edid (an expensive process) if getting the output name previously has failed.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84175
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:49 -04:00
Christopher Michael d94e796050 Backport: 7abc8a7 :: Add flag for rotating to structure. Add & delete callbacks for rotation start & stop. Add functions for rotate start & stop. Add start of rotate event code.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84174
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:49 -04:00
Christopher Michael b2c3ccd676 Backport: 2edc7cf :: Add some comments.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84173
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:49 -04:00
Christopher Michael 4a4b5c98f5 Backport: 480170d :: Remove all code which tried to maintain aspect ratio of the frame (resize snapping to mode dimensions will handle this anyway).
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84172
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:49 -04:00
Christopher Michael 5fc3d77e62 Backport: bda3e4b :: Change structure to store grid geometry. Change grid_set function to accept grid geometry. Add monitor_virtual_size_set function. Only update livethumb preview size if we are not manually resizing. Don't need to set the resolution text during smart_resize. Add functions to convert coordinates to/from virtual to canvas. Add function to find the closest randr mode to a given size. Add function to handle user manual resizing.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84170
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:49 -04:00
Christopher Michael f7fa56bdcc Backport: fd0889b :: Add missing LOGFN's where needed. Add mouse_move callback on frame. Delete mouse_move callback when we delete the frame. Add code in frame moouse_move function to call appropriate event based on current action. Start of actual resize event code.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84168
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:49 -04:00
Christopher Michael ed2d213e2e Backport: f4ae6fa :: Add flag to structure for resizing. Add start of resize coordinates to structure. If we are manually resizing the object, update the text. When resize starts, record the current mouse position and size.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84167
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:49 -04:00
Christopher Michael d8fc923492 Backport: fd11b69 :: Add edje callbacks to frame for resize_start & resize_stop. Add code to delete edje callbacks from frame when object is deleted. Add start of code for resize_start & resize_stop frame events.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84166
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:49 -04:00
Christopher Michael caa8ea5cf0 Backport: 22f25b4 :: Fix variable type of "name" to be char (not const char). Add code to set mouse pointer on frame events (resize, rotate, etc).
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84165
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:49 -04:00
Christopher Michael 00eac610e4 Backport: 825ccb9 :: Cleanup some memory returned from ecore_x_randr when we are done with it.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84164
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:49 -04:00
Christopher Michael e28a1a1bc5 Backport: f5fc65f :: Add function to push & pop e_pointers. Add code to set pointer indication when mouse moves inside the thumbnail. Add code to set pointer indication when mouse is down on the thumbnail.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84162
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:49 -04:00
Christopher Michael 733f98fbbf Backport: 9354ef6 :: Set aspect width & height on the same line
(pedantic commit just to remove 2 extra lines).

Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84161
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:49 -04:00
Christopher Michael 3f4c7629d9 Backport: 457c302 :: Modifiy crtc_set function to also take the current crtc coordinates (this saves us a round-trip function call to ecore_x_randr as we already have the coordinates from the randr widget).
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84159
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:49 -04:00
Christopher Michael 310c60449d Backport: 54a0fa1 :: When we set the crtc of the monitor, we can update position and resolution text.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84158
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:49 -04:00
Christopher Michael bc99da4a26 Backport: 58b68ab :: Add private functions for setting monitor position and resolution text.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84157
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:49 -04:00
Christopher Michael 71094979e9 Backport: 597d95b :: Add code to set the monitor name.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84156
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:49 -04:00
Christopher Michael 7969bbf3aa Backport: 8d47671 :: Add code to handle setting of background preview on initial show. Add code to handle setting of background preview when user changes the bg.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84153
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:48 -04:00
Christopher Michael 8647ccdb45 Backport: 055ccc5 :: Remove virtual_size_set code (turns out, it's not needed).
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84151
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:48 -04:00
Christopher Michael 8958edd03d Backport: 85ff779 :: Add min & max mode sizes to monitor structure. Add Frame & Stand to monitor structure. Add code to create/show/move/resize/hide the frame & stand. Change the code to use ecore_x_randr functions so that when running in Xephyr we get monitors that make sense. Change output_set and crtc_set functions to take the Ecore_X_Randr types. Set an aspect ratio on the frame (so it maintains during resize) Add function for telling monitor what the virtual size is. Add function for telling monitor what grid object it belongs to.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84147
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:48 -04:00
Christopher Michael 8f82bb694c Backport: 9f6b69c :: Add test rectangle to monitor Add LOGFN to functions.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84141
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:48 -04:00
Christopher Michael 13a4aed496 Backport: 31b98fe :: Add a list of modes to smart_data structure. When we set the output, fill in the modes list Add code to sort modes list.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84133
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:48 -04:00
Christopher Michael 5e882d1275 Backport: 148cdc9 :: Add geometry to smart_data struct. Check geometry changes in smart_move and smart_resize.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84132
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:47 -04:00
Christopher Michael f2d9856ccb Backport: 7246631 :: Add crtc and output configs to smart_data structure. Add functions to set crtc and output configs.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84130
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:47 -04:00
Christopher Michael 1c26ea8b99 Backport: 5216fb0 :: Add initial monitor code.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84125
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:47 -04:00
Christopher Michael 671f459fbc Backport: 4dfda15 :: Initial rewrite of the monitor object.
Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 84117
Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>
2013-06-28 03:28:47 -04:00
Deon Thomas 458a0ebfe6 Backport: 17dcfd1 :: Remove old randr widget code. 2013-06-28 03:28:46 -04:00
Mike Blumenkrantz 9d83e1feeb backport all randr config dialog updates
SVN revision: 83207
2013-01-24 08:23:26 +00:00
Maxime Villard 4a52c46268 From: Maxime Villard <rustyBSD@gmx.fr>
Subject: [E-devel] [e][PATCH] Optimizations v2
Date: Fri, 21 Dec 2012 22:17:32 +0100

Hi,
same patch as before: removed useless nullchecks and
switched some free()'s to E_FREE().



SVN revision: 81592
2012-12-21 21:31:13 +00:00
Mike Blumenkrantz 27896bfae3 stringshare leak--
SVN revision: 81531
2012-12-21 10:15:41 +00:00
Christopher Michael 69cb1822e1 Fix monitor apply settings.
NB: According to a conversation with T_UNIX, we actually do use the
ecore_x randr functions to apply the config.

Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 81377
2012-12-19 15:39:51 +00:00
Christopher Michael 75981aa321 Set struct field for Enabled/Disabled Before we try to find possible
crtc.
If the monitor's crtc does not have a current_mode (because it was
previously disabled), then grab the last available mode (typically the
largest) and set the crtc current_mode to that.
Add some debugging for Enable/Disable.
Remove code which was trying to use ecore_x calls to re-enable a
monitor.
Use the randr function for trying to enable an output (if previously
disabled).

NB: Enable/Disable Does work, HOWEVER in my testing I have found that
when you re-enable a monitor, you will need to completely back out of
X and restart it in order for the Monitor to show output again. Unsure
if this is an X bug or something in e_randr or someother weirdness....

Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 81367
2012-12-19 14:21:47 +00:00