comparison src/myVncProxy/VncProxyService.java @ 116:5b124b0ceaa7

merge
author Yu Taninari <e085734@ie.u-ryukyu.ac.jp>
date Sat, 06 Aug 2011 23:57:18 +0900
parents 712a047908df
children 65cb34c3f7ab
comparison
equal deleted inserted replaced
115:7d9e9dfd7eb8 116:5b124b0ceaa7
13 13
14 v.mainArgs = argv; 14 v.mainArgs = argv;
15 15
16 v.init(); 16 v.init();
17 v.start_threads(); 17 v.start_threads();
18
19 } 18 }
20 19
21 String[] mainArgs; 20 String[] mainArgs;
22 String username; 21 String username;
23 22
36 ScrollPane desktopScrollPane; 35 ScrollPane desktopScrollPane;
37 GridBagLayout gridbag; 36 GridBagLayout gridbag;
38 ButtonPanel buttonPanel; 37 ButtonPanel buttonPanel;
39 Label connStatusLabel; 38 Label connStatusLabel;
40 ProxyVncCanvas vc; 39 ProxyVncCanvas vc;
41 OptionsFrame options; 40 // OptionsFrame options;
41 OptionsNoFrame options;
42 ClipboardFrame clipboard; 42 ClipboardFrame clipboard;
43 RecordingFrame rec; 43 RecordingFrame rec;
44 44
45 // Control session recording. 45 // Control session recording.
46 Object recordingSync; 46 Object recordingSync;
83 83
84 public void init() { 84 public void init() {
85 85
86 readParameters(); 86 readParameters();
87 87
88 options = new OptionsNoFrame(this);
88 recordingSync = new Object(); 89 recordingSync = new Object();
89 90
90 sessionFileName = null; 91 sessionFileName = null;
91 recordingActive = false; 92 recordingActive = false;
92 recordingStatusChanged = false; 93 recordingStatusChanged = false;
103 fatalError("Network error: could not connect to server: " + host 104 fatalError("Network error: could not connect to server: " + host
104 + ":" + port, e); 105 + ":" + port, e);
105 }catch(Exception e){} 106 }catch(Exception e){}
106 107
107 rfbThread = new Thread(this); 108 rfbThread = new Thread(this);
108 accThread = new Thread(new AcceptThread(rfb)); 109 accThread = new Thread(new AcceptThread(rfb, 5999));
109 110
110 } 111 }
111 112
112 public void start_threads(){ 113 public void start_threads(){
113 rfbThread.start(); 114 rfbThread.start();
350 } 351 }
351 352
352 int[] encodings = new int[20]; 353 int[] encodings = new int[20];
353 int nEncodings = 0; 354 int nEncodings = 0;
354 355
356
355 encodings[nEncodings++] = preferredEncoding; 357 encodings[nEncodings++] = preferredEncoding;
356 if (options.useCopyRect) { 358 if (options.useCopyRect) {
357 encodings[nEncodings++] = RfbProto.EncodingCopyRect; 359 encodings[nEncodings++] = RfbProto.EncodingCopyRect;
358 } 360 }
359
360 if (preferredEncoding != RfbProto.EncodingTight) { 361 if (preferredEncoding != RfbProto.EncodingTight) {
361 encodings[nEncodings++] = RfbProto.EncodingTight; 362 encodings[nEncodings++] = RfbProto.EncodingTight;
362 } 363 }
363 if (preferredEncoding != RfbProto.EncodingZRLE) { 364 if (preferredEncoding != RfbProto.EncodingZRLE) {
364 encodings[nEncodings++] = RfbProto.EncodingZRLE; 365 encodings[nEncodings++] = RfbProto.EncodingZRLE;
367 encodings[nEncodings++] = RfbProto.EncodingHextile; 368 encodings[nEncodings++] = RfbProto.EncodingHextile;
368 } 369 }
369 if (preferredEncoding != RfbProto.EncodingZlib) { 370 if (preferredEncoding != RfbProto.EncodingZlib) {
370 encodings[nEncodings++] = RfbProto.EncodingZlib; 371 encodings[nEncodings++] = RfbProto.EncodingZlib;
371 } 372 }
373 /*
372 if (preferredEncoding != RfbProto.EncodingCoRRE) { 374 if (preferredEncoding != RfbProto.EncodingCoRRE) {
373 encodings[nEncodings++] = RfbProto.EncodingCoRRE; 375 encodings[nEncodings++] = RfbProto.EncodingCoRRE;
374 } 376 }
375 if (preferredEncoding != RfbProto.EncodingRRE) { 377 if (preferredEncoding != RfbProto.EncodingRRE) {
376 encodings[nEncodings++] = RfbProto.EncodingRRE; 378 encodings[nEncodings++] = RfbProto.EncodingRRE;
382 } 384 }
383 if (options.jpegQuality >= 0 && options.jpegQuality <= 9) { 385 if (options.jpegQuality >= 0 && options.jpegQuality <= 9) {
384 encodings[nEncodings++] = RfbProto.EncodingQualityLevel0 386 encodings[nEncodings++] = RfbProto.EncodingQualityLevel0
385 + options.jpegQuality; 387 + options.jpegQuality;
386 } 388 }
387
388 if (options.requestCursorUpdates) { 389 if (options.requestCursorUpdates) {
389 encodings[nEncodings++] = RfbProto.EncodingXCursor; 390 encodings[nEncodings++] = RfbProto.EncodingXCursor;
390 encodings[nEncodings++] = RfbProto.EncodingRichCursor; 391 encodings[nEncodings++] = RfbProto.EncodingRichCursor;
391 if (!options.ignoreCursorUpdates) 392 if (!options.ignoreCursorUpdates)
392 encodings[nEncodings++] = RfbProto.EncodingPointerPos; 393 encodings[nEncodings++] = RfbProto.EncodingPointerPos;
393 } 394 }
394 395 */
396
395 encodings[nEncodings++] = RfbProto.EncodingLastRect; 397 encodings[nEncodings++] = RfbProto.EncodingLastRect;
396 encodings[nEncodings++] = RfbProto.EncodingNewFBSize; 398 encodings[nEncodings++] = RfbProto.EncodingNewFBSize;
397 399
398 boolean encodingsWereChanged = false; 400 boolean encodingsWereChanged = false;
399 if (nEncodings != nEncodingsSaved) { 401 if (nEncodings != nEncodingsSaved) {
674 } 676 }
675 } 677 }
676 678
677 if (rfb != null && !rfb.closed()) 679 if (rfb != null && !rfb.closed())
678 rfb.close(); 680 rfb.close();
679 options.dispose(); 681 // options.dispose();
680 clipboard.dispose(); 682 clipboard.dispose();
681 if (rec != null) 683 if (rec != null)
682 rec.dispose(); 684 rec.dispose();
683 685
684 System.exit(0); 686 System.exit(0);
760 762
761 public void destroy() { 763 public void destroy() {
762 System.out.println("Destroying applet"); 764 System.out.println("Destroying applet");
763 765
764 vncContainer.removeAll(); 766 vncContainer.removeAll();
765 options.dispose(); 767 // options.dispose();
766 clipboard.dispose(); 768 clipboard.dispose();
767 if (rec != null) 769 if (rec != null)
768 rec.dispose(); 770 rec.dispose();
769 if (rfb != null && !rfb.closed()) 771 if (rfb != null && !rfb.closed())
770 rfb.close(); 772 rfb.close();