Skip to content

Commit 0665d79

Browse files
cyringcyring
committed
[UI] Column separators added to Processor Events window
1 parent f6a9b7e commit 0665d79

6 files changed

+85
-81
lines changed

‎corefreq-cli-rsc-en.h

+27-27
Original file line numberDiff line numberDiff line change
@@ -1672,33 +1672,33 @@
16721672
" < Unregister > "
16731673

16741674
#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_STS_CODE_EN " PROCHOT "
1680-
#define RSC_BOX_EVENT_PROCHOT_LOG_CODE_EN " PROCHOT Log "
1681-
#define RSC_BOX_EVENT_CRITICAL_TMP_CODE_EN " Critical Temp. "
1682-
#define RSC_BOX_EVENT_CRITICAL_LOG_CODE_EN " Critical Log "
1683-
#define RSC_BOX_EVENT_THOLD1_STS_CODE_EN " Th. Threshold1 "
1684-
#define RSC_BOX_EVENT_THOLD2_STS_CODE_EN " Th. Threshold2 "
1685-
#define RSC_BOX_EVENT_THOLD1_LOG_CODE_EN " Threshold1 Log "
1686-
#define RSC_BOX_EVENT_THOLD2_LOG_CODE_EN " Threshold2 Log "
1687-
#define RSC_BOX_EVENT_POWER_LIMIT_CODE_EN " Power Limit. "
1688-
#define RSC_BOX_EVENT_CURRENT_LIMIT_CODE_EN " Current Limit. "
1689-
#define RSC_BOX_EVENT_CROSS_DOM_LIMIT_CODE_EN " XDomain Limit. "
1690-
#define RSC_BOX_EVENT_RESIDENCY_CODE_EN " Residency "
1691-
#define RSC_BOX_EVENT_AVG_THERMAL_CODE_EN " Avg Thermal "
1692-
#define RSC_BOX_EVENT_VR_THERMAL_CODE_EN " VR Thermal "
1693-
#define RSC_BOX_EVENT_VR_TDC_CODE_EN " VR TDC "
1694-
#define RSC_BOX_EVENT_POWER_PL1_CODE_EN " Package PL1 "
1695-
#define RSC_BOX_EVENT_POWER_PL2_CODE_EN " Package PL2 "
1696-
#define RSC_BOX_EVENT_ELECTRICAL_CODE_EN " Electrical EDP "
1697-
#define RSC_BOX_EVENT_INEFFICIENCY_CODE_EN " Inefficiency "
1698-
#define RSC_BOX_EVENT_MAX_TURBO_CODE_EN " Max Turbo "
1699-
#define RSC_BOX_EVENT_TURBO_ATTEN_CODE_EN " Turbo Atten. "
1700-
#define RSC_BOX_EVENT_THERMAL_LOG_CODE_EN " Thermal Log "
1701-
#define RSC_BOX_EVENT_ALL_OF_THEM_CODE_EN " < Clear All> "
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_STS_CODE_EN " PROCHOT "
1680+
#define RSC_BOX_EVENT_PROCHOT_LOG_CODE_EN " PROCHOT Log "
1681+
#define RSC_BOX_EVENT_CRITICAL_TMP_CODE_EN " Critical Temp. "
1682+
#define RSC_BOX_EVENT_CRITICAL_LOG_CODE_EN " Critical Log "
1683+
#define RSC_BOX_EVENT_THOLD1_STS_CODE_EN " Th. Threshold1 "
1684+
#define RSC_BOX_EVENT_THOLD2_STS_CODE_EN " Th. Threshold2 "
1685+
#define RSC_BOX_EVENT_THOLD1_LOG_CODE_EN " Threshold1 Log "
1686+
#define RSC_BOX_EVENT_THOLD2_LOG_CODE_EN " Threshold2 Log "
1687+
#define RSC_BOX_EVENT_POWER_LIMIT_CODE_EN " Power Limit. "
1688+
#define RSC_BOX_EVENT_CURRENT_LIMIT_CODE_EN " Current Limit. "
1689+
#define RSC_BOX_EVENT_CROSS_DOM_LIMIT_CODE_EN " XDomain Limit. "
1690+
#define RSC_BOX_EVENT_RESIDENCY_CODE_EN " Residency "
1691+
#define RSC_BOX_EVENT_AVG_THERMAL_CODE_EN " Avg Thermal "
1692+
#define RSC_BOX_EVENT_VR_THERMAL_CODE_EN " VR Thermal "
1693+
#define RSC_BOX_EVENT_VR_TDC_CODE_EN " VR TDC "
1694+
#define RSC_BOX_EVENT_POWER_PL1_CODE_EN " Package PL1 "
1695+
#define RSC_BOX_EVENT_POWER_PL2_CODE_EN " Package PL2 "
1696+
#define RSC_BOX_EVENT_ELECTRICAL_CODE_EN " Electrical EDP "
1697+
#define RSC_BOX_EVENT_INEFFICIENCY_CODE_EN " Inefficiency "
1698+
#define RSC_BOX_EVENT_MAX_TURBO_CODE_EN " Max Turbo "
1699+
#define RSC_BOX_EVENT_TURBO_ATTEN_CODE_EN " Turbo Atten. "
1700+
#define RSC_BOX_EVENT_THERMAL_LOG_CODE_EN " Thermal Log "
1701+
#define RSC_BOX_EVENT_ALL_OF_THEM_CODE_EN " < Clear All> "
17021702

