[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gzz client/Fallback.java view/CellVobFactor...
|
From: |
Benja Fallenstein |
|
Subject: |
[Gzz-commits] gzz/gzz client/Fallback.java view/CellVobFactor... |
|
Date: |
Sat, 28 Sep 2002 13:18:11 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Benja Fallenstein <address@hidden> 02/09/28 13:18:11
Modified files:
gzz/client : Fallback.java
gzz/view : CellVobFactory.java FallbackBinder.java
LastOpDecorator.java ViewContext.java
ZZViewContext.java
Added files:
gzz/view : Mark.java
Log message:
Marking works :-)
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/Fallback.java.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/Mark.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/CellVobFactory.java.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/FallbackBinder.java.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/LastOpDecorator.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/ViewContext.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/ZZViewContext.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
Patches:
Index: gzz/gzz/client/Fallback.java
diff -c gzz/gzz/client/Fallback.java:1.37 gzz/gzz/client/Fallback.java:1.38
*** gzz/gzz/client/Fallback.java:1.37 Thu Sep 26 07:54:07 2002
--- gzz/gzz/client/Fallback.java Sat Sep 28 13:18:11 2002
***************
*** 72,78 ****
* It implements a subset of the 0.6.0 bindings.
*/
public class Fallback {
! public static final String rcsid = "$Id: Fallback.java,v 1.37 2002/09/26
11:54:07 benja Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
--- 72,78 ----
* It implements a subset of the 0.6.0 bindings.
*/
public class Fallback {
! public static final String rcsid = "$Id: Fallback.java,v 1.38 2002/09/28
17:18:11 benja Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
***************
*** 175,180 ****
--- 175,183 ----
else
return -1;
}
+ public boolean isMarked(Cell c) {
+ return binder.markedCells.contains(c);
+ }
public Cell getWindow() {
throw new UnsupportedOperationException(
"Getting window cell in Fallback client");
Index: gzz/gzz/view/CellVobFactory.java
diff -c gzz/gzz/view/CellVobFactory.java:1.13
gzz/gzz/view/CellVobFactory.java:1.14
*** gzz/gzz/view/CellVobFactory.java:1.13 Fri Sep 27 05:07:56 2002
--- gzz/gzz/view/CellVobFactory.java Sat Sep 28 13:18:11 2002
***************
*** 46,52 ****
*/
public class CellVobFactory implements CellView {
! public static final String rcsid = "$Id: CellVobFactory.java,v 1.13
2002/09/27 09:07:56 tjl Exp $";
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.err.println(s); }
--- 46,52 ----
*/
public class CellVobFactory implements CellView {
! public static final String rcsid = "$Id: CellVobFactory.java,v 1.14
2002/09/28 17:18:11 benja Exp $";
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.err.println(s); }
***************
*** 132,138 ****
* @param v The vobscene to add to
* @param cs The coordinate system index
*/
! public void addCellVobs(final Cell c, final VobScene v, final int cs_out,
final int cs_box,
final float x, final float y, final float w, final float h,
final Vob content,
--- 132,138 ----
* @param v The vobscene to add to
* @param cs The coordinate system index
*/
! public void addCellVobs(final Cell c, final VobScene v, final int cs_out,
final int cs_box,
final float x, final float y, final float w, final float h,
final Vob content,
***************
*** 153,165 ****
else if (c.s(d_clone, 1) != null) // if rootclone
bg.addColor(new Color(0xffff8c));
! /*
! if (c.s(d_cursor) != null) // if accursed
! bg.addColor(new Color(0xaa96ff));
!
! if (c.s(d_mark) != null && c.s(d_mark, -1) == null) // if marked
bg.addColor(new Color(0xff0000));
- */
Object sliceId2 = getSliceId(c);
if((sliceId==null && sliceId2!=null)
--- 153,160 ----
else if (c.s(d_clone, 1) != null) // if rootclone
bg.addColor(new Color(0xffff8c));
! if (context.isMarked(c)) // if marked
bg.addColor(new Color(0xff0000));
Object sliceId2 = getSliceId(c);
if((sliceId==null && sliceId2!=null)
Index: gzz/gzz/view/FallbackBinder.java
diff -c gzz/gzz/view/FallbackBinder.java:1.16
gzz/gzz/view/FallbackBinder.java:1.17
*** gzz/gzz/view/FallbackBinder.java:1.16 Thu Sep 26 07:54:07 2002
--- gzz/gzz/view/FallbackBinder.java Sat Sep 28 13:18:11 2002
***************
*** 40,46 ****
/** Keybindings for the Fallback client.
*/
public class FallbackBinder {
! public static final String rcsid = "$Id: FallbackBinder.java,v 1.16
2002/09/26 11:54:07 benja Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
--- 40,46 ----
/** Keybindings for the Fallback client.
*/
public class FallbackBinder {
! public static final String rcsid = "$Id: FallbackBinder.java,v 1.17
2002/09/28 17:18:11 benja Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
***************
*** 76,81 ****
--- 76,95 ----
Cell searchStart;
+ /** The current set of marks.
+ * Each marked cell is represented as a <code>gzz.view.Mark</code>
+ * object. We don't have support for multiple mark sets yet.
+ */
+ java.util.List marks = new ArrayList();
+
+ /** The set of all marked cells.
+ * This is the set of all cells in the <code>Mark</code> objects
+ * of <code>marks</code>. We need this because going through
+ * the whole list for all cells on the screen scales badly.
+ * We want to be able to have big mark sets.
+ */
+ public Set markedCells = new HashSet();
+
public FallbackBinder(Fallback fallback) {
this.fallback = fallback;
}
***************
*** 91,97 ****
if(dbg) pa("Dir: "+dim+" "+dir+" '"+n+"'");
switch(directOp) {
case NONE: if(n != null) w.cursor = n; break;
! case CONNECT: dims[dim].connect(w.cursor, dir, other.cursor); break;
case DISCONNECT: dims[dim].disconnect(w.cursor, dir); break;
case HOP: dims[dim].hop(w.cursor, dir); break;
case NEW: w.cursor = w.cursor.N(dims[dim], dir); break;
--- 105,124 ----
if(dbg) pa("Dir: "+dim+" "+dir+" '"+n+"'");
switch(directOp) {
case NONE: if(n != null) w.cursor = n; break;
! case CONNECT:
! if(marks.isEmpty())
! dims[dim].connect(w.cursor, dir, other.cursor);
! else {
! c = w.cursor;
! for(Iterator i=marks.iterator(); i.hasNext();) {
! Mark m = (Mark)i.next();
! c.connect(dims[dim], dir, m.cell);
! c = m.cell;
! }
! marks = new ArrayList();
! markedCells = new HashSet();
! }
! break;
case DISCONNECT: dims[dim].disconnect(w.cursor, dir); break;
case HOP: dims[dim].hop(w.cursor, dir); break;
case NEW: w.cursor = w.cursor.N(dims[dim], dir); break;
***************
*** 122,127 ****
--- 149,173 ----
directOp = op;
}
+ void mark(int win) {
+ Cell c = fallback.windows[win].cursor;
+ boolean there = false;
+
+ for(Iterator i=marks.iterator(); i.hasNext();) {
+ Mark m = (Mark)i.next();
+ if(m.cell.equals(c)) {
+ i.remove();
+ markedCells.remove(m.cell);
+ there = true;
+ }
+ }
+
+ if(!there) {
+ marks.add(new Mark(c));
+ markedCells.add(c);
+ }
+ }
+
boolean save() {
try {
gzz.slices.SliceSpace sp =
(gzz.slices.SliceSpace)fallback.space;
***************
*** 236,241 ****
--- 282,289 ----
case 'Z': rotate(0, 2, 1); break;
// Special
+ case 'm': mark(1); break;
+ case 'M': mark(0); break;
case 'v': changeView(1, 1); break;
case 'V': changeView(0, 1); break;
case 'r':
Index: gzz/gzz/view/LastOpDecorator.java
diff -c gzz/gzz/view/LastOpDecorator.java:1.10
gzz/gzz/view/LastOpDecorator.java:1.11
*** gzz/gzz/view/LastOpDecorator.java:1.10 Wed Sep 25 15:27:32 2002
--- gzz/gzz/view/LastOpDecorator.java Sat Sep 28 13:18:11 2002
***************
*** 32,38 ****
* directional op entered.
*/
public class LastOpDecorator implements FallbackSceneDecorator {
! String rcsid = "$Id: LastOpDecorator.java,v 1.10 2002/09/25 19:27:32 benja
Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
--- 32,38 ----
* directional op entered.
*/
public class LastOpDecorator implements FallbackSceneDecorator {
! String rcsid = "$Id: LastOpDecorator.java,v 1.11 2002/09/28 17:18:11 benja
Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
***************
*** 68,74 ****
case FallbackBinder.NONE: return;
case FallbackBinder.CONNECT:
ch.addBox(text("Connect [where?] to "));
! ch.addBox(cell(other.cursor, win));
break;
case FallbackBinder.DISCONNECT:
ch.addBox(text("Break [which connection?]")); break;
--- 68,82 ----
case FallbackBinder.NONE: return;
case FallbackBinder.CONNECT:
ch.addBox(text("Connect [where?] to "));
! if(fallback.binder.marks.isEmpty())
! ch.addBox(cell(other.cursor, win));
! else if(fallback.binder.marks.size() == 1) {
! ch.addBox(text("the marked cell ("));
! Mark m = (Mark)fallback.binder.marks.get(0);
! ch.addBox(cell(m.cell, win));
! ch.addBox(text(")"));
! } else
! ch.addBox(text("the marked cells"));
break;
case FallbackBinder.DISCONNECT:
ch.addBox(text("Break [which connection?]")); break;
Index: gzz/gzz/view/ViewContext.java
diff -c gzz/gzz/view/ViewContext.java:1.2 gzz/gzz/view/ViewContext.java:1.3
*** gzz/gzz/view/ViewContext.java:1.2 Mon Aug 19 10:45:48 2002
--- gzz/gzz/view/ViewContext.java Sat Sep 28 13:18:11 2002
***************
*** 41,47 ****
*/
public interface ViewContext {
! String rcsid = "$Id: ViewContext.java,v 1.2 2002/08/19 14:45:48 tjl Exp $";
/** Get the accursed cell. */
Cell getAccursed();
--- 41,47 ----
*/
public interface ViewContext {
! String rcsid = "$Id: ViewContext.java,v 1.3 2002/09/28 17:18:11 benja Exp $";
/** Get the accursed cell. */
Cell getAccursed();
***************
*** 60,65 ****
--- 60,69 ----
* return <code>-1</code>.
*/
int getCursorOffset(Cell c);
+
+ /** Whether a given cell is marked by the current mark set.
+ */
+ boolean isMarked(Cell c);
/** Get the maincell of the window, if available.
* This cell can be used to acquire more metadata about how to
Index: gzz/gzz/view/ZZViewContext.java
diff -c gzz/gzz/view/ZZViewContext.java:1.2 gzz/gzz/view/ZZViewContext.java:1.3
*** gzz/gzz/view/ZZViewContext.java:1.2 Mon Aug 19 10:45:48 2002
--- gzz/gzz/view/ZZViewContext.java Sat Sep 28 13:18:11 2002
***************
*** 38,44 ****
*/
public class ZZViewContext implements ViewContext {
! String rcsid = "$Id: ZZViewContext.java,v 1.2 2002/08/19 14:45:48 tjl Exp $";
public final Cell window;
--- 38,44 ----
*/
public class ZZViewContext implements ViewContext {
! String rcsid = "$Id: ZZViewContext.java,v 1.3 2002/09/28 17:18:11 benja Exp
$";
public final Cell window;
***************
*** 59,64 ****
--- 59,68 ----
}
public int getCursorOffset(Cell c) {
+ throw new UnsupportedOperationException("not implemented");
+ }
+
+ public boolean isMarked(Cell c) {
throw new UnsupportedOperationException("not implemented");
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz/gzz client/Fallback.java view/CellVobFactor...,
Benja Fallenstein <=