Skip to content

Commit ee5a701

Browse files
cyringcyring
committed
[UI] Suggesting the Events window
1 parent 0794238 commit ee5a701

File tree

6 files changed

+103
-99
lines changed

6 files changed

+103
-99
lines changed

‎corefreq-cli-rsc-en.h

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1671,20 +1671,22 @@
16711671
#define RSC_BOX_OPS_UNREGISTER_COND1_CODE_EN \
16721672
" < Unregister > "
16731673

1674-
#define RSC_BOX_EVENT_TITLE_CODE_EN " Clear Event "
1675-
1676-
#define RSC_BOX_EVENT_SPACE_CODE_EN " "
1677-
#define RSC_BOX_EVENT_THERMAL_SENSOR_CODE_EN " Thermal Sensor "
1678-
#define RSC_BOX_EVENT_PROCHOT_AGENT_CODE_EN " PROCHOT# Agent "
1679-
#define RSC_BOX_EVENT_CRITICAL_TEMP_CODE_EN " Critical Temperature "
1680-
#define RSC_BOX_EVENT_THERM_THRESHOLD_CODE_EN " Thermal Threshold "
1681-
#define RSC_BOX_EVENT_POWER_LIMIT_CODE_EN " Power Limitation "
1682-
#define RSC_BOX_EVENT_CURRENT_LIMIT_CODE_EN " Current Limitation "
1683-
#define RSC_BOX_EVENT_CROSS_DOM_LIMIT_CODE_EN " Cross Domain Limit. "
1684-
#define RSC_BOX_EVENT_POWER_PL1_CODE_EN " Package PL1 "
1685-
#define RSC_BOX_EVENT_POWER_PL2_CODE_EN " Package PL2 "
1686-
#define RSC_BOX_EVENT_ELECTRICAL_CODE_EN " Electrical EDP "
1687-
#define RSC_BOX_EVENT_MAX_TURBO_CODE_EN " Max Turbo Limit. "
1674+
#define RSC_BOX_EVENT_TITLE_CODE_EN \
1675+
" DTS ----------- Core ---------- GFX ----------- Ring "
1676+
1677+
#define RSC_BOX_EVENT_SPACE_CODE_EN " "
1678+
#define RSC_BOX_EVENT_THERMAL_SENSOR_CODE_EN " Thermal Sensor "
1679+
#define RSC_BOX_EVENT_PROCHOT_AGENT_CODE_EN " PROCHOT "
1680+
#define RSC_BOX_EVENT_CRITICAL_TEMP_CODE_EN " Critical Temp. "
1681+
#define RSC_BOX_EVENT_THERM_THRESHOLD_CODE_EN " Therm Threshold"
1682+
#define RSC_BOX_EVENT_POWER_LIMIT_CODE_EN " Power Limit. "
1683+
#define RSC_BOX_EVENT_CURRENT_LIMIT_CODE_EN " Current Limit. "
1684+
#define RSC_BOX_EVENT_CROSS_DOM_LIMIT_CODE_EN " XDomain Limit. "
1685+
#define RSC_BOX_EVENT_POWER_PL1_CODE_EN " Package PL1 "
1686+
#define RSC_BOX_EVENT_POWER_PL2_CODE_EN " Package PL2 "
1687+
#define RSC_BOX_EVENT_ELECTRICAL_CODE_EN " Electrical EDP "
1688+
#define RSC_BOX_EVENT_MAX_TURBO_CODE_EN " Max Turbo "
1689+
#define RSC_BOX_EVENT_THERMAL_LOG_CODE_EN " Thermal Log "
16881690

16891691
#define RSC_BOX_STATE_UNSPECIFIED_CODE_EN " UNSPECIFIED "
16901692

‎corefreq-cli-rsc-fr.h

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,25 +1159,21 @@ do echo -en "$h$l\t""\xc3""\x$h$l""\t"; done; done;echo
11591159
#define RSC_BOX_OPS_UNREGISTER_COND1_CODE_FR " < D""\xa9""s" \
11601160
"enregistrer > "
11611161

