Changes in uspace/app/calculator/calculator.c [db3895d:46bd63c9] in mainline

File:

• uspace/app/calculator/calculator.c (modified) (11 diffs)

uspace/app/calculator/calculator.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * Copyright (c) 2016 Martin Decky
  * All rights reserved.
@@ -46 +46 @@
 #include <ui/entry.h>
 #include <ui/fixed.h>
+#include <ui/menu.h>
 #include <ui/menubar.h>
-#include <ui/menu.h>
+#include <ui/menudd.h>
 #include <ui/menuentry.h>
 #include <ui/pbutton.h>
@@ -186 +187 @@
         calc_t *calc = (calc_t *) arg;
 
+        if (ui_window_def_kbd(window, event) == ui_claimed)
+                return;
+
         if (event->type == KEY_PRESS && (event->mods & KM_CTRL) != 0) {
                 switch (event->key) {
@@ -787 +791 @@
 int main(int argc, char *argv[])
 {
-        const char *display_spec = UI_DISPLAY_DEFAULT;
+        const char *display_spec = UI_ANY_DEFAULT;
         ui_t *ui;
         ui_resource_t *ui_res;
@@ -833 +837 @@
         if (ui_is_textmode(ui)) {
                 params.rect.p1.x = 38;
-                params.rect.p1.y = 19;
+                params.rect.p1.y = 18;
 
                 calc.geom.menubar_rect.p0.x = 1;
-                calc.geom.menubar_rect.p0.y = 2;
+                calc.geom.menubar_rect.p0.y = 1;
                 calc.geom.menubar_rect.p1.x = params.rect.p1.x - 1;
-                calc.geom.menubar_rect.p1.y = 3;
+                calc.geom.menubar_rect.p1.y = 2;
                 calc.geom.entry_rect.p0.x = 4;
-                calc.geom.entry_rect.p0.y = 4;
+                calc.geom.entry_rect.p0.y = 3;
                 calc.geom.entry_rect.p1.x = 34;
-                calc.geom.entry_rect.p1.y = 5;
+                calc.geom.entry_rect.p1.y = 4;
                 calc.geom.btn_orig.x = 4;
-                calc.geom.btn_orig.y = 6;
+                calc.geom.btn_orig.y = 5;
                 calc.geom.btn_dim.x = 6;
                 calc.geom.btn_dim.y = 2;
@@ -893 +897 @@
         }
 
-        rc = ui_menu_create(calc.menubar, "File", &mfile);
+        rc = ui_menu_dd_create(calc.menubar, "~F~ile", NULL, &mfile);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -899 +903 @@
         }
 
-        rc = ui_menu_entry_create(mfile, "Exit", "Alt-F4", &mexit);
+        rc = ui_menu_entry_create(mfile, "E~x~it", "Alt-F4", &mexit);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -907 +911 @@
         ui_menu_entry_set_cb(mexit, calc_file_exit, (void *) &calc);
 
-        rc = ui_menu_create(calc.menubar, "Edit", &medit);
+        rc = ui_menu_dd_create(calc.menubar, "~E~dit", NULL, &medit);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -913 +917 @@
         }
 
-        rc = ui_menu_entry_create(medit, "Copy", "Ctrl-C", &mcopy);
+        rc = ui_menu_entry_create(medit, "~C~opy", "Ctrl-C", &mcopy);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -921 +925 @@
         ui_menu_entry_set_cb(mcopy, calc_edit_copy, (void *) &calc);
 
-        rc = ui_menu_entry_create(medit, "Paste", "Ctrl-V", &mpaste);
+        rc = ui_menu_entry_create(medit, "~P~aste", "Ctrl-V", &mpaste);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -945 +949 @@
         ui_entry_set_rect(display, &calc.geom.entry_rect);
         ui_entry_set_halign(display, gfx_halign_right);
+        ui_entry_set_read_only(display, true);
 
         rc = ui_fixed_add(fixed, ui_entry_ctl(display));