17031703
#define RSC_BOX_STATE_UNSPECIFIED_CODE_EN " UNSPECIFIED "
17041704

‎corefreq-cli-rsc-fr.h

+25-25
Original file line numberDiff line numberDiff line change
@@ -1161,31 +1161,31 @@ do echo -en "$h$l\t""\xc3""\x$h$l""\t"; done; done;echo
11611161

11621162
#define RSC_BOX_EVENT_TITLE_CODE_FR RSC_BOX_EVENT_TITLE_CODE_EN
11631163

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_STS_CODE_FR " PROCHOT "
1167-
#define RSC_BOX_EVENT_PROCHOT_LOG_CODE_FR " PROCHOT Log "
1168-
#define RSC_BOX_EVENT_CRITICAL_TMP_CODE_FR " Temp. critique "
1169-
#define RSC_BOX_EVENT_CRITICAL_LOG_CODE_FR " Log critique "
1170-
#define RSC_BOX_EVENT_THOLD1_STS_CODE_FR " Seuil1 therm. "
1171-
#define RSC_BOX_EVENT_THOLD2_STS_CODE_FR " Seuil2 therm. "
1172-
#define RSC_BOX_EVENT_THOLD1_LOG_CODE_FR " Log seuil1 th. "
1173-
#define RSC_BOX_EVENT_THOLD2_LOG_CODE_FR " Log seuil2 th. "
1174-
#define RSC_BOX_EVENT_POWER_LIMIT_CODE_FR " Puissance max. "
1175-
#define RSC_BOX_EVENT_CURRENT_LIMIT_CODE_FR " Courant limit""\xa9"" "
1176-
#define RSC_BOX_EVENT_CROSS_DOM_LIMIT_CODE_FR " Interdomaine "
1177-
#define RSC_BOX_EVENT_RESIDENCY_CODE_FR " R""\xa9""sidence "
1178-
#define RSC_BOX_EVENT_AVG_THERMAL_CODE_FR " Moy. thermique "
1179-
#define RSC_BOX_EVENT_VR_THERMAL_CODE_FR " VR thermique "
1180-
#define RSC_BOX_EVENT_VR_TDC_CODE_FR " VR TDC "
1181-
#define RSC_BOX_EVENT_POWER_PL1_CODE_FR " PL1 du Package "
1182-
#define RSC_BOX_EVENT_POWER_PL2_CODE_FR " PL2 du Package "
1183-
#define RSC_BOX_EVENT_ELECTRICAL_CODE_FR " EDP ""\xa9""lectrique "
1184-
#define RSC_BOX_EVENT_INEFFICIENCY_CODE_FR " Inefficacit""\xa9"" "
1185-
#define RSC_BOX_EVENT_MAX_TURBO_CODE_FR " Turbo Max "
1186-
#define RSC_BOX_EVENT_TURBO_ATTEN_CODE_FR " Turbo Atten. "
1187-
#define RSC_BOX_EVENT_THERMAL_LOG_CODE_FR " Log thermique "
1188-
#define RSC_BOX_EVENT_ALL_OF_THEM_CODE_FR "< Tout effacer >"
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_STS_CODE_FR " PROCHOT "
1167+
#define RSC_BOX_EVENT_PROCHOT_LOG_CODE_FR " PROCHOT Log "
1168+
#define RSC_BOX_EVENT_CRITICAL_TMP_CODE_FR " Temp. critique "
1169+
#define RSC_BOX_EVENT_CRITICAL_LOG_CODE_FR " Log critique "
1170+
#define RSC_BOX_EVENT_THOLD1_STS_CODE_FR " Seuil1 therm. "
1171+
#define RSC_BOX_EVENT_THOLD2_STS_CODE_FR " Seuil2 therm. "
1172+
#define RSC_BOX_EVENT_THOLD1_LOG_CODE_FR " Log seuil1 th. "
1173+
#define RSC_BOX_EVENT_THOLD2_LOG_CODE_FR " Log seuil2 th. "
1174+
#define RSC_BOX_EVENT_POWER_LIMIT_CODE_FR " Puissance max. "
1175+
#define RSC_BOX_EVENT_CURRENT_LIMIT_CODE_FR " Courant limit""\xa9"" "
1176+
#define RSC_BOX_EVENT_CROSS_DOM_LIMIT_CODE_FR " Interdomaine "
1177+
#define RSC_BOX_EVENT_RESIDENCY_CODE_FR " R""\xa9""sidence "
1178+
#define RSC_BOX_EVENT_AVG_THERMAL_CODE_FR " Moy. thermique "
1179+
#define RSC_BOX_EVENT_VR_THERMAL_CODE_FR " VR thermique "
1180+
#define RSC_BOX_EVENT_VR_TDC_CODE_FR " VR TDC "
1181+
#define RSC_BOX_EVENT_POWER_PL1_CODE_FR " PL1 du Package "
1182+
#define RSC_BOX_EVENT_POWER_PL2_CODE_FR " PL2 du Package "
1183+
#define RSC_BOX_EVENT_ELECTRICAL_CODE_FR " EDP ""\xa9""lectrique "
1184+
#define RSC_BOX_EVENT_INEFFICIENCY_CODE_FR " Inefficacit""\xa9"" "
1185+
#define RSC_BOX_EVENT_MAX_TURBO_CODE_FR " Turbo Max "
1186+
#define RSC_BOX_EVENT_TURBO_ATTEN_CODE_FR " Turbo Atten. "
1187+
#define RSC_BOX_EVENT_THERMAL_LOG_CODE_FR " Log thermique "
1188+
#define RSC_BOX_EVENT_ALL_OF_THEM_CODE_FR " <Tout effacer> "
11891189

