Commit: 21 - hunton_client (svn)

密猟オンラインクライアントプログラム JAVAベース

Commit MetaInfo

• Révision: 21 (tree)
• l'heure: 2016-12-25 00:47:49
• Auteur: manjihq

Message de Log

表示するユーザー名やアイテム名などをそれなりに全角判定して表示を調整するようにした

Change Summary

• modified: trunk/src/hunton/Hunt.java
• modified: trunk/src/hunton/HuntLoginWnd.java
• modified: trunk/src/hunton/MesgBox.java
• modified: trunk/src/hunton/RecvTask.java

Modification

--- trunk/src/hunton/Hunt.java	(revision 20)
+++ trunk/src/hunton/Hunt.java	(revision 21)
@@ -132,6 +132,12 @@
     public static final byte MOVE_LEFT = 2;
     public static final byte MOVE_RIGHT = 3;
 
+    /* system parameter */
+    public static final int WIDTH_VIEW_USERNAME = 16;
+    public static final int WIDTH_VIEW_WEAPONNAME = 16;
+    public static final int WIDTH_VIEW_ITEMNAME = 16;
+    public static final int WIDTH_VIEW_ANIMALNAME = 16;
+
     /* system variable */
     static String HostName;
     static String UserName;
@@ -193,6 +199,122 @@
         p[nidx + 3] = (byte) (n & 0xff);
     }
 
+    public static final boolean isSingleByte(int codepoint) {
+        boolean result = false;
+        if (Character.charCount(codepoint) == 1) {
+            if (codepoint >= 0 && codepoint < 0x80) {
+                result = true;
+            }
+        }
+        return result;
+    }
+
+    public static final int countStringWidth(String s) {
+        int i;
+        int nwidth = 0;
+        for (i = 0; i < s.length(); i++) {
+            int c;
+            c = s.codePointAt(i);
+            if (Character.charCount(c) == 2) {
+                i++;
+            }
+            if (isSingleByte(c) == false) {
+                nwidth += 2;
+            } else {
+                nwidth++;
+            }
+        }
+        return nwidth;
+    }
+
+    public static final String rightStringWidth(String s, int nlimit) {
+        StringBuilder wkname = new StringBuilder();
+        int i;
+        int nwidth = 0;
+        for (i = 0; i < s.length(); i++) {
+            int c;
+            c = s.codePointAt(i);
+            if (Character.charCount(c) == 2) {
+                i++;
+            }
+            if (isSingleByte(c) == false) {
+                if (nwidth + 2 > nlimit) {
+                    break;
+                }
+                nwidth += 2;
+            } else {
+                if (nwidth + 1 > nlimit) {
+                    break;
+                }
+                nwidth++;
+            }
+            wkname.appendCodePoint(c);
+        }
+        if (nwidth < nlimit) {
+            StringBuilder wkspace = new StringBuilder();
+            for (; nwidth < nlimit; nwidth++) {
+                wkspace.append(" ");
+            }
+            wkname.insert(0, wkspace);
+        }
+        return wkname.toString();
+    }
+
+    public static final String trimStringWidth(String s, int nlimit) {
+        StringBuilder wkname = new StringBuilder();
+        int i;
+        int nwidth = 0;
+        for (i = 0; i < s.length(); i++) {
+            int c;
+            c = s.codePointAt(i);
+            if (Character.charCount(c) == 2) {
+                i++;
+            }
+            if (isSingleByte(c) == false) {
+                if (nwidth + 2 > nlimit) {
+                    break;
+                }
+                nwidth += 2;
+            } else {
+                if (nwidth + 1 > nlimit) {
+                    break;
+                }
+                nwidth++;
+            }
+            wkname.appendCodePoint(c);
+        }
+        return wkname.toString();
+    }
+
+    public static final String formatStringWidth(String s, int nview) {
+        StringBuilder wkname = new StringBuilder();
+        int i;
+        int nwidth = 0;
+        for (i = 0; i < s.length(); i++) {
+            int c;
+            c = s.codePointAt(i);
+            if (Character.charCount(c) == 2) {
+                i++;
+            }
+            if (isSingleByte(c) == false) {
+                if (nwidth + 2 > nview) {
+                    break;
+                }
+                nwidth += 2;
+            } else {
+                if (nwidth + 1 > nview) {
+                    break;
+                }
+                nwidth++;
+            }
+            wkname.appendCodePoint(c);
+        }
+        for (; nwidth < nview; nwidth++) {
+            wkname.append(" ");
+        }
+        return wkname.toString();
+    }
+
     public static final int getType() {
         return yourType;
     }
