← Back to branch summary

~vanvugt/mir/remove-input-resampling-standalone

« back to all changes in this revision

Viewing changes to src/server/scene/application_session.cpp

  • Committer: Daniel van Vugt
  • Date: 2017-01-12 03:38:59 UTC
  • mfrom: (3906.2.16 development-branch)
  • Revision ID: daniel.van.vugt@canonical.com-20170112033859-f9sbvo4oaauaszum
Merge latest trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/scene/application_session.cpp
140
140
    surface_stack->add_surface(surface, params.input_mode);
141
141
 
142
142
    if (params.state.is_set())
143
 
        surface->configure(mir_surface_attrib_state, params.state.value());
 
143
        surface->configure(mir_window_attrib_state, params.state.value());
144
144
    if (params.type.is_set())
145
 
        surface->configure(mir_surface_attrib_type, params.type.value());
 
145
        surface->configure(mir_window_attrib_type, params.type.value());
146
146
    if (params.preferred_orientation.is_set())
147
 
        surface->configure(mir_surface_attrib_preferred_orientation, params.preferred_orientation.value());
 
147
        surface->configure(mir_window_attrib_preferred_orientation, params.preferred_orientation.value());
148
148
    if (params.input_shape.is_set())
149
149
        surface->set_input_region(params.input_shape.value());
150
150
 
211
211
        {
212
212
            switch (s.second->type())
213
213
            {
214
 
            case mir_surface_type_normal:       /**< AKA "regular"                       */
215
 
            case mir_surface_type_utility:      /**< AKA "floating"                      */
216
 
            case mir_surface_type_dialog:
217
 
            case mir_surface_type_satellite:    /**< AKA "toolbox"/"toolbar"             */
218
 
            case mir_surface_type_freestyle:
219
 
            case mir_surface_type_menu:
220
 
            case mir_surface_type_inputmethod:  /**< AKA "OSK" or handwriting etc.       */
 
214
            case mir_window_type_normal:       /**< AKA "regular"                       */
 
215
            case mir_window_type_utility:      /**< AKA "floating"                      */
 
216
            case mir_window_type_dialog:
 
217
            case mir_window_type_satellite:    /**< AKA "toolbox"/"toolbar"             */
 
218
            case mir_window_type_freestyle:
 
219
            case mir_window_type_menu:
 
220
            case mir_window_type_inputmethod:  /**< AKA "OSK" or handwriting etc.       */
221
221
                return true;
222
222
 
223
 
            case mir_surface_type_gloss:
224
 
            case mir_surface_type_tip:          /**< AKA "tooltip"                       */
 
223
            case mir_window_type_gloss:
 
224
            case mir_window_type_tip:          /**< AKA "tooltip"                       */
225
225
            default:
226
226
                // Cannot have input focus - skip it
227
227
                return false;