Attachment #348206 for bug #469772




      mvaddstr(7, 0, "In monochrome, meters are displayed through different chars, in order: |#*@$%&");
   }
   mvaddstr( 8, 0, " Status: R: running; S: sleeping; T: traced/stopped; Z: zombie; D: disk sleep");
   mvaddstr( 9, 0, "   hjkl: scroll process list             F5 t: tree view");
   mvaddstr(10, 0, " Digits: incremental PID search             u: show processes of a single user");
   mvaddstr(11, 0, "   F3 /: incremental name search            H: hide/show user threads");
   mvaddstr(12, 0, "   F4 \\: incremental name filtering         K: hide/show kernel threads");
   mvaddstr(13, 0, "  Space: tag processes                      F: cursor follows process");
   mvaddstr(14, 0, "      U: untag all processes              + -: expand/collapse tree");
   mvaddstr(15, 0, "   F9 d: kill process/tagged processes  P M T: sort by CPU%, MEM% or TIME");
   mvaddstr(16, 0, "   ] F7: higher priority (root only)        i: set IO priority");
   mvaddstr(17, 0, "   [ F8: lower priority (+ nice)            I: invert sort order");
#if (HAVE_LIBHWLOC || HAVE_NATIVE_AFFINITY)

   else
#endif
      mvaddstr(18, 0, "                                         F6 >: select sort column");
   mvaddstr(19, 0, "   F2 S: setup                              L: list open files with lsof");
   mvaddstr(20, 0, "   F1 ?: show this help screen              s: trace syscalls with strace");
   mvaddstr(21, 0, "  F10 q: quit");

   attrset(CRT_colors[HELP_BOLD]);
   mvaddstr( 9, 0, "   hjkl"); mvaddstr( 9,40, " F5 t");
   mvaddstr(10, 0, " Digits"); mvaddstr(10,40, "    u");
   mvaddstr(11, 0, "   F3 /"); mvaddstr(11,40, "    H");
   mvaddstr(12, 0, "   F4 \\"); mvaddstr(12,40, "    K");
   mvaddstr(13, 0, "  Space"); mvaddstr(13,40, "    F");
   mvaddstr(14, 0, "      U"); mvaddstr(14,40, "  + -");
   mvaddstr(15, 0, "   F9 d"); mvaddstr(15,40, "P M T");
   mvaddstr(16, 0, "   ] F7"); mvaddstr(16,40, "    i");
   mvaddstr(17, 0, "   [ F8"); mvaddstr(17,40, "    I");
                               mvaddstr(18,40, " F6 >");

   if (pl->cpuCount > 1)
      mvaddstr(18, 0, "      a:");
