tn5250j/src/org/tn5250j GuiGraphicBuffer.java,1.18,1.19 Screen5250.java,1.62,1.63 Gui5250.java,1.62,1.63
"Kenneth J. Pouncey" <[email protected]> Mon, 05 Jul 2004 18:22:39 +0000
| Newsgroups | gmane.comp.java.tn5250j.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/tn5250j/tn5250j/src/org/tn5250j
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6226/src/org/tn5250j
Modified Files:
GuiGraphicBuffer.java Screen5250.java Gui5250.java
Log Message:
First part of headless the OIA
Index: Gui5250.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/Gui5250.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** Gui5250.java 5 Jul 2004 17:01:07 -0000 1.62
--- Gui5250.java 5 Jul 2004 18:22:36 -0000 1.63
***************
*** 44,48 ****
import org.tn5250j.event.SessionConfigListener;
import org.tn5250j.event.SessionConfigEvent;
- import org.tn5250j.event.ScreenOIAListener;
import org.tn5250j.interfaces.SessionScrollerInterface;
import org.tn5250j.keyboard.KeyboardHandler;
--- 44,47 ----
Index: GuiGraphicBuffer.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/GuiGraphicBuffer.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** GuiGraphicBuffer.java 5 Jul 2004 17:01:03 -0000 1.18
--- GuiGraphicBuffer.java 5 Jul 2004 18:22:36 -0000 1.19
***************
*** 523,527 ****
String s = oia.getInhibitedText();
Graphics2D g2d = getWritingArea(screen.font);
!
if (g2d == null)
return;
--- 523,527 ----
String s = oia.getInhibitedText();
Graphics2D g2d = getWritingArea(screen.font);
! log.info(attr + ", " + value + ", " + s);
if (g2d == null)
return;
***************
*** 535,544 ****
switch (attr) {
! // public static final int OIA_LEVEL_INPUT_INHIBITED = 1;
!
! // case STATUS_SYSTEM:
! case OIA_LEVEL_INPUT_INHIBITED:
! case OIA_LEVEL_NOT_INHIBITED:
! if (value == oia.INPUTINHIBITED_SYSTEM_WAIT) {
g2d.setColor(screen.colorWhite);
--- 535,540 ----
switch (attr) {
! case ScreenOIA.OIA_LEVEL_INPUT_INHIBITED:
! if (value == ScreenOIA.INPUTINHIBITED_SYSTEM_WAIT) {
g2d.setColor(screen.colorWhite);
***************
*** 549,555 ****
}
break;
! // case STATUS_ERROR_CODE:
! case OIA_LEVEL_INPUT_ERROR:
! if (value == oia.INPUTINHIBITED_SYSTEM_WAIT) {
g2d.setColor(screen.colorRed);
--- 545,550 ----
}
break;
! case ScreenOIA.OIA_LEVEL_INPUT_ERROR:
! if (value == ScreenOIA.INPUTINHIBITED_SYSTEM_WAIT) {
g2d.setColor(screen.colorRed);
***************
*** 563,566 ****
--- 558,562 ----
}
+ screen.updateImage(sArea.getBounds());
g2d.dispose();
}
***************
*** 572,594 ****
}
- // OIA_LEVEL
- public static final int OIA_LEVEL_INPUT_INHIBITED = 1;
- public static final int OIA_LEVEL_NOT_INHIBITED = 2;
- public static final int OIA_LEVEL_MESSAGE_LIGHT_ON = 3;
- public static final int OIA_LEVEL_MESSAGE_LIGHT_OFF = 4;
- public static final int OIA_LEVEL_AUDIBLE_BELL = 5;
- public static final int OIA_LEVEL_INSERT_MODE = 6;
- public static final int OIA_LEVEL_KEYBOARD = 7;
- public static final int OIA_LEVEL_CLEAR_SCREEN = 8;
- public static final int OIA_LEVEL_SCREEN_SIZE = 9;
- public static final int OIA_LEVEL_INPUT_ERROR = 10;
- public static final int OIA_LEVEL_KEYS_BUFFERED = 11;
- public static final int OIA_LEVEL_SCRIPT = 12;
-
public void onOIAChanged(ScreenOIA changedOIA) {
switch (changedOIA.getLevel()) {
! case OIA_LEVEL_KEYS_BUFFERED:
if (changedOIA.isKeysBuffered()) {
Graphics2D g2d = getWritingArea(screen.font);
--- 568,576 ----
}
public void onOIAChanged(ScreenOIA changedOIA) {
switch (changedOIA.getLevel()) {
! case ScreenOIA.OIA_LEVEL_KEYS_BUFFERED:
if (changedOIA.isKeysBuffered()) {
Graphics2D g2d = getWritingArea(screen.font);
***************
*** 612,616 ****
}
break;
! case OIA_LEVEL_MESSAGE_LIGHT_OFF:
Graphics2D g2d = getWritingArea(screen.font);
--- 594,598 ----
}
break;
! case ScreenOIA.OIA_LEVEL_MESSAGE_LIGHT_OFF:
Graphics2D g2d = getWritingArea(screen.font);
***************
*** 620,624 ****
g2d.dispose();
break;
! case OIA_LEVEL_MESSAGE_LIGHT_ON:
g2d = getWritingArea(screen.font);
float Y = (screen.fmHeight * (screen.getRows() + 2))
--- 602,606 ----
g2d.dispose();
break;
! case ScreenOIA.OIA_LEVEL_MESSAGE_LIGHT_ON:
g2d = getWritingArea(screen.font);
float Y = (screen.fmHeight * (screen.getRows() + 2))
***************
*** 629,633 ****
g2d.dispose();
break;
! case OIA_LEVEL_SCRIPT:
if (changedOIA.isScriptActive()) {
drawScriptRunning(screen.colorGreen);
--- 611,615 ----
g2d.dispose();
break;
! case ScreenOIA.OIA_LEVEL_SCRIPT:
if (changedOIA.isScriptActive()) {
drawScriptRunning(screen.colorGreen);
***************
*** 640,645 ****
}
break;
! case OIA_LEVEL_INPUT_INHIBITED:
! case OIA_LEVEL_NOT_INHIBITED:
setStatus(changedOIA);
break;
--- 622,628 ----
}
break;
! case ScreenOIA.OIA_LEVEL_INPUT_INHIBITED:
! case ScreenOIA.OIA_LEVEL_NOT_INHIBITED:
! case ScreenOIA.OIA_LEVEL_INPUT_ERROR:
setStatus(changedOIA);
break;
Index: Screen5250.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/Screen5250.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** Screen5250.java 5 Jul 2004 17:01:06 -0000 1.62
--- Screen5250.java 5 Jul 2004 18:22:36 -0000 1.63
***************
*** 120,126 ****
public final static byte STATUS_VALUE_OFF = 2;
- private final static String xSystem = "X - System";
- private final static String xError = "X - II";
- private String statusString = "";
private StringBuffer hsMore = new StringBuffer("More...");
private StringBuffer hsBottom = new StringBuffer("Bottom");
--- 120,123 ----
***************
*** 4408,4428 ****
public void setStatus(byte attr, byte value, String s) {
! statusString = s;
!
! // draw the status information
! // bi.setStatus(attr, value, s, fmWidth, fmHeight, lm, font, colorBg,
! // colorRed, colorWhite);
!
! // set environment variables
switch (attr) {
case STATUS_SYSTEM:
if (value == STATUS_VALUE_ON) {
! oia.setInputInhibited(oia.INPUTINHIBITED_SYSTEM_WAIT,oia.OIA_LEVEL_INPUT_INHIBITED, s);
statusXSystem = true;
}
else {
statusXSystem = false;
! oia.setInputInhibited(oia.INPUTINHIBITED_NOTINHIBITED,oia.OIA_LEVEL_NOT_INHIBITED,s);
}
break;
--- 4405,4419 ----
public void setStatus(byte attr, byte value, String s) {
! // set the status area
switch (attr) {
case STATUS_SYSTEM:
if (value == STATUS_VALUE_ON) {
! oia.setInputInhibited(ScreenOIA.INPUTINHIBITED_SYSTEM_WAIT,ScreenOIA.OIA_LEVEL_INPUT_INHIBITED, s);
statusXSystem = true;
}
else {
statusXSystem = false;
! oia.setInputInhibited(ScreenOIA.INPUTINHIBITED_NOTINHIBITED,ScreenOIA.OIA_LEVEL_NOT_INHIBITED,s);
}
break;
***************
*** 4431,4439 ****
if (value == STATUS_VALUE_ON) {
setPrehelpState(true, true, false);
! oia.setInputInhibited(oia.INPUTINHIBITED_SYSTEM_WAIT,oia.OIA_LEVEL_INPUT_ERROR,s);
Toolkit.getDefaultToolkit().beep();
} else {
! oia.setInputInhibited(oia.INPUTINHIBITED_NOTINHIBITED,oia.OIA_LEVEL_NOT_INHIBITED);
setPrehelpState(false, true, true);
homePos = saveHomePos;
--- 4422,4432 ----
if (value == STATUS_VALUE_ON) {
setPrehelpState(true, true, false);
! oia.setInputInhibited(ScreenOIA.INPUTINHIBITED_SYSTEM_WAIT,
! ScreenOIA.OIA_LEVEL_INPUT_ERROR,s);
Toolkit.getDefaultToolkit().beep();
} else {
! oia.setInputInhibited(ScreenOIA.INPUTINHIBITED_NOTINHIBITED,
! ScreenOIA.OIA_LEVEL_NOT_INHIBITED);
setPrehelpState(false, true, true);
homePos = saveHomePos;
***************
*** 4444,4448 ****
}
- updateImage(sArea.getBounds());
}
--- 4437,4440 ----
***************
*** 4865,4872 ****
// restore statuses that were on the screen before resize
! if (isStatusErrorCode())
! setStatus(STATUS_ERROR_CODE, STATUS_VALUE_ON, statusString);
! if (isXSystem())
! setStatus(STATUS_SYSTEM, STATUS_VALUE_ON, statusString);
if (oia.isMessageWait())
oia.setMessageLightOn();
--- 4857,4870 ----
// restore statuses that were on the screen before resize
! if (oia.getLevel() == ScreenOIA.OIA_LEVEL_INPUT_ERROR) {
! oia.setInputInhibited(ScreenOIA.INPUTINHIBITED_SYSTEM_WAIT,
! ScreenOIA.OIA_LEVEL_INPUT_ERROR);
! }
!
! if (oia.getLevel() == ScreenOIA.OIA_LEVEL_INPUT_INHIBITED) {
! oia.setInputInhibited(ScreenOIA.INPUTINHIBITED_SYSTEM_WAIT,
! ScreenOIA.OIA_LEVEL_INPUT_INHIBITED);
! }
!
if (oia.isMessageWait())
oia.setMessageLightOn();
-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 -
digital self defense, top technical experts, no vendor pitches,
unmatched networking opportunities. Visit www.blackhat.com