git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4717 3789f03b-4d11-0410-bbf8-ca57d06f2519tags/v1.1.90
@@ -18,8 +18,6 @@ | |||
package com.tigervnc.rfb; | |||
import java.io.IOException; | |||
import com.tigervnc.rdr.*; | |||
import com.tigervnc.vncviewer.*; | |||
@@ -28,7 +26,6 @@ public class CSecurityIdent extends CSecurity { | |||
public CSecurityIdent() { } | |||
public boolean processMsg(CConnection cc) { | |||
InStream is = cc.getInStream(); | |||
OutStream os = cc.getOutStream(); | |||
StringBuffer username = new StringBuffer(); |
@@ -20,7 +20,6 @@ | |||
package com.tigervnc.rfb; | |||
import javax.net.ssl.*; | |||
import java.security.*; | |||
import java.security.cert.*; | |||
import java.security.KeyStore; | |||
import java.io.File; | |||
@@ -119,7 +118,6 @@ public class CSecurityTLS extends CSecurity { | |||
public boolean processMsg(CConnection cc) { | |||
is = cc.getInStream(); | |||
os = cc.getOutStream(); | |||
initGlobal(); | |||
@@ -18,8 +18,6 @@ | |||
package com.tigervnc.rfb; | |||
import java.awt.*; | |||
public class Cursor extends ManagedPixelBuffer { | |||
public void setSize(int w, int h) { |
@@ -29,7 +29,6 @@ public class RawDecoder extends Decoder { | |||
int h = r.height(); | |||
int[] imageBuf = reader.getImageBuf(w * h); | |||
int nPixels = imageBuf.length / (reader.bpp() / 8); | |||
int bytesPerRow = w * (reader.bpp() / 8); | |||
while (h > 0) { | |||
int nRows = nPixels / w; | |||
if (nRows > h) nRows = h; |
@@ -31,7 +31,7 @@ public class Screen { | |||
flags = flags_; | |||
} | |||
public final static boolean operator(Screen r) { | |||
public final boolean operator(Screen r) { | |||
if (id != r.id) | |||
return false; | |||
if (!dimensions.equals(r.dimensions)) | |||
@@ -41,8 +41,8 @@ public class Screen { | |||
return true; | |||
} | |||
public static int id; | |||
public static Rect dimensions; | |||
public static int flags; | |||
public int id; | |||
public Rect dimensions; | |||
public int flags; | |||
} |
@@ -31,10 +31,10 @@ public class ScreenSet { | |||
screens = new ArrayList<Screen>(); | |||
} | |||
public static final int num_screens() { return screens.size(); } | |||
public final int num_screens() { return screens.size(); } | |||
public static final void add_screen(Screen screen) { screens.add(screen); } | |||
public static final void remove_screen(int id) { | |||
public final void add_screen(Screen screen) { screens.add(screen); } | |||
public final void remove_screen(int id) { | |||
for (Iterator iter = screens.iterator(); iter.hasNext(); ) { | |||
Screen refScreen = (Screen)iter.next(); | |||
if (refScreen.id == id) | |||
@@ -42,7 +42,7 @@ public class ScreenSet { | |||
} | |||
} | |||
public static final boolean validate(int fb_width, int fb_height) { | |||
public final boolean validate(int fb_width, int fb_height) { | |||
List<Integer> seen_ids = new ArrayList<Integer>(); | |||
Rect fb_rect = new Rect(); | |||
@@ -81,7 +81,7 @@ public class ScreenSet { | |||
//inline bool operator(const ScreenSet& r) const { return screens == r.screens; } | |||
//inline bool operator(const ScreenSet& r) const { return screens != r.screens; } | |||
public static List<Screen> screens; | |||
public ArrayList<Screen> screens; | |||
static LogWriter vlog = new LogWriter("ScreenSet"); | |||
@@ -34,26 +34,16 @@ package com.tigervnc.vncviewer; | |||
import java.awt.Color; | |||
import java.awt.Graphics; | |||
import java.awt.event.*; | |||
import java.awt.Component; | |||
import java.awt.Dimension; | |||
import java.awt.Event; | |||
import java.awt.Frame; | |||
import java.awt.ScrollPane; | |||
import java.io.*; | |||
import javax.net.ssl.*; | |||
import java.io.IOException; | |||
import java.io.InputStream; | |||
import java.io.OutputStream; | |||
import java.io.File; | |||
import java.util.jar.Attributes; | |||
import java.util.jar.Manifest; | |||
import javax.swing.*; | |||
import javax.swing.filechooser.*; | |||
import javax.swing.ImageIcon; | |||
import java.net.URL; | |||
import java.net.ServerSocket; | |||
import javax.swing.border.*; | |||
import java.util.*; | |||
import com.tigervnc.rdr.*; | |||
@@ -219,7 +209,6 @@ public class CConn extends CConnection | |||
public boolean showMsgBox(int flags, String title, String text) | |||
{ | |||
StringBuffer titleText = new StringBuffer("VNC Viewer: "+title); | |||
return true; | |||
} | |||
@@ -1165,7 +1154,6 @@ public class CConn extends CConnection | |||
synchronized public void writePointerEvent(MouseEvent ev) { | |||
if (state() != RFBSTATE_NORMAL) return; | |||
int x, y; | |||
switch (ev.getID()) { | |||
case MouseEvent.MOUSE_PRESSED: |
@@ -38,7 +38,6 @@ import javax.swing.*; | |||
import com.tigervnc.rfb.*; | |||
import com.tigervnc.rfb.Cursor; | |||
import com.tigervnc.rfb.Exception; | |||
import com.tigervnc.rfb.Point; | |||
class DesktopWindow extends JPanel implements |
@@ -27,13 +27,8 @@ | |||
package com.tigervnc.vncviewer; | |||
import java.io.*; | |||
import java.net.*; | |||
import java.awt.*; | |||
import java.awt.event.*; | |||
import java.awt.image.*; | |||
import javax.swing.*; | |||
import javax.swing.filechooser.*; | |||
//class Dialog extends JFrame implements WindowListener { | |||
class Dialog extends JFrame { |
@@ -22,7 +22,6 @@ import java.awt.Cursor; | |||
import java.awt.event.*; | |||
import javax.swing.JFrame; | |||
import javax.swing.JPopupMenu; | |||
import javax.swing.JMenu; | |||
import javax.swing.JMenuItem; | |||
import javax.swing.JCheckBoxMenuItem; | |||
@@ -22,13 +22,8 @@ import java.awt.*; | |||
import java.awt.event.*; | |||
import javax.swing.*; | |||
import javax.swing.border.*; | |||
import javax.swing.filechooser.*; | |||
import javax.swing.ImageIcon; | |||
import java.net.URL; | |||
import java.io.IOException; | |||
import com.tigervnc.rfb.*; | |||
import com.tigervnc.rfb.Exception; | |||
class OptionsDialog extends Dialog implements | |||
ActionListener, |
@@ -18,10 +18,8 @@ | |||
package com.tigervnc.vncviewer; | |||
import java.awt.*; | |||
import java.awt.event.*; | |||
import javax.swing.*; | |||
import java.net.URL; | |||
class PasswdDialog extends Dialog implements KeyListener{ | |||
@@ -26,7 +26,6 @@ package com.tigervnc.vncviewer; | |||
import java.awt.*; | |||
import java.awt.image.*; | |||
import java.nio.ByteOrder; | |||
import javax.swing.JScrollPane; | |||
import com.tigervnc.rfb.*; | |||
@@ -59,7 +58,6 @@ public class PixelBufferImage extends PixelBuffer implements ImageProducer | |||
int rowsToCopy = h < height() ? h : height(); | |||
int copyWidth = w < width() ? w : width(); | |||
int oldWidth = width(); | |||
int[] oldData = data; | |||
width_ = w; |
@@ -19,16 +19,12 @@ | |||
package com.tigervnc.vncviewer; | |||
import java.awt.*; | |||
import java.awt.image.*; | |||
import java.awt.event.*; | |||
import javax.swing.*; | |||
import javax.swing.border.*; | |||
import java.net.URL; | |||
import java.io.File; | |||
import java.util.*; | |||
import com.tigervnc.rfb.*; | |||
import com.tigervnc.rfb.Exception; | |||
class ServerDialog extends Dialog implements | |||
ActionListener, |
@@ -31,17 +31,13 @@ import java.awt.*; | |||
import java.awt.Color; | |||
import java.awt.Graphics; | |||
import java.awt.Image; | |||
import java.awt.image.*; | |||
import java.awt.Label; | |||
import java.io.InputStream; | |||
import java.util.jar.Attributes; | |||
import java.util.jar.Manifest; | |||
import javax.swing.*; | |||
import java.net.URL; | |||
import com.tigervnc.rdr.*; | |||
import com.tigervnc.rfb.*; | |||
import com.tigervnc.rfb.Exception; | |||
public class VncViewer extends java.applet.Applet implements Runnable | |||
{ |