diff options
author | Christian Göttsche <cgzones@googlemail.com> | 2021-12-08 15:18:10 +0100 |
---|---|---|
committer | Christian Göttsche <cgzones@googlemail.com> | 2021-12-08 16:34:15 +0100 |
commit | c9e0bd20026faf5368b32f1880d6194a81c2aa92 (patch) | |
tree | a90abdf93f2cc4ab7e34a890be95e630c3f80270 /ScreensPanel.c | |
parent | df1914f4295fdd1e566c10cebd5a51c7bab0361a (diff) |
ScreenPanel: misc updates
- use ASCII escape sequences
- use array allocation wrappers
Diffstat (limited to 'ScreensPanel.c')
-rw-r--r-- | ScreensPanel.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ScreensPanel.c b/ScreensPanel.c index 70e517c3..10370e4f 100644 --- a/ScreensPanel.c +++ b/ScreensPanel.c @@ -44,7 +44,7 @@ static void ScreensPanel_delete(Object* object) { static HandlerResult ScreensPanel_eventHandlerRenaming(Panel* super, int ch) { ScreensPanel* const this = (ScreensPanel*) super; - if (ch >= 32 && ch < 127 && ch != 61) { + if (ch >= 32 && ch < 127 && ch != '=') { if (this->cursor < SCREEN_NAME_LEN - 1) { this->buffer[this->cursor] = (char)ch; this->cursor++; @@ -64,8 +64,8 @@ static HandlerResult ScreensPanel_eventHandlerRenaming(Panel* super, int ch) { } break; } - case 0x0a: - case 0x0d: + case '\n': + case '\r': case KEY_ENTER: { ListItem* item = (ListItem*) Panel_getSelected(super); @@ -119,7 +119,7 @@ static void rebuildSettingsArray(Panel* super) { int n = Panel_size(super); free(this->settings->screens); - this->settings->screens = xMalloc(sizeof(ScreenSettings*) * (n + 1)); + this->settings->screens = xMallocArray(n + 1, sizeof(ScreenSettings*)); this->settings->screens[n] = NULL; for (int i = 0; i < n; i++) { ScreenListItem* item = (ScreenListItem*) Panel_get(super, i); @@ -147,8 +147,8 @@ static HandlerResult ScreensPanel_eventHandlerNormal(Panel* super, int ch) { bool shouldRebuildArray = false; HandlerResult result = IGNORED; switch(ch) { - case 0x0a: - case 0x0d: + case '\n': + case '\r': case KEY_ENTER: case KEY_MOUSE: case KEY_RECLICK: @@ -297,7 +297,7 @@ void ScreensPanel_update(Panel* super) { ScreensPanel* this = (ScreensPanel*) super; int size = Panel_size(super); this->settings->changed = true; - this->settings->screens = xRealloc(this->settings->screens, sizeof(char*) * (size+1)); + this->settings->screens = xReallocArray(this->settings->screens, size + 1, sizeof(ScreenSettings*)); for (int i = 0; i < size; i++) { ScreenListItem* item = (ScreenListItem*) Panel_get(super, i); ScreenSettings* ss = item->ss; |