@@ -1806,7 +1806,7 @@ buttonpress(struct wl_listener *listener, void *data) {
18061806 struct wlr_surface * surface ;
18071807 Client * tmpc ;
18081808 int ji ;
1809- const MouseBinding * b ;
1809+ const MouseBinding * m ;
18101810 struct wlr_surface * old_pointer_focus_surface =
18111811 seat -> pointer_state .focused_surface ;
18121812
@@ -1858,16 +1858,16 @@ buttonpress(struct wl_listener *listener, void *data) {
18581858 for (ji = 0 ; ji < config .mouse_bindings_count ; ji ++ ) {
18591859 if (config .mouse_bindings_count < 1 )
18601860 break ;
1861- b = & config .mouse_bindings [ji ];
1862- if (CLEANMASK (mods ) == CLEANMASK (b -> mod ) &&
1863- event -> button == b -> button && b -> func &&
1864- (selmon -> isoverview == 1 || b -> button == BTN_MIDDLE ) && c ) {
1865- b -> func (& b -> arg );
1861+ m = & config .mouse_bindings [ji ];
1862+ if (CLEANMASK (mods ) == CLEANMASK (m -> mod ) &&
1863+ event -> button == m -> button && m -> func &&
1864+ (selmon -> isoverview == 1 || m -> button == BTN_MIDDLE ) && c ) {
1865+ m -> func (& m -> arg );
18661866 return ;
1867- } else if (CLEANMASK (mods ) == CLEANMASK (b -> mod ) &&
1868- event -> button == b -> button && b -> func &&
1869- CLEANMASK (b -> mod ) != 0 ) {
1870- b -> func (& b -> arg );
1867+ } else if (CLEANMASK (mods ) == CLEANMASK (m -> mod ) &&
1868+ event -> button == m -> button && m -> func &&
1869+ CLEANMASK (m -> mod ) != 0 ) {
1870+ m -> func (& m -> arg );
18711871 return ;
18721872 }
18731873 }
@@ -2777,15 +2777,15 @@ void switch_toggle(struct wl_listener *listener, void *data) {
27772777
27782778 // 处理切换事件
27792779 struct wlr_switch_toggle_event * event = data ;
2780- SwitchBinding * a ;
2780+ SwitchBinding * s ;
27812781 int ji ;
27822782
27832783 for (ji = 0 ; ji < config .switch_bindings_count ; ji ++ ) {
27842784 if (config .switch_bindings_count < 1 )
27852785 break ;
2786- a = & config .switch_bindings [ji ];
2787- if (event -> switch_state == a -> fold && a -> func ) {
2788- a -> func (& a -> arg );
2786+ s = & config .switch_bindings [ji ];
2787+ if (event -> switch_state == s -> fold && s -> func ) {
2788+ s -> func (& s -> arg );
27892789 return ;
27902790 }
27912791 }
0 commit comments