about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorarg@mig29 <unknown>2006-10-30 12:26:55 +0100
committerarg@mig29 <unknown>2006-10-30 12:26:55 +0100
commit51c7589c8754dd171f218663d83957e1d9fe0429 (patch)
tree4aaff9096b7dade4385ac4762b4097515c08898b
parent99785382ae6d4b20e8baf33542059e466e0b3c7c (diff)
downloaddwm-51c7589c8754dd171f218663d83957e1d9fe0429.tar.gz
fixed stupid bug of snap-to-screen
Diffstat
-rw-r--r--event.c8


1 files changed, 4 insertions, 4 deletions
diff --git a/event.c b/event.c
index 007dbbc..19db371 100644
--- a/event.c
+++ b/event.c
@@ -48,13 +48,13 @@ movemouse(Client *c) {
 			XSync(dpy, False);
 			c->x = ocx + (ev.xmotion.x - x1);
 			c->y = ocy + (ev.xmotion.y - y1);
-			if(abs(c->x) < sx + SNAP)
+			if(abs(c->x) < SNAP)
 				c->x = sx;
-			else if(c->x + c->w > sx + sw - SNAP)
+			else if(abs((sx + sw) - (c->x + c->w)) < SNAP)
 				c->x = sw - c->w - 2 * BORDERPX;
-			if(abs(c->y) < sy + bh + SNAP)
+			if(abs((sy + bh) - c->y) < SNAP)
 				c->y = sy + bh;
-			else if(c->y + c->h > sy + sh - SNAP)
+			else if(abs((sy + sh) - (c->y + c->h)) < SNAP)
 				c->y = sh - c->h - 2 * BORDERPX;
 			resize(c, False, TopLeft);
 			break;

 

generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2025-07-22 09:18:50 +0000


 


5'>115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287


import macros, macro_dsl, estreams
from strutils import format

template newLenName() =
  let lenName {.inject.} = ^("len"& $lenNames)
  inc(lenNames)

template defPacketImports*() {.dirty.} =
  import macros, macro_dsl, estreams
  from strutils import format

macro defPacket*(typeNameN: untyped, typeFields: untyped): untyped =
  result = newNimNode(nnkStmtList)
  let
    typeName = quoted2ident(typeNameN)
    packetID = ^"p"
    streamID = ^"s"
  var
    constructorParams = newNimNode(nnkFormalParams).und(typeName)
    constructor = newNimNode(nnkProcDef).und(
      postfix(^("new"& $typeName.ident), "*"),
      emptyNode(),
      emptyNode(),
      constructorParams,
      emptyNode(),
      emptyNode())
    pack = newNimNode(nnkProcDef).und(
      postfix(^"pack", "*"),
      emptyNode(),
      emptyNode(),
      newNimNode(nnkFormalParams).und(
        emptyNode(),   # : void
        newNimNode(nnkIdentDefs).und(
          streamID,    # s: PBuffer
          ^"PBuffer",
          newNimNode(nnkNilLit)),
        newNimNode(nnkIdentDefs).und(
          packetID,    # p: var typeName
          newNimNode(nnkVarTy).und(typeName),
          emptyNode())),
      emptyNode(),
      emptyNode())
    read = newNimNode(nnkProcDef).und(
      newIdentNode("read"& $typeName.ident).postfix("*"),
      emptyNode(),
      emptyNode(),
      newNimNode(nnkFormalParams).und(
        typeName,   #result type
        newNimNode(nnkIdentDefs).und(
          streamID, # s: PBuffer = nil
          ^"PBuffer",
          newNimNode(nnkNilLit))),
      emptyNode(),
      emptyNode())
    constructorBody = newNimNode(nnkStmtList)
    packBody = newNimNode(nnkStmtList)
    readBody = newNimNode(nnkStmtList)
    lenNames = 0
  for i in 0.. typeFields.len - 1:
    let
      name = typeFields[i][0]
      dotName = packetID.dot(name)
      resName = newIdentNode("result").dot(name)
    case typeFields[i][1].kind
    of nnkBracketExpr: #ex: paddedstring[32, '\0'], array[range, type]
      case $typeFields[i][1][0].ident
      of "seq":
        ## let lenX = readInt16(s)
        newLenName()
        let
          item = ^"item"  ## item name in our iterators
          seqType = typeFields[i][1][1] ## type of seq
          readName = newIdentNode("read"& $seqType.ident)
        readBody.add(newNimNode(nnkLetSection).und(
          newNimNode(nnkIdentDefs).und(
            lenName,
            newNimNode(nnkEmpty),
            newCall("readInt16", streamID))))
        readBody.add(      ## result.name = @[]
          resName := ("@".prefix(newNimNode(nnkBracket))),
          newNimNode(nnkForStmt).und(  ## for item in 1..len:
            item,
            infix(1.lit, "..", lenName),
            newNimNode(nnkStmtList).und(
              newCall(  ## add(result.name, unpack[seqType](stream))
                "add", resName, newNimNode(nnkCall).und(readName, streamID)
        ) ) ) )
        packbody.add(
          newNimNode(nnkVarSection).und(newNimNode(nnkIdentDefs).und(
            lenName,  ## var lenName = int16(len(p.name))
            newIdentNode("int16"),
            newCall("int16", newCall("len", dotName)))),
          newCall("writeBE", streamID, lenName),
          newNimNode(nnkForStmt).und(  ## for item in 0..length - 1: pack(p.name[item], stream)
            item,
            infix(0.lit, "..", infix(lenName, "-", 1.lit)),
            newNimNode(nnkStmtList).und(
              newCall("echo", item, ": ".lit),
              newCall("pack", streamID, dotName[item]))))
        #set the default value to @[] (new sequence)
        typeFields[i][2] = "@".prefix(newNimNode(nnkBracket))
      else:
        error("Unknown type: "& treeRepr(typeFields[i]))
    of nnkIdent: ##normal type
      case $typeFields[i][1].ident
      of "string": # length encoded string
        packBody.add(newCall("write", streamID, dotName))
        readBody.add(resName := newCall("readStr", streamID))
      of "int8", "int16", "int32", "float32", "float64", "char", "bool":
        packBody.add(newCall(
          "writeBE", streamID, dotName))
        readBody.add(resName := newCall("read"& $typeFields[i][1].ident, streamID))
      else:  ## hopefully the type you specified was another defpacket() type
        packBody.add(newCall("pack", streamID, dotName))
        readBody.add(resName := newCall("read"& $typeFields[i][1].ident, streamID))
    else:
      error("I dont know what to do with: "& treerepr(typeFields[i]))

  var
    toStringFunc = newNimNode(nnkProcDef).und(
      newNimNode(nnkPostfix).und(
        ^"*",
        newNimNode(nnkAccQuoted).und(^"$")),
      emptyNode(),
      emptyNode(),
      newNimNode(nnkFormalParams).und(
        ^"string",
        newNimNode(nnkIdentDefs).und(
          packetID, # p: typeName
          typeName,
          emptyNode())),
      emptyNode(),
      emptyNode(),
      newNimNode(nnkStmtList).und(# [6]
        newNimNode(nnkAsgn).und(
          ^"result",                  ## result =
          newNimNode(nnkCall).und(# [6][0][1]
            ^"format",  ## format
            emptyNode()))))  ## "[TypeName   $1   $2]"
    formatStr = "["& $typeName.ident

  const emptyFields = {nnkEmpty, nnkNilLit}
  var objFields = newNimNode(nnkRecList)
  for i in 0 ..< len(typeFields):
    let fname = typeFields[i][0]
    constructorParams.add(newNimNode(nnkIdentDefs).und(
      fname,
      typeFields[i][1],
      typeFields[i][2]))
    constructorBody.add((^"result").dot(fname) := fname)
    #export the name
    typeFields[i][0] = fname.postfix("*")
    if not(typeFields[i][2].kind in emptyFields):
      ## empty the type default for the type def
      typeFields[i][2] = newNimNode(nnkEmpty)
    objFields.add(typeFields[i])
    toStringFunc[6][0][1].add(
      prefix("$", packetID.dot(fname)))
    formatStr.add "   $"
    formatStr.add($(i + 1))

  formatStr.add ']'
  toStringFunc[6][0][1][1] = formatStr.lit()

  result.add(
    newNimNode(nnkTypeSection).und(
      newNimNode(nnkTypeDef).und(
        typeName.postfix("*"),
        newNimNode(nnkEmpty),
        newNimNode(nnkObjectTy).und(
          newNimNode(nnkEmpty), #not sure what this is
          newNimNode(nnkEmpty), #parent: OfInherit(Ident(!"SomeObj"))
          objFields))))
  result.add(constructor.und(constructorBody))
  result.add(pack.und(packBody))
  result.add(read.und(readBody))
  result.add(toStringFunc)
  when defined(GenPacketShowOutput):
    echo(repr(result))

proc newProc*(name: NimNode; params: varargs[NimNode]; resultType: NimNode): NimNode {.compileTime.} =
  result = newNimNode(nnkProcDef).und(
    name,
    emptyNode(),
    emptyNode(),
    newNimNode(nnkFormalParams).und(resultType),
    emptyNode(),
    emptyNode(),
    newNimNode(nnkStmtList))
  result[3].add(params)

proc body*(procNode: NimNode): NimNode {.compileTime.} =
  assert procNode.kind == nnkProcDef and procNode[6].kind == nnkStmtList
  result = procNode[6]

proc iddefs*(a, b: string; c: NimNode): NimNode {.compileTime.} =
  result = newNimNode(nnkIdentDefs).und(^a, ^b, c)
proc iddefs*(a: string; b: NimNode): NimNode {.compileTime.} =
  result = newNimNode(nnkIdentDefs).und(^a, b, emptyNode())
proc varTy*(a: NimNode): NimNode {.compileTime.} =
  result = newNimNode(nnkVarTy).und(a)

macro forwardPacket*(typeName: untyped, underlyingType: untyped): untyped =
  var
    packetID = ^"p"
    streamID = ^"s"
  result = newNimNode(nnkStmtList).und(
    newProc(
      (^("read"& $typeName.ident)).postfix("*"),
      [ iddefs("s", "PBuffer", newNimNode(nnkNilLit)) ],
      typeName),
    newProc(
      (^"pack").postfix("*"),
      [ iddefs("s", "PBuffer", newNimNode(nnkNilLit)),
        iddefs("p", varTy(typeName)) ],
      emptyNode()))
  var
    readBody = result[0][6]
    packBody = result[1][6]
    resName = ^"result"

  case underlyingType.kind
  of nnkBracketExpr:
    case $underlyingType[0].ident
    of "array":
      for i in underlyingType[1][1].intval.int .. underlyingType[1][2].intval.int:
        readBody.add(
          newCall("read", ^"s", resName[lit(i)]))
        packBody.add(
          newCall("writeBE", ^"s", packetID[lit(i)]))
    else:
      echo "Unknown type: ", repr(underlyingtype)
  else:
    echo "unknown type:", repr(underlyingtype)
  echo(repr(result))

template forwardPacketT*(typeName: untyped; underlyingType: untyped) {.dirty.} =
  proc `read typeName`*(buffer: PBuffer): typeName =
    #discard readData(s, addr result, sizeof(result))
    var res: underlyingType
    buffer.read(res)
    result = typeName(res)
  proc `pack`*(buffer: PBuffer; ord: var typeName) =
    #writeData(s, addr p, sizeof(p))
    buffer.write(underlyingType(ord))

when isMainModule:
  type
    SomeEnum = enum
      A = 0'i8,
      B, C
  forwardPacket(SomeEnum, int8)


  defPacket(Foo, tuple[x: array[0..4, int8]])
  var f = newFoo([4'i8, 3'i8, 2'i8, 1'i8, 0'i8])
  var s2 = newStringStream("")
  f.pack(s2)
  assert s2.data == "\4\3\2\1\0"

  var s = newStringStream()
  s.flushImpl = proc(s: PStream) =
    var z = PStringStream(s)
    z.setPosition(0)
    z.data.setLen(0)


  s.setPosition(0)
  s.data.setLen(0)
  var o = B
  o.pack(s)
  o = A
  o.pack(s)
  o = C
  o.pack(s)
  assert s.data == "\1\0\2"
  s.flush

  defPacket(Y, tuple[z: int8])
  proc `$`(z: Y): string = result = "Y(" & $z.z & ")"
  defPacket(TestPkt, tuple[x: seq[Y]])
  var test = newTestPkt()
  test.x.add([newY(5), newY(4), newY(3), newY(2), newY(1)])
  for itm in test.x:
    echo(itm)
  test.pack(s)
  echo(repr(s.data))