1162-
#define RSC_BOX_EVENT_TITLE_CODE_FR " Effacer " \
1163-
"\x89""v""\xa8""nement "
1164-
1165-
#define RSC_BOX_EVENT_SPACE_CODE_FR " "
1166-
#define RSC_BOX_EVENT_THERMAL_SENSOR_CODE_FR " Capteur thermique "
1167-
#define RSC_BOX_EVENT_PROCHOT_AGENT_CODE_FR " Agent PROCHOT# "
1168-
#define RSC_BOX_EVENT_CRITICAL_TEMP_CODE_FR " Temp""\xa9""rature" \
1169-
" critique "
1170-
1171-
#define RSC_BOX_EVENT_THERM_THRESHOLD_CODE_FR " Seuil thermique "
1172-
#define RSC_BOX_EVENT_POWER_LIMIT_CODE_FR " Limitation de puissance "
1173-
#define RSC_BOX_EVENT_CURRENT_LIMIT_CODE_FR " Limitation de courant "
1174-
#define RSC_BOX_EVENT_CROSS_DOM_LIMIT_CODE_FR " Limitation interdomaine "
1175-
#define RSC_BOX_EVENT_POWER_PL1_CODE_FR " PL1 du Package "
1176-
#define RSC_BOX_EVENT_POWER_PL2_CODE_FR " PL2 du Package "
1177-
#define RSC_BOX_EVENT_ELECTRICAL_CODE_FR " EDP " \
1178-
"\xa9""lectrique "
1179-
1180-
#define RSC_BOX_EVENT_MAX_TURBO_CODE_FR " Limitation Turbo Max. "
1162+
#define RSC_BOX_EVENT_TITLE_CODE_FR RSC_BOX_EVENT_TITLE_CODE_EN
1163+
1164+
#define RSC_BOX_EVENT_SPACE_CODE_FR " "
1165+
#define RSC_BOX_EVENT_THERMAL_SENSOR_CODE_FR " Capteur therm. "
1166+
#define RSC_BOX_EVENT_PROCHOT_AGENT_CODE_FR " PROCHOT "
1167+
#define RSC_BOX_EVENT_CRITICAL_TEMP_CODE_FR " Temp. critique "
1168+
#define RSC_BOX_EVENT_THERM_THRESHOLD_CODE_FR " Seuil thermique"
1169+
#define RSC_BOX_EVENT_POWER_LIMIT_CODE_FR " Puissance limit"
1170+
#define RSC_BOX_EVENT_CURRENT_LIMIT_CODE_FR " Courant limit""\xa9"" "
1171+
#define RSC_BOX_EVENT_CROSS_DOM_LIMIT_CODE_FR " Interdomaine "
1172+
#define RSC_BOX_EVENT_POWER_PL1_CODE_FR " PL1 du Package "
1173+
#define RSC_BOX_EVENT_POWER_PL2_CODE_FR " PL2 du Package "
1174+
#define RSC_BOX_EVENT_ELECTRICAL_CODE_FR " EDP ""\xa9""lectrique "
1175+
#define RSC_BOX_EVENT_MAX_TURBO_CODE_FR " Turbo Max "
1176+
#define RSC_BOX_EVENT_THERMAL_LOG_CODE_FR " Log thermique "
11811177

11821178
#define RSC_BOX_STATE_UNSPECIFIED_CODE_FR " " \
11831179
"IND""\x89""TERMIN""\x89"\

‎corefreq-cli-rsc-theme-dflt.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66

77
#define RSC_THEME_DFLT_CODE /* 72 chars */ \
8-
" Default theme by CyrIng. Since 2015; updated Mar. 2022 "
8+
" Default theme by CyrIng. Since 2015; updated Apr. 2022 "
99

