@@ -121,16 +121,18 @@ static void KeyProcess(string name = "m3")
121
121
}
122
122
}
123
123
124
- static void TabletMode ( )
124
+ static bool GetTouchpadState ( )
125
125
{
126
- bool touchpadState , tabletState ;
127
-
128
126
using ( var key = Registry . CurrentUser . OpenSubKey ( @"SOFTWARE\Microsoft\Windows\CurrentVersion\PrecisionTouchPad\Status" , false ) )
129
127
{
130
- touchpadState = ( key ? . GetValue ( "Enabled" ) ? . ToString ( ) == "1" ) ;
128
+ return ( key ? . GetValue ( "Enabled" ) ? . ToString ( ) == "1" ) ;
131
129
}
130
+ }
132
131
133
- tabletState = Program . acpi . DeviceGet ( AsusACPI . TabletState ) > 0 ;
132
+ static void TabletMode ( )
133
+ {
134
+ bool touchpadState = GetTouchpadState ( ) ;
135
+ bool tabletState = Program . acpi . DeviceGet ( AsusACPI . TabletState ) > 0 ;
134
136
135
137
Logger . WriteLine ( "Tablet: " + tabletState + " Touchpad: " + touchpadState ) ;
136
138
@@ -192,11 +194,13 @@ static void HandleEvent(int EventID)
192
194
Program . settingsForm . BeginInvoke ( Program . settingsForm . RunToast , brightness + "%" , ToastIcon . BrightnessUp ) ;
193
195
break ;
194
196
case 107 : // FN+F10
197
+ bool touchpadState = GetTouchpadState ( ) ;
195
198
AsusUSB . TouchpadToggle ( ) ;
196
- Program . settingsForm . BeginInvoke ( Program . settingsForm . RunToast , "Touchpad ", ToastIcon . Touchpad ) ;
199
+ Program . settingsForm . BeginInvoke ( Program . settingsForm . RunToast , touchpadState ? "Off" : "On ", ToastIcon . Touchpad ) ;
197
200
break ;
198
201
case 108 : // FN+F11
199
- Application . SetSuspendState ( PowerState . Suspend , true , true ) ;
202
+ Program . acpi . DeviceSet ( AsusACPI . UniversalControl , 0x6c , "Sleep" ) ;
203
+ //NativeMethods.SetSuspendState(false, true, true);
200
204
break ;
201
205
}
202
206
}
0 commit comments