Changeset 6d032d9e5b01c12d4edc5e2e241e17117973f7c3
- Timestamp:
- 08/05/07 20:03:16
(2 years ago)
- Author:
- Antoine Cellerier <dionoea@videolan.org>
- git-committer:
- Antoine Cellerier <dionoea@videolan.org> 1178647396 +0000
- git-parent:
[f4833f08645b971257a7b9f8b239959ff4cf7ad7]
- git-author:
- Antoine Cellerier <dionoea@videolan.org> 1178647396 +0000
- Message:
Tab and trailing space police.
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| rfc4af29 |
r6d032d9 |
|
| 162 | 162 | |
|---|
| 163 | 163 | /* Sleep a bit */ |
|---|
| 164 | | // msleep( INTF_IDLE_SLEEP ); |
|---|
| | 164 | /* msleep( INTF_IDLE_SLEEP ); */ |
|---|
| 165 | 165 | |
|---|
| 166 | 166 | i_action = 0; |
|---|
| 167 | 167 | i_key = GetKey( p_intf ); |
|---|
| 168 | 168 | |
|---|
| 169 | | /* Special action for mouse event */ |
|---|
| 170 | | /* FIXME: This should probably be configurable */ |
|---|
| 171 | | /* FIXME: rework hotkeys handling to allow more than 1 event |
|---|
| 172 | | * to trigger one same action */ |
|---|
| 173 | | switch (i_key & KEY_SPECIAL) |
|---|
| 174 | | { |
|---|
| 175 | | case KEY_MOUSEWHEELUP: |
|---|
| 176 | | i_action = ACTIONID_VOL_UP; |
|---|
| 177 | | break; |
|---|
| 178 | | case KEY_MOUSEWHEELDOWN: |
|---|
| 179 | | i_action = ACTIONID_VOL_DOWN; |
|---|
| 180 | | break; |
|---|
| 181 | | case KEY_MOUSEWHEELLEFT: |
|---|
| 182 | | i_action = ACTIONID_JUMP_BACKWARD_EXTRASHORT; |
|---|
| 183 | | break; |
|---|
| 184 | | case KEY_MOUSEWHEELRIGHT: |
|---|
| 185 | | i_action = ACTIONID_JUMP_FORWARD_EXTRASHORT; |
|---|
| 186 | | break; |
|---|
| 187 | | default: break; |
|---|
| 188 | | } |
|---|
| | 169 | /* Special action for mouse event */ |
|---|
| | 170 | /* FIXME: This should probably be configurable */ |
|---|
| | 171 | /* FIXME: rework hotkeys handling to allow more than 1 event |
|---|
| | 172 | * to trigger one same action */ |
|---|
| | 173 | switch (i_key & KEY_SPECIAL) |
|---|
| | 174 | { |
|---|
| | 175 | case KEY_MOUSEWHEELUP: |
|---|
| | 176 | i_action = ACTIONID_VOL_UP; |
|---|
| | 177 | break; |
|---|
| | 178 | case KEY_MOUSEWHEELDOWN: |
|---|
| | 179 | i_action = ACTIONID_VOL_DOWN; |
|---|
| | 180 | break; |
|---|
| | 181 | case KEY_MOUSEWHEELLEFT: |
|---|
| | 182 | i_action = ACTIONID_JUMP_BACKWARD_EXTRASHORT; |
|---|
| | 183 | break; |
|---|
| | 184 | case KEY_MOUSEWHEELRIGHT: |
|---|
| | 185 | i_action = ACTIONID_JUMP_FORWARD_EXTRASHORT; |
|---|
| | 186 | break; |
|---|
| | 187 | default: break; |
|---|
| | 188 | } |
|---|
| 189 | 189 | |
|---|
| 190 | 190 | /* No mouse action, find action triggered by hotkey */ |
|---|
| 191 | 191 | if(!i_action) |
|---|
| 192 | | { |
|---|
| 193 | | for( i = 0; i_key != -1 && p_hotkeys[i].psz_action != NULL; i++ ) |
|---|
| 194 | | { |
|---|
| 195 | | if( p_hotkeys[i].i_key == i_key ) |
|---|
| 196 | | { |
|---|
| 197 | | i_action = p_hotkeys[i].i_action; |
|---|
| 198 | | i_times = p_hotkeys[i].i_times; |
|---|
| 199 | | /* times key pressed within max. delta time */ |
|---|
| 200 | | p_hotkeys[i].i_times = 0; |
|---|
| 201 | | break; |
|---|
| 202 | | } |
|---|
| 203 | | } |
|---|
| 204 | | } |
|---|
| | 192 | { |
|---|
| | 193 | for( i = 0; i_key != -1 && p_hotkeys[i].psz_action != NULL; i++ ) |
|---|
| | 194 | { |
|---|
| | 195 | if( p_hotkeys[i].i_key == i_key ) |
|---|
| | 196 | { |
|---|
| | 197 | i_action = p_hotkeys[i].i_action; |
|---|
| | 198 | i_times = p_hotkeys[i].i_times; |
|---|
| | 199 | /* times key pressed within max. delta time */ |
|---|
| | 200 | p_hotkeys[i].i_times = 0; |
|---|
| | 201 | break; |
|---|
| | 202 | } |
|---|
| | 203 | } |
|---|
| | 204 | } |
|---|
| 205 | 205 | |
|---|
| 206 | 206 | if( !i_action ) |
|---|
| … | … | |
| 220 | 220 | vlc_object_yield( p_input ); |
|---|
| 221 | 221 | PL_UNLOCK; |
|---|
| 222 | | |
|---|
| | 222 | |
|---|
| 223 | 223 | /* Update the vout */ |
|---|
| 224 | 224 | p_last_vout = p_vout; |
|---|