11901190
#define RSC_BOX_STATE_UNSPECIFIED_CODE_FR " " \
11911191
"IND""\x89""TERMIN""\x89"\

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1881,22 +1881,22 @@
18811881

18821882
#define RSC_BOX_EVENT_COND0_THM_DFLT_ATTR \
18831883
{ \
1884-
HDK,HDK,HDK,HDK,HDK,HDK,HDK,HDK,HDK,HDK,HDK,HDK,HDK,HDK,HDK,HDK \
1884+
HDK,HDK,HDK,HDK,HDK,HDK,HDK,HDK,HDK,HDK,HDK,HDK,HDK,HDK,HDK,HDK,HDK \
18851885
}
18861886

18871887
#define RSC_BOX_EVENT_COND1_THM_DFLT_ATTR \
18881888
{ \
1889-
HDK,LWM,LWM,LWM,LWM,LWM,LWM,LWM,LWM,LWM,LWM,LWM,LWM,LWM,LWM,HDK \
1889+
LWM,LWM,LWM,LWM,LWM,LWM,LWM,LWM,LWM,LWM,LWM,LWM,LWM,LWM,LWM,LWM,LWM \
18901890
}
18911891

18921892
#define RSC_BOX_EVENT_COND2_THM_DFLT_ATTR \
18931893
{ \
1894-
HDK,LKY,LKY,LKY,LKY,LKY,LKY,LKY,LKY,LKY,LKY,LKY,LKY,LKY,LKY,HDK \
1894+
LKY,LKY,LKY,LKY,LKY,LKY,LKY,LKY,LKY,LKY,LKY,LKY,LKY,LKY,LKY,LKY,LKY \
18951895
}
18961896

