diff --git a/appres.h b/appres.h index 921d96d..1506193 100644 --- a/appres.h +++ b/appres.h @@ -51,7 +51,7 @@ typedef struct { /* Options (not toggles) */ char mono; - char extended; +// char extended; // char m3279; // char modified_sel; // char once; @@ -167,7 +167,7 @@ typedef struct { */ #endif /*]*/ - char *oversize; +// char *oversize; #if defined(X3270_FT) /*[*/ char *ft_command; int dft_buffer_size; diff --git a/glue.c b/glue.c index 016c060..ed33a87 100644 --- a/glue.c +++ b/glue.c @@ -136,7 +136,7 @@ static void initialize(void) /* Set the defaults. */ appres.mono = False; - appres.extended = True; +// appres.extended = True; #if defined(C3270) /*[*/ h3270.m3279 = True; @@ -200,7 +200,7 @@ static void initialize(void) #endif /*]*/ - appres.oversize = CN; +// appres.oversize = CN; #if defined(C3270) /*[*/ appres.meta_escape = "auto"; @@ -324,7 +324,7 @@ static const struct lib3270_option options[] = { OptMono, OPT_BOOLEAN, True, ResMono, offset(mono), N_( "Forces monochrome display" ) }, #endif /*]*/ // { OptOnce, OPT_BOOLEAN, True, ResOnce, offset(once), NULL }, - { OptOversize, OPT_STRING, False, ResOversize, offset(oversize), N_( "Sets the screen dimensions to be larger than the default for the chosen model (COLSxROWS)." ) }, +// { OptOversize, OPT_STRING, False, ResOversize, offset(oversize), N_( "Sets the screen dimensions to be larger than the default for the chosen model (COLSxROWS)." ) }, { OptPort, OPT_STRING, False, ResPort, offset(port), N_( "The name of the default TCP port to connect" ) }, #if defined(C3270) && !defined(LIB3270) /*[*/ { OptPrinterLu,OPT_STRING, False, ResPrinterLu, offset(printer_lu), NULL }, @@ -391,7 +391,7 @@ static struct { { ResEof, offset(eof), XRM_STRING }, { ResErase, offset(erase), XRM_STRING }, #endif /*]*/ - { ResExtended, offset(extended), XRM_BOOLEAN }, +// { ResExtended, offset(extended), XRM_BOOLEAN }, #if defined(X3270_FT) /*[*/ { ResFtCommand, offset(ft_command), XRM_STRING }, { ResDftBufferSize,offset(dft_buffer_size),XRM_INT }, @@ -436,7 +436,7 @@ static struct { #endif /*]*/ { ResNumericLock, offset(numeric_lock), XRM_BOOLEAN }, { ResOerrLock, offset(oerr_lock), XRM_BOOLEAN }, - { ResOversize, offset(oversize), XRM_STRING }, +// { ResOversize, offset(oversize), XRM_STRING }, { ResPort, offset(port), XRM_STRING }, #if defined(C3270) /*[*/ { ResPrinterLu, offset(printer_lu), XRM_STRING }, diff --git a/init.c b/init.c index 3e3eb4f..d7601fa 100644 --- a/init.c +++ b/init.c @@ -133,6 +133,9 @@ static void lib3270_session_init(H3270 *hSession, const char *model) memset(hSession,0,sizeof(H3270)); hSession->sz = sizeof(H3270); + // Set the defaults. + hSession->extended = 1; + // Initialize toggles initialize_toggles(hSession); @@ -188,8 +191,8 @@ static void lib3270_session_init(H3270 *hSession, const char *model) else hSession->m3279 = 1; - if(!appres.extended) - appres.oversize = CN; + if(!hSession->extended) + hSession->oversize = CN; #if defined(RESTRICT_3279) if (hSession->m3279 && model_number == 4) @@ -198,7 +201,7 @@ static void lib3270_session_init(H3270 *hSession, const char *model) Trace("Model_number: %d",model_number); - if (!appres.extended || appres.oversize == CN || sscanf(appres.oversize, "%dx%d%c", &ovc, &ovr, &junk) != 2) + if (!hSession->extended || hSession->oversize == CN || sscanf(hSession->oversize, "%dx%d%c", &ovc, &ovr, &junk) != 2) { ovc = 0; ovr = 0; diff --git a/screen.c b/screen.c index d37e618..d05c62c 100644 --- a/screen.c +++ b/screen.c @@ -260,7 +260,7 @@ void update_model_info(H3270 *session, int model, int cols, int rows) session->model_num = model; /* Update the model name. */ - (void) sprintf(session->model_name, "327%c-%d%s",session->m3279 ? '9' : '8',session->model_num,appres.extended ? "-E" : ""); + (void) sprintf(session->model_name, "327%c-%d%s",session->m3279 ? '9' : '8',session->model_num,session->extended ? "-E" : ""); session->update_model(session, session->model_name,session->model_num,rows,cols); } -- libgit2 0.21.2