Feedback.cpp (pymol-v1.8.6.0.tar.bz2) | : | Feedback.cpp (pymol-v2.1.0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 48 | skipping to change at line 48 | |||
} | } | |||
} else { | } else { | |||
for(a = 0; a < FB_Total; a++) { | for(a = 0; a < FB_Total; a++) { | |||
G->Feedback->Mask[a] = | G->Feedback->Mask[a] = | |||
FB_Output | FB_Results | FB_Errors | FB_Warnings | FB_Actions | FB_Detai ls; | FB_Output | FB_Results | FB_Errors | FB_Warnings | FB_Actions | FB_Detai ls; | |||
} | } | |||
G->Feedback->Mask[FB_Main] &= ~(FB_Errors); /* suppress opengl errors in mai n */ | G->Feedback->Mask[FB_Main] &= ~(FB_Errors); /* suppress opengl errors in mai n */ | |||
} | } | |||
const char *fb_env = getenv("PYMOL_FEEDBACK"); | ||||
if(fb_env) { | ||||
int n, sysmod, mask; | ||||
while(sscanf(fb_env, "%i:%i%n", &sysmod, &mask, &n) > 1) { | ||||
FeedbackSetMask(G, sysmod, mask); | ||||
fb_env += n; | ||||
} | ||||
} | ||||
return 1; | return 1; | |||
} | } | |||
void FeedbackFree(PyMOLGlobals * G) | void FeedbackFree(PyMOLGlobals * G) | |||
{ | { | |||
CFeedback *I = G->Feedback; | CFeedback *I = G->Feedback; | |||
VLAFreeP(I->Stack); | VLAFreeP(I->Stack); | |||
FreeP(G->Feedback); | FreeP(G->Feedback); | |||
skipping to change at line 135 | skipping to change at line 145 | |||
} | } | |||
} | } | |||
PRINTFD(G, FB_Feedback) | PRINTFD(G, FB_Feedback) | |||
" FeedbackEnable: sysmod %d, mask 0x%02X\n", sysmod, mask ENDFD; | " FeedbackEnable: sysmod %d, mask 0x%02X\n", sysmod, mask ENDFD; | |||
} | } | |||
void FeedbackAutoAdd(PyMOLGlobals * G, unsigned int sysmod, unsigned char mask, const char *str) | void FeedbackAutoAdd(PyMOLGlobals * G, unsigned int sysmod, unsigned char mask, const char *str) | |||
{ | { | |||
if(Feedback(G, sysmod, mask)) | if(Feedback(G, sysmod, mask)) | |||
OrthoAddOutput(G, str); | FeedbackAddColored(G, str, mask); | |||
} | } | |||
void FeedbackAdd(PyMOLGlobals * G, const char *str) | void FeedbackAdd(PyMOLGlobals * G, const char *str) | |||
{ | { | |||
OrthoAddOutput(G, str); | OrthoAddOutput(G, str); | |||
} | } | |||
void FeedbackAddColored(PyMOLGlobals * G, const char *str, unsigned char mask) | ||||
{ | ||||
FeedbackAdd(G, str); | ||||
} | ||||
End of changes. 3 change blocks. | ||||
1 lines changed or deleted | 11 lines changed or added |