18971897
#define RSC_BOX_EVENT_COND3_THM_DFLT_ATTR \
18981898
{ \
1899-
HDK,LCK,LCK,LCK,LCK,LCK,LCK,LCK,LCK,LCK,LCK,LCK,LCK,LCK,LCK,HDK \
1899+
HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK \
19001900
}
19011901

19021902
#define RSC_CREATE_RECORDER_THM_DFLT_ATTR \

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1881,22 +1881,22 @@
18811881

18821882
#define RSC_BOX_EVENT_COND0_THM_USR1_ATTR \
18831883
{ \
1884-
LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK \
1884+
LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK \
18851885
}
18861886

18871887
#define RSC_BOX_EVENT_COND1_THM_USR1_ATTR \
18881888
{ \
1889-
LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK \
1889+
LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK \
18901890
}
18911891

18921892
#define RSC_BOX_EVENT_COND2_THM_USR1_ATTR \
18931893
{ \
1894-
HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK \
1894+
HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK \
18951895
}
18961896

18971897
#define RSC_BOX_EVENT_COND3_THM_USR1_ATTR \
18981898
{ \
1899-
LCK,LCK,LCK,LCK,LCK,LCK,LCK,LCK,LCK,LCK,LCK,LCK,LCK,LCK,LCK,LCK \
1899+
HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK \
19001900
}
19011901

19021902
#define RSC_CREATE_RECORDER_THM_USR1_ATTR \

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1881,22 +1881,22 @@
18811881

18821882
#define RSC_BOX_EVENT_COND0_THM_USR2_ATTR \
18831883
{ \
1884-
LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK \
1884+
LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK \
18851885
}
18861886

18871887
#define RSC_BOX_EVENT_COND1_THM_USR2_ATTR \
18881888
{ \
1889-
LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK \
1889+
LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK,LMK \
18901890
}
18911891

18921892
#define RSC_BOX_EVENT_COND2_THM_USR2_ATTR \
18931893
{ \
1894-
HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK \
1894+
HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK,HYK \
18951895
}
18961896

18971897
#define RSC_BOX_EVENT_COND3_THM_USR2_ATTR \
18981898
{ \
1899-
LCK,LCK,LCK,LCK,LCK,LCK,LCK,LCK,LCK,LCK,LCK,LCK,LCK,LCK,LCK,LCK \
1899+
HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK,HCK \
19001900
}
19011901

19021902
#define RSC_CREATE_RECORDER_THM_USR2_ATTR \

‎corefreq-cli.c

+21-17
Original file line numberDiff line numberDiff line change
@@ -9659,7 +9659,7 @@ void Update_STS_Event(TGrid *grid, DATA_TYPE data)
96599659
const ATTRIBUTE *attrib = RO(Shm)->ProcessorEvents[eSTS] & event ?
96609660
RSC(BOX_EVENT_COND1).ATTR() : RSC(BOX_EVENT_COND0).ATTR();
96619661

9662-
memcpy(grid->cell.attr, attrib, grid->cell.length);
9662+
memcpy(grid->cell.attr, attrib, grid->cell.length - 1);
96639663
}
96649664