1010
#define RSC_UI_THM_DFLT_ATTR \
1111
{ \
@@ -1881,7 +1881,7 @@
18811881

18821882
#define RSC_BOX_EVENT_THM_DFLT_ATTR \
18831883
{ \
1884-
LWK, \
1884+
HDK, \
18851885
LMK, \
18861886
HYK \
18871887
}

‎corefreq-cli-rsc.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1607,6 +1607,7 @@ RESOURCE_ST Resource[] = {
16071607
LDT(RSC_BOX_EVENT_POWER_PL2),
16081608
LDT(RSC_BOX_EVENT_ELECTRICAL),
16091609
LDT(RSC_BOX_EVENT_MAX_TURBO),
1610+
LDT(RSC_BOX_EVENT_THERMAL_LOG),
16101611
LDT(RSC_BOX_STATE_UNSPECIFIED),
16111612
LDQ(RSC_BOX_STATE_C8),
16121613
LDQ(RSC_BOX_STATE_C7),

‎corefreq-cli-rsc.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1411,6 +1411,7 @@ enum {
14111411
RSC_BOX_EVENT_POWER_PL2,
14121412
RSC_BOX_EVENT_ELECTRICAL,
14131413
RSC_BOX_EVENT_MAX_TURBO,
1414+
RSC_BOX_EVENT_THERMAL_LOG,
14141415
RSC_BOX_STATE_UNSPECIFIED,
14151416
RSC_BOX_STATE_C8,
14161417
RSC_BOX_STATE_C7,

‎corefreq-cli.c

Lines changed: 68 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -9676,106 +9676,106 @@ Window *CreateEvents(unsigned long long id)
96769676
{
96779677
/* Thermal Sensor */
96789678
{ {BOXKEY_CLR_THM_SENSOR},RSC(BOX_EVENT_THERMAL_SENSOR).CODE(),
9679-
EVENT_THERM_SENSOR, 1 },
9679+
EVENT_THERM_SENSOR , 1 },
96809680
/* PROCHOT# Agent */
96819681
{ {BOXKEY_CLR_THM_PROCHOT}, RSC(BOX_EVENT_PROCHOT_AGENT).CODE(),
9682-
EVENT_THERM_PROCHOT, 1 },
9682+
EVENT_THERM_PROCHOT , 1 },
96839683
/* Critical Temperature */
9684-
{ {BOXKEY_CLR_THM_CRIT}, RSC(BOX_EVENT_CRITICAL_TEMP).CODE(),
9685-
EVENT_THERM_CRIT, 1 },
9684+
{ {BOXKEY_CLR_THM_CRIT} , RSC(BOX_EVENT_CRITICAL_TEMP).CODE(),
9685+
EVENT_THERM_CRIT , 1 },
96869686
/* Thermal Threshold */
9687-
{ {BOXKEY_CLR_THM_THOLD}, RSC(BOX_EVENT_THERM_THRESHOLD).CODE(),
9688-
EVENT_THERM_THOLD, 1 },
9687+
{ {BOXKEY_CLR_THM_THOLD} , RSC(BOX_EVENT_THERM_THRESHOLD).CODE(),
9688+
EVENT_THERM_THOLD , 1 },
96899689
/* Power Limitation */
9690-
{ {BOXKEY_CLR_PWR_LIMIT}, RSC(BOX_EVENT_POWER_LIMIT).CODE(),
9691-
EVENT_POWER_LIMIT, 2 },
9690+
{ {BOXKEY_CLR_PWR_LIMIT} , RSC(BOX_EVENT_POWER_LIMIT).CODE(),
9691+
EVENT_POWER_LIMIT , 2 },
96929692
/* Current Limitation */
9693-
{ {BOXKEY_CLR_CUR_LIMIT}, RSC(BOX_EVENT_CURRENT_LIMIT).CODE(),
9694-
EVENT_CURRENT_LIMIT, 2 },
9693+
{ {BOXKEY_CLR_CUR_LIMIT} , RSC(BOX_EVENT_CURRENT_LIMIT).CODE(),
9694+
EVENT_CURRENT_LIMIT , 2 },
96959695
/* Cross Domain Limit. */
9696-
{ {BOXKEY_CLR_X_DOMAIN}, RSC(BOX_EVENT_CROSS_DOM_LIMIT).CODE(),
9697-
EVENT_CROSS_DOMAIN, 1 }
9696+
{ {BOXKEY_CLR_X_DOMAIN} , RSC(BOX_EVENT_CROSS_DOM_LIMIT).CODE(),
9697+
EVENT_CROSS_DOMAIN , 1 }
96989698
}, {
9699-
/* PROCHOT# Agent */
9700-
{ {BOXKEY_CLR_CORE_HOT}, RSC(BOX_EVENT_PROCHOT_AGENT).CODE(),
9701-
EVENT_CORE_HOT , 1 },
97029699
/* Thermal Sensor */
9703-
{ {BOXKEY_CLR_CORE_THM}, RSC(BOX_EVENT_THERMAL_SENSOR).CODE(),
9704-
EVENT_CORE_THM , 1 },
9700+
{ {SCANKEY_NULL} , RSC(BOX_EVENT_THERMAL_SENSOR).CODE(),
9701+
EVENT_CORE_STS , 1 },
9702+
/* PROCHOT# Agent */
9703+
{ {BOXKEY_CLR_CORE_HOT} , RSC(BOX_EVENT_PROCHOT_AGENT).CODE(),
9704+
EVENT_CORE_HOT , 1 },
9705+
/* Thermal Log */
9706+
{ {BOXKEY_CLR_CORE_THM} , RSC(BOX_EVENT_THERMAL_LOG).CODE(),
9707+
EVENT_CORE_THM , 1 },
97059708
/* Package PL1 */
9706-
{ {BOXKEY_CLR_CORE_PL1}, RSC(BOX_EVENT_POWER_PL1).CODE(),
9707-
EVENT_CORE_PL1 , 2 },
9709+
{ {BOXKEY_CLR_CORE_PL1} , RSC(BOX_EVENT_POWER_PL1).CODE(),
9710+
EVENT_CORE_PL1 , 2 },
97089711
/* Package PL2 */
9709-
{ {BOXKEY_CLR_CORE_PL2}, RSC(BOX_EVENT_POWER_PL2).CODE(),
9710-
EVENT_CORE_PL2 , 2 },
9712+
{ {BOXKEY_CLR_CORE_PL2} , RSC(BOX_EVENT_POWER_PL2).CODE(),
9713+
EVENT_CORE_PL2 , 2 },
97119714
/* Electrical EDP */
9712-
{ {BOXKEY_CLR_CORE_EDP}, RSC(BOX_EVENT_ELECTRICAL).CODE(),
9713-
EVENT_CORE_EDP , 2 },
9715+
{ {BOXKEY_CLR_CORE_EDP} , RSC(BOX_EVENT_ELECTRICAL).CODE(),
9716+
EVENT_CORE_EDP , 2 },
97149717
/* Max Turbo Limit. */
9715-
{ {BOXKEY_CLR_CORE_TURBO},RSC(BOX_EVENT_MAX_TURBO).CODE(),
9716-
EVENT_CORE_TURBO, 2 },
9717-
/* Blank cell */
9718-
{ {SCANKEY_NULL}, RSC(BOX_EVENT_SPACE).CODE(),
9719-
EVENT_THERM_NONE, 0 }
9718+
{ {BOXKEY_CLR_CORE_TURBO} , RSC(BOX_EVENT_MAX_TURBO).CODE(),
9719+
EVENT_CORE_TURBO , 2 }
97209720
}, {
9721-
/* PROCHOT# Agent */
9722-
{ {BOXKEY_CLR_GFX_HOT}, RSC(BOX_EVENT_PROCHOT_AGENT).CODE(),
9723-
EVENT_GFX_HOT, 1 },
97249721
/* Thermal Sensor */
9725-
{ {BOXKEY_CLR_GFX_THM}, RSC(BOX_EVENT_THERMAL_SENSOR).CODE(),
9726-
EVENT_GFX_THM, 1 },
9722+
{ {SCANKEY_NULL} , RSC(BOX_EVENT_THERMAL_SENSOR).CODE(),
9723+
EVENT_GFX_STS , 1 },
9724+
/* PROCHOT# Agent */
9725+
{ {BOXKEY_CLR_GFX_HOT} , RSC(BOX_EVENT_PROCHOT_AGENT).CODE(),
9726+
EVENT_GFX_HOT , 1 },
9727+
/* Thermal Log */
9728+
{ {BOXKEY_CLR_GFX_THM} , RSC(BOX_EVENT_THERMAL_LOG).CODE(),
9729+
EVENT_GFX_THM , 1 },
97279730
/* Package PL1 */
9728-
{ {BOXKEY_CLR_GFX_PL1}, RSC(BOX_EVENT_POWER_PL1).CODE(),
9729-
EVENT_GFX_PL1, 2 },
9731+
{ {BOXKEY_CLR_GFX_PL1} , RSC(BOX_EVENT_POWER_PL1).CODE(),
9732+
EVENT_GFX_PL1 , 2 },
97309733
/* Package PL2 */
9731-
{ {BOXKEY_CLR_GFX_PL2}, RSC(BOX_EVENT_POWER_PL2).CODE(),
9732-
EVENT_GFX_PL2, 2 },
9734+
{ {BOXKEY_CLR_GFX_PL2} , RSC(BOX_EVENT_POWER_PL2).CODE(),
9735+
EVENT_GFX_PL2 , 2 },
97339736
/* Electrical EDP */
9734-
{ {BOXKEY_CLR_GFX_EDP}, RSC(BOX_EVENT_ELECTRICAL).CODE(),
9735-
EVENT_GFX_EDP, 2 },
9736-
/* Blank cell */
9737-
{ {SCANKEY_NULL}, RSC(BOX_EVENT_SPACE).CODE(),
9738-
EVENT_THERM_NONE, 0 },
9737+
{ {BOXKEY_CLR_GFX_EDP} , RSC(BOX_EVENT_ELECTRICAL).CODE(),
9738+
EVENT_GFX_EDP , 2 },
97399739
/* Blank cell */
9740-
{ {SCANKEY_NULL}, RSC(BOX_EVENT_SPACE).CODE(),
9741-
EVENT_THERM_NONE, 0 }
9740+
{ {SCANKEY_NULL} , RSC(BOX_EVENT_SPACE).CODE(),
9741+
EVENT_THERM_NONE , 0 }
97429742
}, {
9743-
/* PROCHOT# Agent */
9744-
{ {BOXKEY_CLR_RING_HOT}, RSC(BOX_EVENT_PROCHOT_AGENT).CODE(),
9745-
EVENT_RING_HOT , 1 },
97469743
/* Thermal Sensor */
9747-
{ {BOXKEY_CLR_RING_THM}, RSC(BOX_EVENT_THERMAL_SENSOR).CODE(),
9748-
EVENT_RING_THM , 1 },
9744+
{ {SCANKEY_NULL} , RSC(BOX_EVENT_THERMAL_SENSOR).CODE(),
9745+
EVENT_RING_STS , 1 },
9746+
/* PROCHOT# Agent */
9747+
{ {BOXKEY_CLR_RING_HOT} , RSC(BOX_EVENT_PROCHOT_AGENT).CODE(),
9748+
EVENT_RING_HOT , 1 },
9749+
/* Thermal Log */
9750+
{ {BOXKEY_CLR_RING_THM} , RSC(BOX_EVENT_THERMAL_LOG).CODE(),
9751+
EVENT_RING_THM , 1 },
97499752
/* Package PL1 */
9750-
{ {BOXKEY_CLR_RING_PL1}, RSC(BOX_EVENT_POWER_PL1).CODE(),
9751-
EVENT_RING_PL1 , 2 },
9753+
{ {BOXKEY_CLR_RING_PL1} , RSC(BOX_EVENT_POWER_PL1).CODE(),
9754+
EVENT_RING_PL1 , 2 },
97529755
/* Package PL2 */
9753-
{ {BOXKEY_CLR_RING_PL2}, RSC(BOX_EVENT_POWER_PL2).CODE(),
9754-
EVENT_RING_PL2 , 2 },
9756+
{ {BOXKEY_CLR_RING_PL2} , RSC(BOX_EVENT_POWER_PL2).CODE(),
9757+
EVENT_RING_PL2 , 2 },
97559758
/* Electrical EDP */
9756-
{ {BOXKEY_CLR_RING_EDP}, RSC(BOX_EVENT_ELECTRICAL).CODE(),
9757-
EVENT_RING_EDP , 2 },
9758-
/* Blank cell */
9759-
{ {SCANKEY_NULL}, RSC(BOX_EVENT_SPACE).CODE(),
9760-
EVENT_THERM_NONE, 0 },
9759+
{ {BOXKEY_CLR_RING_EDP} , RSC(BOX_EVENT_ELECTRICAL).CODE(),
9760+
EVENT_RING_EDP , 2 },
97619761
/* Blank cell */
9762-
{ {SCANKEY_NULL}, RSC(BOX_EVENT_SPACE).CODE(),
9763-
EVENT_THERM_NONE, 0 }
9762+
{ {SCANKEY_NULL} , RSC(BOX_EVENT_SPACE).CODE(),
9763+
EVENT_THERM_NONE , 0 }
97649764
}
97659765
};
97669766
const size_t nmemb = sizeof(evLdr) / sizeof(struct EVENT_LDR_ST);
97679767

