Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-12-04 19:47:31 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Show meaningful messages for invalid operations ##panels

Browse Source
This commit is contained in:
Vanellope 2019-04-17 02:43:50 +09:00 committed by radare
parent 71dd95bb90
commit 69e137d3b6
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libr/core/panels.c
View File

@ -741,8 +741,14 @@ static void activateCursor(RCore *core) {
|| !strcmp (cur->model->cmd, PANEL_CMD_REGISTERS)
|| !strcmp (cur->model->cmd, PANEL_CMD_DISASSEMBLY)
|| !strcmp (cur->model->cmd, PANEL_CMD_HEXDUMP)) {
if (cur->model->cache) {
(void)r_cons_any_key ("Please turn off cache by \'&\' if you wish to use cursor.");
return;
}
setCursor (core, !core->print->cur_enabled);
cur->view->refresh = true;
} else {
(void)r_cons_any_key ("Cursor is not available for the current panel.");
}
}
@ -865,8 +871,8 @@ static bool handleZoomMode(RCore *core, const int key) {
toggleZoomMode (panels);
break;
case 'c':
toggleZoomMode (panels);
return false;
activateCursor (core);
break;
case ';':
case ' ':
case 'b':
@ -1743,7 +1749,7 @@ static RConsCanvas *createNewCanvas(RCore *core, int w, int h) {
static bool checkPanelNum(RPanels *panels) {
if (panels->n_panels + 1 > PANEL_NUM_LIMIT) {
const char *msg = "panel limit exceeded.";
r_cons_yesno ('y', msg);
(void)r_cons_any_key (msg);
return false;
}
return true;
@ -1858,7 +1864,7 @@ static int saveLayoutCb(void *user) {
RCore *core = (RCore *)user;
savePanelsLayout (core, false);
const char *msg = "Panels layout saved!";
r_cons_yesno ('y', msg);
(void)r_cons_any_key (msg);
return 0;
}
@ -3425,6 +3431,10 @@ static void showHelp(RCore *core, RPanelsMode mode) {
}
static void insertValue(RCore *core) {
if (!r_config_get_i (core->config, "io.cache")) {
(void)r_cons_any_key ("Insert is not available because io.cache is off");
return;
}
RPanels *panels = core->panels;
RPanel *cur = getCurPanel (panels);
char buf[128];