Changeset dc5c303 in mainline for uspace/app/taskbar-cfg/types/smeedit.h

Timestamp:

2023-12-28T13:59:23Z (2 years ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

File:

• uspace/app/taskbar-cfg/types/smeedit.h (moved) (moved from kernel/generic/include/mem.h ) (2 diffs)

uspace/app/taskbar-cfg/types/smeedit.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup kernel_generic
+/** @addtogroup taskbar-cfg
  * @{
  */
-/** @file
+/**
+ * @file Start menu entry edit dialog
  */
 
-#ifndef KERN_MEM_H_
-#define KERN_MEM_H_
+#ifndef TYPES_SMEEDIT_H
+#define TYPES_SMEEDIT_H
 
-#include <stddef.h>
-#include <stdint.h>
-#include <cc.h>
+#include <ui/fixed.h>
+#include <ui/label.h>
+#include <ui/entry.h>
+#include <ui/pbutton.h>
+#include <ui/window.h>
 
-#ifdef CONFIG_LTO
-#define DO_NOT_DISCARD ATTRIBUTE_USED
-#else
-#define DO_NOT_DISCARD
-#endif
-
-#define memset(dst, val, cnt)  __builtin_memset((dst), (val), (cnt))
-#define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
-#define memcmp(s1, s2, cnt)    __builtin_memcmp((s1), (s2), (cnt))
-
-extern void memsetb(void *, size_t, uint8_t)
-    __attribute__((nonnull(1)));
-extern void memsetw(void *, size_t, uint16_t)
-    __attribute__((nonnull(1)));
-extern void *memmove(void *, const void *, size_t)
-    __attribute__((nonnull(1, 2))) DO_NOT_DISCARD;
+/** Start menu entry edit dialog */
+typedef struct smeedit {
+        /** Containing start menu configuration tab */
+        struct startmenu *startmenu;
+        /** Start menu entry or @c NULL if creating a new entry */
+        struct startmenu_entry *smentry;
+        /** Window */
+        ui_window_t *window;
+        /** Fixed layout */
+        ui_fixed_t *fixed;
+        /** 'Caption' label */
+        ui_label_t *lcaption;
+        /** Caption entry */
+        ui_entry_t *ecaption;
+        /** 'Command' label */
+        ui_label_t *lcmd;
+        /** Command entry */
+        ui_entry_t *ecmd;
+        /** OK buttion */
+        ui_pbutton_t *bok;
+        /** Cancel button */
+        ui_pbutton_t *bcancel;
+} smeedit_t;
 
 #endif