97689768
Window *wEvent = CreateWindow( wLayer, id,
9769-
4, nmemb / 4, 1, TOP_HEADER_ROW + 3 );
9769+
4, nmemb / 4, 6, TOP_HEADER_ROW + 2 );
97709770
if (wEvent != NULL)
97719771
{
97729772
DATA_TYPE data;
97739773
CUINT col, row;
97749774
for (row = 0; row < 7; row++) {
9775-
for (col = 0; col < 4; col++)
9776-
{
9775+
for (col = 0; col < 4; col++) {
97779776
const unsigned short theme = ProcessorEvents & evLdr[col][row].mask ?
97789777
evLdr[col][row].theme : 0;
9778+
97799779
TGrid *grid = StoreTCell(wEvent,
97809780
evLdr[col][row].quick.key,
97819781
evLdr[col][row].item,
@@ -9788,7 +9788,11 @@ Window *CreateEvents(unsigned long long id)
97889788
}
97899789
}
97909790
}
9791-
StoreWindow(wEvent, .title, (char*) RSC(BOX_EVENT_TITLE).CODE());
9791+
wEvent->matrix.select.col = wEvent->matrix.size.wth - 1;
9792+
wEvent->matrix.select.row = wEvent->matrix.size.hth - 1;
9793+
9794+
StoreWindow(wEvent, .title, (char*) RSC(BOX_EVENT_TITLE).CODE());
9795+
StoreWindow(wEvent, .color[1].title, wEvent->hook.color[1].border);
97929796

97939797
StoreWindow(wEvent, .key.Enter, Enter_StickyCell);
97949798
StoreWindow(wEvent, .key.Left, MotionLeft_Win);

0 commit comments

Comments
 (0)