about summary refs log tree commit diff stats
path: root/draw.c
diff options
context:
space:
mode:
authorarg@mig29 <unknown>2006-12-01 17:45:27 +0100
committerarg@mig29 <unknown>2006-12-01 17:45:27 +0100
commitc73d5cb7b67d60abc92ff83aff57fc610dcd08e1 (patch)
treec9929a82d53bdd85b9d03955a336dedd41ec21b0 /draw.c
parent6458803d213aa0d083f4c350e5fc813a9a095045 (diff)
downloaddwm-c73d5cb7b67d60abc92ff83aff57fc610dcd08e1.tar.gz
and the winner is
Diffstat (limited to 'draw.c')
-rw-r--r--draw.c29
1 files changed, 17 insertions, 12 deletions
diff --git a/draw.c b/draw.c
index 77ffd87..5be403b 100644
--- a/draw.c
+++ b/draw.c
@@ -30,13 +30,13 @@ textnw(const char *text, unsigned int len) {
 }
 
 static void
-drawtext(const char *text, unsigned long col[ColLast], Bool dot, Bool corner) {
+drawtext(const char *text, unsigned long col[ColLast], Bool filleddot, Bool emptydot) {
 	int x, y, w, h;
 	static char buf[256];
 	unsigned int len, olen;
 	XGCValues gcv;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
-	XPoint pt[3];
+	XPoint pt[5];
 
 	XSetForeground(dpy, dc.gc, col[ColBG]);
 	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
@@ -74,20 +74,25 @@ drawtext(const char *text, unsigned long col[ColLast], Bool dot, Bool corner) {
 		XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
 		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 	}
-	if(dot) {
+	x = (h + 2) / 4;
+	if(filleddot) {
 		r.x = dc.x + 2;
 		r.y = dc.y + 2;
-		r.width = r.height = (h + 2) / 4;
+		r.width = r.height = x;
 		XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 	}
-	if(corner) {
-		pt[0].x = dc.x + 1;
-		pt[0].y = dc.y + dc.h / 2 + 1;
-		pt[1].x = 0;
-		pt[1].y = - dc.h / 2;
-		pt[2].x = dc.h / 2;
-		pt[2].y = 0;
-		XDrawLines(dpy, dc.drawable, dc.gc, pt, 3, CoordModePrevious);
+	if(emptydot) {
+		pt[0].x = dc.x + 2;
+		pt[0].y = dc.y + 2;
+		pt[1].x = x;
+		pt[1].y = 0;
+		pt[2].x = 0;
+		pt[2].y = x;
+		pt[3].x = -x;
+		pt[3].y = 0;
+		pt[4].x = 0;
+		pt[4].y = -x;
+		XDrawLines(dpy, dc.drawable, dc.gc, pt, 5, CoordModePrevious);
 	}
 }
 
03' href='#n203'>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 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395
//: Transform to maintain multiple variants of a recipe depending on the
//: number and types of the ingredients and products. Allows us to use nice
//: names like 'print' or 'length' in many mutually extensible ways.

:(scenario static_dispatch)
recipe main [
  7:number/raw <- test 3
]
recipe test a:number -> z:number [
  z <- copy 1
]
recipe test a:number, b:number -> z:number [
  z <- copy 2
]
+mem: storing 1 in location 7

//: When loading recipes, accumulate variants if headers don't collide, and
//: raise a warning if headers collide.

:(before "End Globals")
map<string, vector<recipe_ordinal> > Recipe_variants;
:(before "End One-time Setup")
put(Recipe_variants, "main", vector<recipe_ordinal>());  // since we manually added main to Recipe_ordinal
:(before "End Setup")
for (map<string, vector<recipe_ordinal> >::iterator p = Recipe_variants.begin(); p != Recipe_variants.end(); ++p) {
  for (long long int i = 0; i < SIZE(p->second); ++i) {
    if (p->second.at(i) >= Reserved_for_tests)
      p->second.at(i) = -1;  // just leave a ghost
  }
}

:(before "End Load Recipe Header(result)")
if (contains_key(Recipe_ordinal, result.name)) {
  const recipe_ordinal r = get(Recipe_ordinal, result.name);
  if ((!contains_key(Recipe, r) || get(Recipe, r).has_header)
      && !variant_already_exists(result)) {
    string new_name = next_unused_recipe_name(result.name);
    put(Recipe_ordinal, new_name, Next_recipe_ordinal++);
    get_or_insert(Recipe_variants, result.name).push_back(get(Recipe_ordinal, new_name));
    result.name = new_name;
  }
}
else {
  // save first variant
  put(Recipe_ordinal, result.name, Next_recipe_ordinal++);
  get_or_insert(Recipe_variants, result.name).push_back(get(Recipe_ordinal, result.name));
}

:(code)
bool variant_already_exists(const recipe& rr) {
  const vector<recipe_ordinal>& variants = get_or_insert(Recipe_variants, rr.name);
  for (long long int i = 0; i < SIZE(variants); ++i) {
    if (contains_key(Recipe, variants.at(i))
        && all_reagents_match(rr, get(Recipe, variants.at(i)))) {
      return true;
    }
  }
  return false;
}

bool all_reagents_match(const recipe& r1, const recipe& r2) {
  if (SIZE(r1.ingredients) != SIZE(r2.ingredients)) return false;
  if (SIZE(r1.products) != SIZE(r2.products)) return false;
  for (long long int i = 0; i < SIZE(r1.ingredients); ++i) {
    if (!deeply_equal_types(r1.ingredients.at(i).properties.at(0).second,
                            r2.ingredients.at(i).properties.at(0).second)) {
      return false;
    }
  }
  for (long long int i = 0; i < SIZE(r1.products); ++i) {
    if (!deeply_equal_types(r1.products.at(i).properties.at(0).second,
                            r2.products.at(i).properties.at(0).second)) {
      return false;
    }
  }
  return true;
}

:(before "End Globals")
set<string> Literal_type_names;
:(before "End One-time Setup")
Literal_type_names.insert("number");
Literal_type_names.insert("character");
:(code)
bool deeply_equal_types(const string_tree* a, const string_tree* b) {
  if (!a) return !b;
  if (!b) return !a;
  if (a->value == "literal" && b->value == "literal")
    return true;
  if (a->value == "literal")
    return Literal_type_names.find(b->value) != Literal_type_names.end();
  if (b->value == "literal")
    return Literal_type_names.find(a->value) != Literal_type_names.end();
  return a->value == b->value
      && deeply_equal_types(a->left, b->left)
      && deeply_equal_types(a->right, b->right);
}

string next_unused_recipe_name(const string& recipe_name) {
  for (long long int i = 2; ; ++i) {
    ostringstream out;
    out << recipe_name << '_' << i;
    if (!contains_key(Recipe_ordinal, out.str()))
      return out.str();
  }
}

//: Once all the recipes are loaded, transform their bodies to replace each
//: call with the most suitable variant.

:(scenario static_dispatch_picks_most_similar_variant)
recipe main [
  7:number/raw <- test 3, 4, 5
]
recipe test a:number -> z:number [
  z <- copy 1
]
recipe test a:number, b:number -> z:number [
  z <- copy 2
]
+mem: storing 2 in location 7

//: after filling in all missing types (because we'll be introducing 'blank' types in this transform in a later layer, for shape-shifting recipes)
:(after "End Type Modifying Transforms")
Transform.push_back(resolve_ambiguous_calls);  // idempotent

:(code)
void resolve_ambiguous_calls(recipe_ordinal r) {
  recipe& caller_recipe = get(Recipe, r);
  trace(9991, "transform") << "--- resolve ambiguous calls for recipe " << caller_recipe.name << end();
//?   cerr << "--- resolve ambiguous calls for recipe " << caller_recipe.name << '\n';
  for (long long int index = 0; index < SIZE(caller_recipe.steps); ++index) {
    instruction& inst = caller_recipe.steps.at(index);
    if (inst.is_label) continue;
    if (get_or_insert(Recipe_variants, inst.name).empty()) continue;
    replace_best_variant(inst, caller_recipe);
  }
}

void replace_best_variant(instruction& inst, const recipe& caller_recipe) {
  trace(9992, "transform") << "instruction " << inst.name << end();
  vector<recipe_ordinal>& variants = get(Recipe_variants, inst.name);
//?   trace(9992, "transform") << "checking base: " << get(Recipe_ordinal, inst.name) << end();
  long long int best_score = variant_score(inst, get(Recipe_ordinal, inst.name));
  trace(9992, "transform") << "score for base: " << best_score << end();
  for (long long int i = 0; i < SIZE(variants); ++i) {
//?     trace(9992, "transform") << "checking variant " << i << ": " << variants.at(i) << end();
    long long int current_score = variant_score(inst, variants.at(i));
    trace(9992, "transform") << "score for variant " << i << ": " << current_score << end();
    if (current_score > best_score) {
      inst.name = get(Recipe, variants.at(i)).name;
      best_score = current_score;
    }
  }
  // End Instruction Dispatch(inst, best_score)
}

long long int variant_score(const instruction& inst, recipe_ordinal variant) {
  long long int result = 1000;
  if (variant == -1) return -1;  // ghost from a previous test
//?   cerr << "variant score: " << inst.to_string() << '\n';
  if (!contains_key(Recipe, variant)) {
    assert(variant < MAX_PRIMITIVE_RECIPES);
    return -1;
  }
  const vector<reagent>& header_ingredients = get(Recipe, variant).ingredients;
  if (SIZE(inst.ingredients) < SIZE(header_ingredients)) {
    trace(9993, "transform") << "too few ingredients" << end();
//?     cerr << "too few ingredients\n";
    return -1;
  }
//?   cerr << "=== checking ingredients\n";
  for (long long int i = 0; i < SIZE(header_ingredients); ++i) {
    if (!types_match(header_ingredients.at(i), inst.ingredients.at(i))) {
      trace(9993, "transform") << "mismatch: ingredient " << i << end();
//?       cerr << "mismatch: ingredient " << i << '\n';
      return -1;
    }
    if (types_strictly_match(header_ingredients.at(i), inst.ingredients.at(i))) {
      trace(9993, "transform") << "strict match: ingredient " << i << end();
//?       cerr << "strict match: ingredient " << i << '\n';
    }
    else if (boolean_matches_literal(header_ingredients.at(i), inst.ingredients.at(i))) {
      // slight penalty for coercing literal to boolean (prefer direct conversion to number if possible)
      trace(9993, "transform") << "boolean matches literal: ingredient " << i << end();
      result--;
    }
    else {
      // slightly larger penalty for modifying type in other ways
      trace(9993, "transform") << "non-strict match: ingredient " << i << end();
//?       cerr << "non-strict match: ingredient " << i << '\n';
      result-=10;
    }
  }
//?   cerr << "=== done checking ingredients\n";
  if (SIZE(inst.products) > SIZE(get(Recipe, variant).products)) {
    trace(9993, "transform") << "too few products" << end();
//?     cerr << "too few products\n";
    return -1;
  }
  const vector<reagent>& header_products = get(Recipe, variant).products;
  for (long long int i = 0; i < SIZE(inst.products); ++i) {
    if (!types_match(header_products.at(i), inst.products.at(i))) {
      trace(9993, "transform") << "mismatch: product " << i << end();
//?       cerr << "mismatch: product " << i << '\n';
      return -1;
    }
    if (types_strictly_match(header_products.at(i), inst.products.at(i))) {
      trace(9993, "transform") << "strict match: product " << i << end();
//?       cerr << "strict match: product " << i << '\n';
    }
    else if (boolean_matches_literal(header_products.at(i), inst.products.at(i))) {
      // slight penalty for coercing literal to boolean (prefer direct conversion to number if possible)
      trace(9993, "transform") << "boolean matches literal: product " << i << end();
      result--;
    }
    else {
      // slightly larger penalty for modifying type in other ways
      trace(9993, "transform") << "non-strict match: product " << i << end();
//?       cerr << "non-strict match: product " << i << '\n';
      result-=10;
    }
  }
  // the greater the number of unused ingredients/products, the lower the score
  return result - (SIZE(get(Recipe, variant).products)-SIZE(inst.products))
                - (SIZE(inst.ingredients)-SIZE(get(Recipe, variant).ingredients));  // ok to go negative
}

:(scenario static_dispatch_disabled_on_headerless_definition)
% Hide_warnings = true;
recipe test a:number -> z:number [
  z <- copy 1
]
recipe test [
  reply 34
]
+warn: redefining recipe test

:(scenario static_dispatch_disabled_on_headerless_definition_2)
% Hide_warnings = true;
recipe test [
  reply 34
]
recipe test a:number -> z:number [
  z <- copy 1
]
+warn: redefining recipe test

:(scenario static_dispatch_on_primitive_names)
recipe main [
  1:number <- copy 34
  2:number <- copy 34
  3:boolean <- equal 1:number, 2:number
  4:boolean <- copy 0/false
  5:boolean <- copy 0/false
  6:boolean <- equal 4:boolean, 5:boolean
]

# temporarily hardcode number equality to always fail
recipe equal x:number, y:number -> z:boolean [
  local-scope
  load-ingredients
  z <- copy 0/false
]
# comparing numbers used overload
+mem: storing 0 in location 3
# comparing booleans continues to use primitive
+mem: storing 1 in location 6

:(scenario static_dispatch_prefers_literals_to_be_numbers_rather_than_addresses)
recipe main [
  1:number <- foo 0
]
recipe foo x:address:number -> y:number [
  reply 34
]
recipe foo x:number -> y:number [
  reply 35
]
+mem: storing 35 in location 1

:(scenario static_dispatch_on_non_literal_character_ignores_variant_with_numbers)
% Hide_errors = true;
recipe main [
  local-scope
  x:character <- copy 10/newline
  1:number/raw <- foo x
]
recipe foo x:number -> y:number [
  load-ingredients
  reply 34
]
+error: foo: wrong type for ingredient x:number
-mem: storing 34 in location 1

:(scenario static_dispatch_dispatches_literal_to_boolean_before_character)
recipe main [
  1:number/raw <- foo 0  # valid literal for boolean
]
recipe foo x:character -> y:number [
  local-scope
  load-ingredients
  reply 34
]
recipe foo x:boolean -> y:number [
  local-scope
  load-ingredients
  reply 35
]
# boolean variant is preferred
+mem: storing 35 in location 1

:(scenario static_dispatch_dispatches_literal_to_character_when_out_of_boolean_range)
recipe main [
  1:number/raw <- foo 97  # not a valid literal for boolean
]
recipe foo x:character -> y:number [
  local-scope
  load-ingredients
  reply 34
]
recipe foo x:boolean -> y:number [
  local-scope
  load-ingredients
  reply 35
]
# character variant is preferred
+mem: storing 34 in location 1

:(scenario static_dispatch_dispatches_literal_to_number_if_at_all_possible)
recipe main [
  1:number/raw <- foo 97
]
recipe foo x:character -> y:number [
  local-scope
  load-ingredients
  reply 34
]
recipe foo x:number -> y:number [
  local-scope
  load-ingredients
  reply 35
]
# number variant is preferred
+mem: storing 35 in location 1

//: after we make all attempts to dispatch, any unhandled cases will end up at
//: some wrong variant and trigger an error while trying to load-ingredients

:(scenario static_dispatch_shows_clear_error_on_missing_variant)
% Hide_errors = true;
recipe main [
  1:number <- foo 34
]
recipe foo x:boolean -> y:number [
  local-scope
  load-ingredients
  reply 35
]
+error: foo: wrong type for ingredient x:boolean
+error:   (we're inside recipe foo x:boolean -> y:number)
+error:   (we're trying to call 1:number <- foo 34)

:(before "End next-ingredient Type Mismatch Error")
raise_error << "   (we're inside " << header_label(current_call().running_recipe) << ")\n" << end();
raise_error << "   (we're trying to call " << to_instruction(*++Current_routine->calls.begin()).to_string() << ")\n" << end();

:(scenario static_dispatch_shows_clear_error_on_missing_variant_2)
% Hide_errors = true;
recipe main [
  1:boolean <- foo 34
]
recipe foo x:number -> y:number [
  local-scope
  load-ingredients
  reply x
]
+error: foo: reply ingredient x can't be saved in 1:boolean
+error:   (we just returned from recipe foo x:number -> y:number)

:(before "End reply Type Mismatch Error")
raise_error << "   (we just returned from " << header_label(caller_instruction.operation) << ")\n" << end();

:(code)
string header_label(recipe_ordinal r) {
  const recipe& caller = get(Recipe, r);
  ostringstream out;
  out << "recipe " << caller.name << ' ';
  for (long long int i = 0; i < SIZE(caller.ingredients); ++i)
    out << caller.ingredients.at(i).original_string << ' ';
  if (!caller.products.empty()) out << "->";
  for (long long int i = 0; i < SIZE(caller.products); ++i)
    out << ' ' << caller.products.at(i).original_string;
  return out.str();
}