#endif
   mvaddstr(19, 0, "   F2 S"); mvaddstr(19,40, "    L");
   mvaddstr(20, 0, " ? F1 ?"); mvaddstr(20,40, "    s");
   mvaddstr(21, 0, "  F10 q");
   attrset(CRT_colors[DEFAULT_COLOR]);


         break;
      }
      case KEY_F(1):
      case 'h':
      case '?':
      {
         showHelp(pl);

         CRT_enableDelay();
         break;
      }
      case 'L':
      {
         Process* p = (Process*) Panel_getSelected(panel);
         if (!p) break;

         break;
      }
      case KEY_F(9):
      case 'd':
      {
         if (!killPanel) {
            killPanel = (Panel*) SignalsPanel_new(0, 0, 0, 0);




   assert (this != NULL);
   switch (key) {
   case KEY_DOWN:
   case 'j':
   case KEY_CTRLN:
      if (this->selected + 1 < Vector_size(this->items))
         this->selected++;
      return true;
   case KEY_UP:
   case 'k':
   case KEY_CTRLP:
      if (this->selected > 0)
         this->selected--;

      return true;
   #endif
   case KEY_LEFT:
   case 'h':
   case KEY_CTRLB:
      if (this->scrollH > 0) {
         this->scrollH -= 5;

      }
      return true;
   case KEY_RIGHT:
   case 'l':
   case KEY_CTRLF:
      this->scrollH += 5;
      this->needsRedraw = true;

Return to bug 469772

Lines 119-131 Link Here

(-)b/htop.c (-11 / +10 lines)
119	mvaddstr(7, 0, "In monochrome, meters are displayed through different chars, in order: \|#*@$%&");	119	mvaddstr(7, 0, "In monochrome, meters are displayed through different chars, in order: \|#*@$%&");
120	}	120	}
121	mvaddstr( 8, 0, " Status: R: running; S: sleeping; T: traced/stopped; Z: zombie; D: disk sleep");	121	mvaddstr( 8, 0, " Status: R: running; S: sleeping; T: traced/stopped; Z: zombie; D: disk sleep");
122	mvaddstr( 9, 0, " Arrows: scroll process list F5 t: tree view");	122	mvaddstr( 9, 0, " hjkl: scroll process list F5 t: tree view");
123	mvaddstr(10, 0, " Digits: incremental PID search u: show processes of a single user");	123	mvaddstr(10, 0, " Digits: incremental PID search u: show processes of a single user");
124	mvaddstr(11, 0, " F3 /: incremental name search H: hide/show user threads");	124	mvaddstr(11, 0, " F3 /: incremental name search H: hide/show user threads");
125	mvaddstr(12, 0, " F4 \\: incremental name filtering K: hide/show kernel threads");	125	mvaddstr(12, 0, " F4 \\: incremental name filtering K: hide/show kernel threads");
126	mvaddstr(13, 0, " Space: tag processes F: cursor follows process");	126	mvaddstr(13, 0, " Space: tag processes F: cursor follows process");
127	mvaddstr(14, 0, " U: untag all processes + -: expand/collapse tree");	127	mvaddstr(14, 0, " U: untag all processes + -: expand/collapse tree");
128	mvaddstr(15, 0, " F9 k: kill process/tagged processes P M T: sort by CPU%, MEM% or TIME");	128	mvaddstr(15, 0, " F9 d: kill process/tagged processes P M T: sort by CPU%, MEM% or TIME");
129	mvaddstr(16, 0, " ] F7: higher priority (root only) i: set IO priority");	129	mvaddstr(16, 0, " ] F7: higher priority (root only) i: set IO priority");
130	mvaddstr(17, 0, " [ F8: lower priority (+ nice) I: invert sort order");	130	mvaddstr(17, 0, " [ F8: lower priority (+ nice) I: invert sort order");
131	#if (HAVE_LIBHWLOC \|\| HAVE_NATIVE_AFFINITY)	131	#if (HAVE_LIBHWLOC \|\| HAVE_NATIVE_AFFINITY)
Lines 134-151 Link Here
134	else	134	else
135	#endif	135	#endif
136	mvaddstr(18, 0, " F6 >: select sort column");	136	mvaddstr(18, 0, " F6 >: select sort column");
137	mvaddstr(19, 0, " F2 S: setup l: list open files with lsof");	137	mvaddstr(19, 0, " F2 S: setup L: list open files with lsof");
138	mvaddstr(20, 0, " F1 h: show this help screen s: trace syscalls with strace");	138	mvaddstr(20, 0, " F1 ?: show this help screen s: trace syscalls with strace");
139	mvaddstr(21, 0, " F10 q: quit");	139	mvaddstr(21, 0, " F10 q: quit");
140		140
141	attrset(CRT_colors[HELP_BOLD]);	141	attrset(CRT_colors[HELP_BOLD]);
142	mvaddstr( 9, 0, " Arrows"); mvaddstr( 9,40, " F5 t");	142	mvaddstr( 9, 0, " hjkl"); mvaddstr( 9,40, " F5 t");
143	mvaddstr(10, 0, " Digits"); mvaddstr(10,40, " u");	143	mvaddstr(10, 0, " Digits"); mvaddstr(10,40, " u");
144	mvaddstr(11, 0, " F3 /"); mvaddstr(11,40, " H");	144	mvaddstr(11, 0, " F3 /"); mvaddstr(11,40, " H");
145	mvaddstr(12, 0, " F4 \\"); mvaddstr(12,40, " K");	145	mvaddstr(12, 0, " F4 \\"); mvaddstr(12,40, " K");
146	mvaddstr(13, 0, " Space"); mvaddstr(13,40, " F");	146	mvaddstr(13, 0, " Space"); mvaddstr(13,40, " F");
147	mvaddstr(14, 0, " U"); mvaddstr(14,40, " + -");	147	mvaddstr(14, 0, " U"); mvaddstr(14,40, " + -");
148	mvaddstr(15, 0, " F9 k"); mvaddstr(15,40, "P M T");	148	mvaddstr(15, 0, " F9 d"); mvaddstr(15,40, "P M T");
149	mvaddstr(16, 0, " ] F7"); mvaddstr(16,40, " i");	149	mvaddstr(16, 0, " ] F7"); mvaddstr(16,40, " i");
150	mvaddstr(17, 0, " [ F8"); mvaddstr(17,40, " I");	150	mvaddstr(17, 0, " [ F8"); mvaddstr(17,40, " I");
151	mvaddstr(18,40, " F6 >");	151	mvaddstr(18,40, " F6 >");
Lines 153-160 Link Here
153	if (pl->cpuCount > 1)	153	if (pl->cpuCount > 1)
154	mvaddstr(18, 0, " a:");	154	mvaddstr(18, 0, " a:");
155	#endif	155	#endif
156	mvaddstr(19, 0, " F2 S"); mvaddstr(19,40, " l");	156	mvaddstr(19, 0, " F2 S"); mvaddstr(19,40, " L");
157	mvaddstr(20, 0, " ? F1 h"); mvaddstr(20,40, " s");	157	mvaddstr(20, 0, " ? F1 ?"); mvaddstr(20,40, " s");
158	mvaddstr(21, 0, " F10 q");	158	mvaddstr(21, 0, " F10 q");
159	attrset(CRT_colors[DEFAULT_COLOR]);	159	attrset(CRT_colors[DEFAULT_COLOR]);
160		160
Lines 670-676 Link Here
670	break;	670	break;
671	}	671	}
672	case KEY_F(1):	672	case KEY_F(1):
673	case 'h':
674	case '?':	673	case '?':
675	{	674	{
676	showHelp(pl);	675	showHelp(pl);
Lines 706-712 Link Here
706	CRT_enableDelay();	705	CRT_enableDelay();
707	break;	706	break;
708	}	707	}
709	case 'l':	708	case 'L':
710	{	709	{
711	Process* p = (Process*) Panel_getSelected(panel);	710	Process* p = (Process*) Panel_getSelected(panel);
712	if (!p) break;	711	if (!p) break;
Lines 770-776 Link Here
770	break;	769	break;
771	}	770	}
772	case KEY_F(9):	771	case KEY_F(9):
773	case 'k':	772	case 'd':
774	{	773	{
775	if (!killPanel) {	774	if (!killPanel) {
776	killPanel = (Panel*) SignalsPanel_new(0, 0, 0, 0);	775	killPanel = (Panel*) SignalsPanel_new(0, 0, 0, 0);

Lines 345-355 Link Here

(-)b/Panel.c (+4 lines)
345	assert (this != NULL);	345	assert (this != NULL);
346	switch (key) {	346	switch (key) {
347	case KEY_DOWN:	347	case KEY_DOWN:
		348	case 'j':
348	case KEY_CTRLN:	349	case KEY_CTRLN:
349	if (this->selected + 1 < Vector_size(this->items))	350	if (this->selected + 1 < Vector_size(this->items))
350	this->selected++;	351	this->selected++;
351	return true;	352	return true;
352	case KEY_UP:	353	case KEY_UP:
		354	case 'k':
353	case KEY_CTRLP:	355	case KEY_CTRLP:
354	if (this->selected > 0)	356	if (this->selected > 0)
355	this->selected--;	357	this->selected--;
Lines 377-382 Link Here
377	return true;	379	return true;
378	#endif	380	#endif
379	case KEY_LEFT:	381	case KEY_LEFT:
		382	case 'h':
380	case KEY_CTRLB:	383	case KEY_CTRLB:
381	if (this->scrollH > 0) {	384	if (this->scrollH > 0) {
382	this->scrollH -= 5;	385	this->scrollH -= 5;
Lines 384-389 Link Here
384	}	387	}
385	return true;	388	return true;
386	case KEY_RIGHT:	389	case KEY_RIGHT:
		390	case 'l':
387	case KEY_CTRLF:	391	case KEY_CTRLF:
388	this->scrollH += 5;	392	this->scrollH += 5;
389	this->needsRedraw = true;	393	this->needsRedraw = true;