X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_slk.c;h=662f7e45b11661cbe516484f567e0872a797f2e4;hp=72fff96d9b3153238bb04812e17b7c64b57f8bc1;hb=1f21085964c1dcb515970035e43b7f25ac2cfdf6;hpb=46722468f47c2b77b3987729b4bcf2321cccfd01;ds=sidebyside diff --git a/ncurses/base/lib_slk.c b/ncurses/base/lib_slk.c index 72fff96d..662f7e45 100644 --- a/ncurses/base/lib_slk.c +++ b/ncurses/base/lib_slk.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2000,2002 Free Software Foundation, Inc. * + * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -27,8 +27,12 @@ ****************************************************************************/ /**************************************************************************** - * Author: Zeyd M. Ben-Halim 1992,1995 * - * and: Eric S. Raymond * + * Authors: * + * Gerhard Fuernkranz 1993 (original) * + * Zeyd M. Ben-Halim 1992,1995 (sic) * + * Eric S. Raymond * + * Juergen Pfeifer 1996-on * + * Thomas E. Dickey * ****************************************************************************/ /* @@ -41,32 +45,20 @@ #include #include /* num_labels, label_*, plab_norm */ -MODULE_ID("$Id: lib_slk.c,v 1.24 2002/09/28 17:46:40 tom Exp $") +MODULE_ID("$Id: lib_slk.c,v 1.35 2008/09/27 14:07:33 juergen Exp $") /* - * We'd like to move these into the screen context structure, but cannot, - * because slk_init() is called before initscr()/newterm(). + * Free any memory related to soft labels, return an error. */ -NCURSES_EXPORT_VAR(int) -_nc_slk_format = 0; /* one more than format specified in slk_init() */ - -/* - * Paint the info line for the PC style SLK emulation. - * - */ -static void -slk_paint_info(WINDOW *win) +static int +slk_failed(void) { - if (win && SP->slk_format == 4) { - int i; - - mvwhline(win, 0, 0, 0, getmaxx(win)); - wmove(win, 0, 0); - - for (i = 0; i < SP->_slk->maxlab; i++) { - mvwprintw(win, 0, SP->_slk->ent[i].x, "F%d", i + 1); - } + if (SP->_slk) { + FreeIfNeeded(SP->_slk->ent); + free(SP->_slk); + SP->_slk = (SLK *) 0; } + return ERR; } /* @@ -78,108 +70,108 @@ _nc_slk_initialize(WINDOW *stwin, int cols) { int i, x; int res = OK; - char *p; unsigned max_length; - T(("slk_initialize()")); + T((T_CALLED("_nc_slk_initialize()"))); if (SP->_slk) { /* we did this already, so simply return */ - return (OK); + returnCode(OK); } else if ((SP->_slk = typeCalloc(SLK, 1)) == 0) - return (ERR); + returnCode(ERR); SP->_slk->ent = NULL; - SP->_slk->buffer = NULL; - SP->_slk->attr = A_STANDOUT; + + /* + * If we use colors, vidputs() will suppress video attributes that conflict + * with colors. In that case, we're still guaranteed that "reverse" would + * work. + */ + if ((no_color_video & 1) == 0) + SetAttr(SP->_slk->attr, A_STANDOUT); + else + SetAttr(SP->_slk->attr, A_REVERSE); SP->_slk->maxlab = ((num_labels > 0) ? num_labels - : MAX_SKEY(_nc_slk_format)); + : MAX_SKEY(_nc_globals.slk_format)); SP->_slk->maxlen = ((num_labels > 0) ? label_width * label_height - : MAX_SKEY_LEN(_nc_slk_format)); - SP->_slk->labcnt = ((SP->_slk->maxlab < MAX_SKEY(_nc_slk_format)) - ? MAX_SKEY(_nc_slk_format) + : MAX_SKEY_LEN(_nc_globals.slk_format)); + SP->_slk->labcnt = ((SP->_slk->maxlab < MAX_SKEY(_nc_globals.slk_format)) + ? MAX_SKEY(_nc_globals.slk_format) : SP->_slk->maxlab); if (SP->_slk->maxlen <= 0 || SP->_slk->labcnt <= 0 || (SP->_slk->ent = typeCalloc(slk_ent, (unsigned) SP->_slk->labcnt)) == NULL) - goto exception; + returnCode(slk_failed()); max_length = SP->_slk->maxlen; - p = SP->_slk->buffer = (char *) calloc((unsigned) (2 * SP->_slk->labcnt), - (1 + max_length)); - if (SP->_slk->buffer == NULL) - goto exception; - for (i = 0; i < SP->_slk->labcnt; i++) { - SP->_slk->ent[i].text = p; - p += (1 + max_length); - SP->_slk->ent[i].form_text = p; - p += (1 + max_length); + size_t used = max_length + 1; + + if ((SP->_slk->ent[i].ent_text = (char *) _nc_doalloc(0, used)) == 0) + returnCode(slk_failed()); + memset(SP->_slk->ent[i].ent_text, 0, used); + + if ((SP->_slk->ent[i].form_text = (char *) _nc_doalloc(0, used)) == 0) + returnCode(slk_failed()); + memset(SP->_slk->ent[i].form_text, 0, used); + memset(SP->_slk->ent[i].form_text, ' ', max_length); - SP->_slk->ent[i].visible = (i < SP->_slk->maxlab); + SP->_slk->ent[i].visible = (char) (i < SP->_slk->maxlab); } - if (_nc_slk_format >= 3) { /* PC style */ + if (_nc_globals.slk_format >= 3) { /* PC style */ int gap = (cols - 3 * (3 + 4 * max_length)) / 2; if (gap < 1) gap = 1; for (i = x = 0; i < SP->_slk->maxlab; i++) { - SP->_slk->ent[i].x = x; + SP->_slk->ent[i].ent_x = x; x += max_length; x += (i == 3 || i == 7) ? gap : 1; } - slk_paint_info(stwin); } else { - if (_nc_slk_format == 2) { /* 4-4 */ + if (_nc_globals.slk_format == 2) { /* 4-4 */ int gap = cols - (SP->_slk->maxlab * max_length) - 6; if (gap < 1) gap = 1; for (i = x = 0; i < SP->_slk->maxlab; i++) { - SP->_slk->ent[i].x = x; + SP->_slk->ent[i].ent_x = x; x += max_length; x += (i == 3) ? gap : 1; } } else { - if (_nc_slk_format == 1) { /* 1 -> 3-2-3 */ + if (_nc_globals.slk_format == 1) { /* 1 -> 3-2-3 */ int gap = (cols - (SP->_slk->maxlab * max_length) - 5) / 2; if (gap < 1) gap = 1; for (i = x = 0; i < SP->_slk->maxlab; i++) { - SP->_slk->ent[i].x = x; + SP->_slk->ent[i].ent_x = x; x += max_length; x += (i == 2 || i == 4) ? gap : 1; } } else - goto exception; + returnCode(slk_failed()); } } SP->_slk->dirty = TRUE; if ((SP->_slk->win = stwin) == NULL) { - exception: - if (SP->_slk) { - FreeIfNeeded(SP->_slk->buffer); - FreeIfNeeded(SP->_slk->ent); - free(SP->_slk); - SP->_slk = (SLK *) 0; - res = (ERR); - } + returnCode(slk_failed()); } /* We now reset the format so that the next newterm has again * per default no SLK keys and may call slk_init again to * define a new layout. (juergen 03-Mar-1999) */ - SP->slk_format = _nc_slk_format; - _nc_slk_format = 0; - return (res); + SP->slk_format = _nc_globals.slk_format; + _nc_globals.slk_format = 0; + returnCode(res); } /* @@ -194,8 +186,6 @@ slk_restore(void) return (ERR); SP->_slk->hidden = FALSE; SP->_slk->dirty = TRUE; - /* we have to repaint info line eventually */ - slk_paint_info(SP->_slk->win); returnCode(slk_refresh()); }