diff --git a/keys.cpp b/keys.cpp index 9a84a54..035cc58 100644 --- a/keys.cpp +++ b/keys.cpp @@ -224,10 +224,12 @@ int main(int argc, char* argv[]) LOG(INFO) << "Creating keyboard"; Keyboard keyboard(params, config.hor_layout_filename, config.layout_filename, key_colors); +/* LOG(INFO) << "Creating switcher"; Switcher switcher(switcher_params, "apps_icon", "phone_icon", "launch_icon"); switcher.SetBackground(display.MakeXColor(0,0,0)); switcher.SetForeground(display.MakeXColor(200,200,200)); +*/ keyboard.SetBackground(display.MakeXColor(0,0,0)); keyboard.SetForeground(display.MakeXColor(255,255,255)); keyboard.SetVibrator(&vibrator); @@ -239,7 +241,7 @@ int main(int argc, char* argv[]) slider.AddAction(Slider::SLIDE_N, "keyboard_show"); slider.AddAction(Slider::SLIDE_E, "$win_ctrl1"); slider.AddAction(Slider::SLIDE_W, "$win_ctrl2"); - +/* LOG(INFO) << "Creating touchpad"; Touchpad touchpad(touchpad_params, "pointer", config.touchpad_sensivity); touchpad.SetBackground(display.MakeXColor(0,0,0)); @@ -264,13 +266,14 @@ int main(int argc, char* argv[]) slider4.SetBackground(display.MakeXColor(0,0,1)); slider4.SetTransparent(true); slider4.AddAction(Slider::SLIDE_S, "switcher_show"); - +*/ LOG(INFO) << "Setting position and orientation"; keyboard.SetPosition(Applet::SOUTH); slider.SetPosition(Applet::SOUTH_EAST); Applet::Rotation rot = (display.Width() <= 480) ? Applet::PORTRAIT : Applet::LANDSCAPE; keyboard.WindowRotate(rot); slider.WindowRotate(rot); +/* touchpad.SetPosition(Applet::SOUTH); touchpad.WindowRotate(rot); touchpad.Hide(); @@ -282,22 +285,24 @@ int main(int argc, char* argv[]) slider3.WindowRotate(rot); slider4.SetPosition(Applet::NORTH_EAST); slider4.WindowRotate(rot); - +*/ LOG(INFO) << "Loading keyboard layout"; LOG(INFO) << "Showing keyboard"; keyboard.SetTransparent(true); keyboard.Hide(); - switcher.Hide(); +// switcher.Hide(); slider.Show(); - slider2.Show(); - slider3.Show(); +// slider2.Show(); +// slider3.Show(); if (config.switcher_on) - slider4.Show(); + { +// slider4.Show(); + } else - slider4.Hide(); +// slider4.Hide(); int bpressx=-1, bpressy=-1; @@ -305,12 +310,14 @@ int main(int argc, char* argv[]) vector applets; applets.push_back(&keyboard); applets.push_back(&slider); +/* applets.push_back(&slider2); applets.push_back(&slider3); if (config.switcher_on) applets.push_back(&slider4); applets.push_back(&touchpad); applets.push_back(&switcher); +*/ LOG(INFO) << "Processing events"; @@ -384,28 +391,28 @@ int main(int argc, char* argv[]) } if (action == "slider_show"){ slider.Show(); - slider2.Show(); +// slider2.Show(); } else if (action == "top_slider_show"){ - slider3.Show(); - slider4.Show(); +// slider3.Show(); +// slider4.Show(); } else if (action == "keyboard_show"){ keyboard.Show(); keyboard.Refresh(); slider.Hide(); - slider2.Hide(); +// slider2.Hide(); } else if (action == "switcher_show"){ LOG(INFO) << "Switcher"; - switcher.Show(); - slider3.Hide(); - slider4.Hide(); +// switcher.Show(); +// slider3.Hide(); +// slider4.Hide(); } else if (action == "touchpad_show"){ - touchpad.Show(); +// touchpad.Show(); slider.Hide(); - slider2.Hide(); +// slider2.Hide(); } else display.GenKeyEvent(action);