96659665
void Update_LOG_Event(TGrid *grid, DATA_TYPE data)
@@ -9668,7 +9668,7 @@ void Update_LOG_Event(TGrid *grid, DATA_TYPE data)
96689668
const ATTRIBUTE *attrib = RO(Shm)->ProcessorEvents[eLOG] & event ?
96699669
RSC(BOX_EVENT_COND2).ATTR() : RSC(BOX_EVENT_COND0).ATTR();
96709670

9671-
memcpy(grid->cell.attr, attrib, grid->cell.length);
9671+
memcpy(grid->cell.attr, attrib, grid->cell.length - 1);
96729672
}
96739673

96749674
#define EVENT_DOMAINS 4
@@ -9989,23 +9989,27 @@ Window *CreateEvents(unsigned long long id)
99899989
NULL
99909990
};
99919991

9992-
GridCall( StoreTCell( wEvent,
9992+
TGrid *grid=StoreTCell( wEvent,
99939993
eLdr[col][row].quick.key,
99949994
eLdr[col][row].item,
9995-
attrib[theme[eLdr[col][row].theme]] ),
9996-
Update_Event[eLdr[col][row].theme],
9997-
eLdr[col][row].mask );
9995+
attrib[theme[eLdr[col][row].theme]] );
9996+
9997+
if ((grid != NULL) && (col < EVENT_DOMAINS - 1)) {
9998+
const size_t rt = grid->cell.length - 1;
9999+
grid->cell.attr[rt] = RSC(UI).ATTR()[UI_MAKE_SELECT_FOCUS];
10000+
}
10001+
GridCall( grid, Update_Event[eLdr[col][row].theme],
10002+
eLdr[col][row].mask );
10003+
}
10004+
}
10005+
for (col = 0; col < EVENT_DOMAINS - 1; col++) {
10006+
TGrid *grid=StoreTCell( wEvent, SCANKEY_NULL,
10007+
RSC(BOX_EVENT_SPACE).CODE(), attrib[ATTRIB0] );
10008+
if (grid != NULL) {
10009+
const size_t rt = grid->cell.length - 1;
10010+
grid->cell.attr[rt] = RSC(UI).ATTR()[UI_MAKE_SELECT_FOCUS];
999810011
}
999910012
}
10000-
StoreTCell(wEvent,SCANKEY_NULL, RSC(BOX_EVENT_SPACE).CODE(),
10001-
attrib[ATTRIB0]);
10002-
10003-
StoreTCell(wEvent,SCANKEY_NULL, RSC(BOX_EVENT_SPACE).CODE(),
10004-
attrib[ATTRIB0]);
10005-
10006-
StoreTCell(wEvent,SCANKEY_NULL, RSC(BOX_EVENT_SPACE).CODE(),
10007-
attrib[ATTRIB0]);
10008-
1000910013
StoreTCell(wEvent,BOXKEY_CLR_ALL_EVENTS,
1001010014
RSC(BOX_EVENT_ALL_OF_THEM).CODE(),
1001110015
attrib[ATTRIB3]);
@@ -10023,8 +10027,8 @@ Window *CreateEvents(unsigned long long id)
1002310027
StoreWindow(wEvent, .key.Up, MotionUp_Win);
1002410028
StoreWindow(wEvent, .key.PgUp, MotionPgUp_Win);
1002510029
StoreWindow(wEvent, .key.PgDw, MotionPgDw_Win);
10026-
StoreWindow(wEvent, .key.Home, MotionReset_Win);
10027-
StoreWindow(wEvent, .key.End, MotionEnd_Cell);
10030+
StoreWindow(wEvent, .key.Home, MotionHome_Win);
10031+
StoreWindow(wEvent, .key.End, MotionEnd_Win);
1002810032

1002910033
StoreWindow(wEvent, .key.WinLeft, MotionOriginLeft_Win);
1003010034
StoreWindow(wEvent, .key.WinRight, MotionOriginRight_Win);

0 commit comments

Comments
 (0)