@@ -298,6 +420,7 @@
                 }
             }
             nowWeapon[n] = new String(p, nidx, i + 1, SYSTEM_CHARSET);
+            nowWeapon[n] = trimStringWidth(nowWeapon[n], WIDTH_VIEW_WEAPONNAME);
         } catch (UnsupportedEncodingException e) {
             nowWeapon[n] = "?"; //NOI18N
         }
@@ -312,6 +435,7 @@
                 }
             }
             nowItem[n] = new String(p, nidx, i + 1, SYSTEM_CHARSET);
+            nowItem[n] = trimStringWidth(nowItem[n], WIDTH_VIEW_ITEMNAME);
         } catch (UnsupportedEncodingException e) {
             nowItem[n] = "?"; //NOI18N
         }
@@ -464,6 +588,7 @@
         } else {
             UserName = s;
         }
+        UserName = trimStringWidth(UserName, WIDTH_VIEW_USERNAME);
     }
 
     public static void setPassWord(String s) {
@@ -800,7 +925,7 @@
                 }
                 work = ifile.readLine();
                 if (work != null) {
-                    UserName = work;
+                    UserName = trimStringWidth(work, WIDTH_VIEW_USERNAME);
                 }
                 mainWndBounds = load_rect(ifile);
                 statusViewBounds = load_rect(ifile);

--- trunk/src/hunton/HuntLoginWnd.java	(revision 20)
+++ trunk/src/hunton/HuntLoginWnd.java	(revision 21)
@@ -62,7 +62,7 @@
         add(label);
 
         gridbag.gridwidth = GridBagConstraints.REMAINDER;
-        username = new TextField(Hunt.getUserName(), Hunt.USERNAME_LEN);
+        username = new TextField(Hunt.getUserName(), Hunt.WIDTH_VIEW_USERNAME);
         layout.setConstraints(username, gridbag);
         username.addActionListener(this);
         add(username);

--- trunk/src/hunton/MesgBox.java	(revision 20)
+++ trunk/src/hunton/MesgBox.java	(revision 21)
@@ -7,18 +7,29 @@
 
     static void make_text_labels(Dialog dialog, String s) {
         String wk;
+        int nwidth;
         int ns = 0;
         int pos = s.indexOf('\n');
         Panel panel = new Panel(new GridLayout(0, 1));
         while (pos != -1) {
             wk = s.substring(ns, pos);
+            nwidth = Hunt.countStringWidth(wk);
+            if (nwidth < 20) {
+                wk = Hunt.trimStringWidth(s, 20);
+            }
             panel.add(new Label(wk));
             ns = pos + 1;
             pos = s.indexOf('\n', ns);
         }
         wk = s.substring(ns);
+        nwidth = Hunt.countStringWidth(wk);
+        if (nwidth < 20) {
+            wk = Hunt.formatStringWidth(s, 20);
+        }
         panel.add(new Label(wk));
         dialog.add(panel, BorderLayout.CENTER);
+        dialog.add(new Panel(), BorderLayout.WEST);
+        dialog.add(new Panel(), BorderLayout.EAST);
     }
 
     public static boolean MessageBox(Frame w,

--- trunk/src/hunton/RecvTask.java	(revision 20)
+++ trunk/src/hunton/RecvTask.java	(revision 21)
@@ -125,10 +125,11 @@
         } else {
             work += Hunt.getBundle().getString("WHOLIST_HUNTER");
         }
-        work += username;
-        work += " "; //NOI18N
-        DecimalFormat form = new DecimalFormat("#########0"); //NOI18N
-        work += form.format(wk_score);
+        work += "["; //NOI18N
+        work += Hunt.trimStringWidth(username, Hunt.WIDTH_VIEW_USERNAME);
+        work += "]"; //NOI18N
+        DecimalFormat form = new DecimalFormat("#,##0;-#,##0"); //NOI18N
+        work += Hunt.rightStringWidth(form.format(wk_score), 11);
         work += Hunt.getBundle().getString("LABEL_POINT");
         if (buffer[n] != 0) {
             work += Hunt.getBundle().getString("WHOLIST_ONLINE");