ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.254 by root, Mon May 29 01:53:23 2006 UTC vs.
Revision 1.307 by root, Sun Jun 18 19:13:20 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
20 21
21sub get_layout { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
39sub check_tooltip {
40 if (!$GRAB) { 23 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
45 $TOOLTIP->hide; 27 $TOOLTIP->hide;
46 28
47 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
48 32
49 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
50 34
51 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
52 36
… …
59 } 43 }
60 } 44 }
61 45
62 $TOOLTIP->hide; 46 $TOOLTIP->hide;
63 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
64} 71}
65 72
66# class methods for events 73# class methods for events
67sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
68 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
82 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
83 90
84 $GRAB = $widget; 91 $GRAB = $widget;
85 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
86 93
87 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
88 } 95 }
89 96
90 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
91 98
92 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
107 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
108 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
109 $grab->update if $grab; 116 $grab->update if $grab;
110 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
111 118
112 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
113 } 120 }
114} 121}
115 122
116sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
117 my ($ev) = @_; 124 my ($ev) = @_;
… …
123 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
124 131
125 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
126 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
127 134
128 check_tooltip; 135 $TOOLTIP_WATCHER->start;
129 } 136 }
130 137
131 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
132 if $HOVER; 139 if $HOVER;
133} 140}
… …
165sub rescale_widgets { 172sub rescale_widgets {
166 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
167 174
168 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
169 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
170 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
171 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
172 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
173 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
174 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
175 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
176 } 190 }
177 } 191 }
178 192
179 reconfigure_widgets; 193 reconfigure_widgets;
180} 194}
… …
189 203
190sub new { 204sub new {
191 my $class = shift; 205 my $class = shift;
192 206
193 my $self = bless { 207 my $self = bless {
194 x => 0, 208 x => "center",
195 y => 0, 209 y => "center",
196 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
197 can_events => 1, 213 can_events => 1,
198 @_ 214 @_
199 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
200 218
201 for (keys %$self) { 219 for (keys %$self) {
202 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
203 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
204 } 222 }
205 } 223 }
206 224
207 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
208
209 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
210 $self->{req_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
211 $self->{req_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
212 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
213 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
214 } 235 }
215 236
216 $self 237 $self
217} 238}
218 239
… …
229 return if $self->{parent}; 250 return if $self->{parent};
230 251
231 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
232} 253}
233 254
234sub center {
235 my ($self) = @_;
236
237 $CFClient::UI::ROOT->on_post_alloc (
238 "center_$self" => sub {
239 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
240 },
241 );
242
243 $self->update;
244}
245
246sub set_visible { 255sub set_visible {
247 my ($self) = @_; 256 my ($self) = @_;
248 257
249 return if $self->{visible}; 258 return if $self->{visible};
250 259
… …
263 272
264 return unless $self->{visible}; 273 return unless $self->{visible};
265 274
266 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
267 276
277 delete $self->{visible};
268 delete $self->{root}; 278 delete $self->{root};
269 delete $self->{visible};
270 279
271 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
272 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
273 282
274 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
275 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
276 285
277 $self->focus_out; 286 $self->emit ("focus_out");
278
279 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
280} 288}
281 289
282sub set_visibility { 290sub set_visibility {
283 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
303 311
304 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
305 if $self->{parent}; 313 if $self->{parent};
306} 314}
307 315
308sub move { 316sub move_abs {
309 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
310 318
311 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
312 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
313 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
314 322
315 $self->update; 323 $self->update;
316} 324}
317 325
318sub set_size { 326sub set_size {
319 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
320 328
321 $self->{def_w} = $w; 329 $self->{force_w} = $w;
322 $self->{def_h} = $h; 330 $self->{force_h} = $h;
323 331
324 $self->realloc; 332 $self->realloc;
325} 333}
326 334
327sub size_request { 335sub size_request {
… …
331 339
332sub configure { 340sub configure {
333 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
334 342
335 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
336 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
337 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
338 348
339 # use alignment to adjust x, y 349 # use alignment to adjust x, y
340 350
341 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
342 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
343
344 ($w, $h) = ($w2, $h2);
345 } 353 }
346 354
347 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
348 $self->{x} = $x; 356 $self->{x} = $x;
349 $self->{y} = $y; 357 $self->{y} = $y;
350 $self->update; 358 $self->update;
351 } 359 }
352 360
353 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
354 return unless $self->{visible}; 362 return unless $self->{visible};
355 363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
356 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 367 $self->{root}{size_alloc}{$self+0} = $self;
357 } 368 }
358}
359
360sub size_allocate {
361 # nothing to be done
362} 369}
363 370
364sub children { 371sub children {
372 # nop
373}
374
375sub visible_children {
376 $_[0]->children
365} 377}
366 378
367sub set_max_size { 379sub set_max_size {
368 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
369 381
370 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
371 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
372} 386}
373 387
374sub set_tooltip { 388sub set_tooltip {
375 my ($self, $tooltip) = @_; 389 my ($self, $tooltip) = @_;
376 390
… …
381 395
382 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
383 397
384 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
385 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
386 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
387 } 401 }
388} 402}
389 403
390# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
391sub coord2local { 405sub coord2local {
… …
399 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
400 414
401 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
402} 416}
403 417
404sub focus_in { 418sub invoke_focus_in {
405 my ($self) = @_; 419 my ($self) = @_;
406 420
407 return if $FOCUS == $self; 421 return if $FOCUS == $self;
408 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
409 423
410 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
411 425
412 $self->_emit (focus_in => $focus);
413
414 $focus->update if $focus; 426 $focus->update if $focus;
415 $FOCUS->update; 427 $FOCUS->update;
416}
417 428
429 0
430}
431
418sub focus_out { 432sub invoke_focus_out {
419 my ($self) = @_; 433 my ($self) = @_;
420 434
421 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
422 436
423 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
424 438
425 $self->_emit (focus_out => $focus);
426
427 $focus->update if $focus; #? 439 $focus->update if $focus; #?
428 440
429 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
430 unless $FOCUS; 442 unless $FOCUS;
431}
432 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
433sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
434sub button_up { } 454sub invoke_button_up { 1 }
435sub key_down { } 455sub invoke_key_down { 1 }
436sub key_up { } 456sub invoke_key_up { 1 }
437 457
438sub button_down { 458sub invoke_button_down {
439 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
440 460
441 $self->focus_in; 461 $self->grab_focus;
442}
443 462
444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
448sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 (List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before
476 ($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure
477 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
478}
449 479
450sub find_widget { 480sub find_widget {
451 my ($self, $x, $y) = @_; 481 my ($self, $x, $y) = @_;
452 482
453 return () unless $self->{can_events}; 483 return () unless $self->{can_events};
… …
461 491
462sub set_parent { 492sub set_parent {
463 my ($self, $parent) = @_; 493 my ($self, $parent) = @_;
464 494
465 Scalar::Util::weaken ($self->{parent} = $parent); 495 Scalar::Util::weaken ($self->{parent} = $parent);
466
467 $self->set_visible if $parent->{visible}; 496 $self->set_visible if $parent->{visible};
468} 497}
469 498
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub _emit {
477 my ($self, $signal, @args) = @_;
478
479 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
480}
481
482sub emit {
483 my ($self, $signal, @args) = @_;
484
485 $self->_emit ($signal, @args)
486 || $self->$signal (@args);
487}
488
489sub visibility_change {
490 #my ($self, $visible) = @_;
491}
492
493sub realloc { 499sub realloc {
494 my ($self) = @_; 500 my ($self) = @_;
495 501
496 if ($self->{visible}) { 502 if ($self->{visible}) {
497 return if $self->{root}{realloc}{$self}; 503 return if $self->{root}{realloc}{$self+0};
498 504
499 $self->{root}{realloc}{$self} = $self; 505 $self->{root}{realloc}{$self+0} = $self;
500 $self->{root}->update; 506 $self->{root}->update;
501 } else { 507 } else {
502 delete $self->{req_w}; 508 delete $self->{req_w};
509 delete $self->{req_h};
503 } 510 }
504} 511}
505 512
506sub update { 513sub update {
507 my ($self) = @_; 514 my ($self) = @_;
508 515
509 $self->{parent}->update 516 $self->{parent}->update
510 if $self->{parent}; 517 if $self->{parent};
511} 518}
512 519
520sub reconfigure {
521 my ($self) = @_;
522
523 $self->realloc;
524 $self->update;
525}
526
527# using global variables seems a bit hacky, but passing through all drawing
528# functions seems pointless.
529our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
530
513sub draw { 531sub draw {
514 my ($self) = @_; 532 my ($self) = @_;
515 533
516 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
535
536 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541
542 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
517 545
518 glPushMatrix; 546 glPushMatrix;
519 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
520 $self->_draw;
521 glPopMatrix;
522 548
523 if ($self == $HOVER && $self->{can_hover}) { 549 if ($self == $HOVER && $self->{can_hover}) {
524 my ($x, $y) = @$self{qw(x y)};
525
526 glColor 1, 0.8, 0.5, 0.2; 550 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
527 glEnable GL_BLEND; 551 glEnable GL_BLEND;
528 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 552 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
529 glBegin GL_QUADS; 553 glBegin GL_QUADS;
530 glVertex $x , $y; 554 glVertex 0 , 0;
531 glVertex $x + $self->{w}, $y; 555 glVertex $self->{w}, 0;
532 glVertex $x + $self->{w}, $y + $self->{h}; 556 glVertex $self->{w}, $self->{h};
533 glVertex $x , $y + $self->{h}; 557 glVertex 0 , $self->{h};
534 glEnd; 558 glEnd;
535 glDisable GL_BLEND; 559 glDisable GL_BLEND;
536 } 560 }
537 561
538 if ($ENV{PCLIENT_DEBUG}) { 562 if ($ENV{CFPLUS_DEBUG} & 1) {
539 glPushMatrix; 563 glPushMatrix;
540 glColor 1, 1, 0, 1; 564 glColor 1, 1, 0, 1;
541 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 565 glTranslate 0.375, 0.375;
542 glBegin GL_LINE_LOOP; 566 glBegin GL_LINE_LOOP;
543 glVertex 0 , 0; 567 glVertex 0 , 0;
544 glVertex $self->{w} - 1, 0; 568 glVertex $self->{w} - 1, 0;
545 glVertex $self->{w} - 1, $self->{h} - 1; 569 glVertex $self->{w} - 1, $self->{h} - 1;
546 glVertex 0 , $self->{h} - 1; 570 glVertex 0 , $self->{h} - 1;
547 glEnd; 571 glEnd;
548 glPopMatrix; 572 glPopMatrix;
549 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 573 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
550 } 574 }
575
576 $self->_draw;
577 glPopMatrix;
551} 578}
552 579
553sub _draw { 580sub _draw {
554 my ($self) = @_; 581 my ($self) = @_;
555 582
… …
558 585
559sub DESTROY { 586sub DESTROY {
560 my ($self) = @_; 587 my ($self) = @_;
561 588
562 delete $WIDGET{$self+0}; 589 delete $WIDGET{$self+0};
563 #$self->deactivate; 590
591 eval { $self->destroy };
592 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
564} 593}
565 594
566############################################################################# 595#############################################################################
567 596
568package CFClient::UI::DrawBG; 597package CFClient::UI::DrawBG;
… …
593 622
594 if ($color && (@$color < 4 || $color->[3])) { 623 if ($color && (@$color < 4 || $color->[3])) {
595 my ($w, $h) = @$self{qw(w h)}; 624 my ($w, $h) = @$self{qw(w h)};
596 625
597 glEnable GL_BLEND; 626 glEnable GL_BLEND;
598 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 627 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
599 glColor @$color; 628 glColor_premultiply @$color;
600 629
601 glBegin GL_QUADS; 630 glBegin GL_QUADS;
602 glVertex 0 , 0; 631 glVertex 0 , 0;
603 glVertex 0 , $h; 632 glVertex 0 , $h;
604 glVertex $w, $h; 633 glVertex $w, $h;
… …
619 my ($class, %arg) = @_; 648 my ($class, %arg) = @_;
620 $class->SUPER::new (can_events => 0, %arg); 649 $class->SUPER::new (can_events => 0, %arg);
621} 650}
622 651
623sub size_request { 652sub size_request {
624 (0, 0) 653 my ($self) = @_;
654
655 ($self->{w} + 0, $self->{h} + 0)
625} 656}
626 657
627sub draw { } 658sub draw { }
628 659
629############################################################################# 660#############################################################################
… …
633our @ISA = CFClient::UI::Base::; 664our @ISA = CFClient::UI::Base::;
634 665
635sub new { 666sub new {
636 my ($class, %arg) = @_; 667 my ($class, %arg) = @_;
637 668
638 my $children = delete $arg{children} || []; 669 my $children = delete $arg{children};
639 670
640 my $self = $class->SUPER::new ( 671 my $self = $class->SUPER::new (
641 children => [], 672 children => [],
642 can_events => 0, 673 can_events => 0,
643 %arg, 674 %arg,
644 ); 675 );
676
645 $self->add ($_) for @$children; 677 $self->add (@$children)
678 if $children;
646 679
647 $self 680 $self
648} 681}
649 682
650sub add { 683sub add {
… …
698 $x -= $self->{x}; 731 $x -= $self->{x};
699 $y -= $self->{y}; 732 $y -= $self->{y};
700 733
701 my $res; 734 my $res;
702 735
703 for (reverse @{ $self->{children} }) { 736 for (reverse $self->visible_children) {
704 $res = $_->find_widget ($x, $y) 737 $res = $_->find_widget ($x, $y)
705 and return $res; 738 and return $res;
706 } 739 }
707 740
708 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 741 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
729} 762}
730 763
731sub add { 764sub add {
732 my ($self, $child) = @_; 765 my ($self, $child) = @_;
733 766
734 $self->{children} = []; 767 $self->SUPER::remove ($_) for @{ $self->{children} };
735
736 $self->SUPER::add ($child); 768 $self->SUPER::add ($child);
737} 769}
738 770
739sub remove { 771sub remove {
740 my ($self, $widget) = @_; 772 my ($self, $widget) = @_;
… …
749 781
750sub size_request { 782sub size_request {
751 $_[0]{children}[0]->size_request 783 $_[0]{children}[0]->size_request
752} 784}
753 785
754sub size_allocate { 786sub invoke_size_allocate {
755 my ($self, $w, $h, $changed) = @_; 787 my ($self, $w, $h) = @_;
756 788
757 $self->{children}[0]->configure (0, 0, $w, $h); 789 $self->{children}[0]->configure (0, 0, $w, $h);
790
791 1
758} 792}
759 793
760############################################################################# 794#############################################################################
795
796# back-buffered drawing area
761 797
762package CFClient::UI::Window; 798package CFClient::UI::Window;
763 799
764our @ISA = CFClient::UI::Bin::; 800our @ISA = CFClient::UI::Bin::;
765 801
… …
776 812
777 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 813 $ROOT->on_post_alloc ($self => sub { $self->render_child });
778 $self->SUPER::update; 814 $self->SUPER::update;
779} 815}
780 816
781sub size_allocate { 817sub invoke_size_allocate {
782 my ($self, $w, $h, $changed) = @_; 818 my ($self, $w, $h) = @_;
783 819
784 $self->SUPER::size_allocate ($w, $h, $changed);
785 $self->update 820 $self->update;
786 if $changed; 821
822 $self->SUPER::invoke_size_allocate ($w, $h)
787} 823}
788 824
789sub _render { 825sub _render {
826 my ($self) = @_;
827
790 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
791} 829}
792 830
793sub render_child { 831sub render_child {
794 my ($self) = @_; 832 my ($self) = @_;
795 833
796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
798 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
799 837
838 {
839 package CFClient::UI::Base;
840
841 ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h});
843 }
844
800 $self->_render; 845 $self->_render;
801 }; 846 };
802} 847}
803 848
804sub _draw { 849sub _draw {
805 my ($self) = @_; 850 my ($self) = @_;
806 851
807 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
808 853
809 my $tex = $self->{texture} 854 my $tex = $self->{texture}
810 or return; 855 or return;
811 856
812 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 glColor 1, 1, 1, 1; 859 glColor 0, 0, 0, 1;
815 860
816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
817 862
818 glDisable GL_TEXTURE_2D; 863 glDisable GL_TEXTURE_2D;
819} 864}
… …
835} 880}
836 881
837sub size_request { 882sub size_request {
838 my ($self) = @_; 883 my ($self) = @_;
839 884
840 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 886
842 $w = 10 if $self->{scroll_x}; 887 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y}; 888 $h = 10 if $self->{scroll_y};
844 889
845 ($w, $h) 890 ($w, $h)
846} 891}
847 892
848sub size_allocate { 893sub invoke_size_allocate {
849 my ($self, $w, $h, $changed) = @_; 894 my ($self, $w, $h) = @_;
850 895
896 my $child = $self->child;
897
851 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
852 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
853 900
854 $self->child->configure (0, 0, $w, $h); 901 $self->child->configure (0, 0, $w, $h);
855 $self->update; 902 $self->update;
903
904 1
856} 905}
857 906
858sub set_offset { 907sub set_offset {
859 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
860 909
… …
893} 942}
894 943
895sub _render { 944sub _render {
896 my ($self) = @_; 945 my ($self) = @_;
897 946
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
949
898 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
899 951
900 $self->SUPER::_render; 952 $self->SUPER::_render;
901} 953}
902 954
… …
905package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
906 958
907our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
908 960
909sub new { 961sub new {
910 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
911 965
912 my $self; 966 my $self;
913 967
914 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
915 vertical => 1, 969 vertical => 1,
… …
920 ; 974 ;
921 975
922 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
923 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
924 slider => $slider, 978 slider => $slider,
925 @_, 979 %arg,
926 ); 980 );
927 981
928 $self->{vp}->add ($self->{scrolled});
929 $self->add ($self->{vp});
930 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
931 984
932 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
933} 992}
934 993
935sub update { 994sub update {
936 my ($self) = @_; 995 my ($self) = @_;
937 996
… …
940 # todo: overwrite size_allocate of child 999 # todo: overwrite size_allocate of child
941 my $child = $self->{vp}->child; 1000 my $child = $self->{vp}->child;
942 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
943} 1002}
944 1003
945sub size_allocate { 1004sub invoke_size_allocate {
946 my ($self, $w, $h, $changed) = @_; 1005 my ($self, $w, $h) = @_;
947
948 $self->SUPER::size_allocate ($w, $h, $changed);
949 1006
950 my $child = $self->{vp}->child; 1007 my $child = $self->{vp}->child;
951 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009
1010 $self->SUPER::invoke_size_allocate ($w, $h)
952} 1011}
953 1012
954#TODO# update range on size_allocate depending on child 1013#TODO# update range on size_allocate depending on child
955# update viewport offset on scroll 1014# update viewport offset on scroll
956 1015
… …
976 1035
977 if ($self->{bg}) { 1036 if ($self->{bg}) {
978 my ($w, $h) = @$self{qw(w h)}; 1037 my ($w, $h) = @$self{qw(w h)};
979 1038
980 glEnable GL_BLEND; 1039 glEnable GL_BLEND;
981 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1040 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
982 glColor @{ $self->{bg} }; 1041 glColor_premultiply @{ $self->{bg} };
983 1042
984 glBegin GL_QUADS; 1043 glBegin GL_QUADS;
985 glVertex 0 , 0; 1044 glVertex 0 , 0;
986 glVertex 0 , $h; 1045 glVertex 0 , $h;
987 glVertex $w, $h; 1046 glVertex $w, $h;
… …
1000 1059
1001our @ISA = CFClient::UI::Bin::; 1060our @ISA = CFClient::UI::Bin::;
1002 1061
1003use CFClient::OpenGL; 1062use CFClient::OpenGL;
1004 1063
1005my @tex = 1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
1006 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1007 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1008 1071
1009sub new { 1072sub new {
1010 my $class = shift; 1073 my ($class, %arg) = @_;
1011 1074
1012 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
1013 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
1014 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
1015 border => 0.6, 1078 border => 0.6,
1016 is_toplevel => 1,
1017 can_events => 1, 1079 can_events => 1,
1018 @_ 1080 min_w => 16,
1081 min_h => 16,
1082 %arg,
1019 ); 1083 );
1020 1084
1021 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title_widget} = new CFClient::UI::Label
1022 align => 0, 1086 align => 0,
1023 valign => 1, 1087 valign => 1,
1024 text => $self->{title}, 1088 text => $self->{title},
1025 fontsize => $self->{border}; 1089 fontsize => $self->{border},
1090 if exists $self->{title};
1091
1092 if ($self->{has_close_button}) {
1093 $self->{close_button} =
1094 new CFClient::UI::ImageButton
1095 image => 'x1_close.png',
1096 on_activate => sub { $self->hide };
1097
1098 $self->CFClient::UI::Container::add ($self->{close_button});
1099 }
1026 1100
1027 $self 1101 $self
1102}
1103
1104sub add {
1105 my ($self, @widgets) = @_;
1106
1107 $self->SUPER::add (@widgets);
1108 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1109 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1028} 1110}
1029 1111
1030sub border { 1112sub border {
1031 int $_[0]{border} * $::FONTSIZE 1113 int $_[0]{border} * $::FONTSIZE
1032} 1114}
1033 1115
1034sub size_request { 1116sub size_request {
1035 my ($self) = @_; 1117 my ($self) = @_;
1118
1119 $self->{title_widget}->size_request
1120 if $self->{title_widget};
1121
1122 $self->{close_button}->size_request
1123 if $self->{close_button};
1036 1124
1037 my ($w, $h) = $self->SUPER::size_request; 1125 my ($w, $h) = $self->SUPER::size_request;
1038 1126
1039 ( 1127 (
1040 $w + $self->border * 2, 1128 $w + $self->border * 2,
1041 $h + $self->border * 2, 1129 $h + $self->border * 2,
1042 ) 1130 )
1043} 1131}
1044 1132
1045sub size_allocate { 1133sub invoke_size_allocate {
1046 my ($self, $w, $h, $changed) = @_; 1134 my ($self, $w, $h) = @_;
1047 1135
1048 return unless $changed; 1136 if ($self->{title_widget}) {
1137 $self->{title_widget}{w} = $w;
1138 $self->{title_widget}{h} = $h;
1139 $self->{title_widget}->invoke_size_allocate ($w, $h);
1140 }
1049 1141
1142 my $border = $self->border;
1143
1050 $h -= List::Util::max 0, $self->border * 2; 1144 $h -= List::Util::max 0, $border * 2;
1051 $w -= List::Util::max 0, $self->border * 2; 1145 $w -= List::Util::max 0, $border * 2;
1052 1146
1053 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1054 if $self->{title};
1055
1056 $self->child->configure ($self->border, $self->border, $w, $h); 1147 $self->child->configure ($border, $border, $w, $h);
1057}
1058 1148
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button};
1151
1152 1
1153}
1154
1059sub button_down { 1155sub invoke_button_down {
1060 my ($self, $ev, $x, $y) = @_; 1156 my ($self, $ev, $x, $y) = @_;
1061 1157
1062 my ($w, $h) = @$self{qw(w h)}; 1158 my ($w, $h) = @$self{qw(w h)};
1063 my $border = $self->border; 1159 my $border = $self->border;
1064 1160
… …
1077 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
1078 1174
1079 my $dx = $ev->{x} - $ox; 1175 my $dx = $ev->{x} - $ox;
1080 my $dy = $ev->{y} - $oy; 1176 my $dy = $ev->{y} - $oy;
1081 1177
1082 $self->{user_x} = $wx + $dx * $mx;
1083 $self->{user_y} = $wy + $dy * $my;
1084 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1178 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1085 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1179 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1086 $self->move ($self->{user_x}, $self->{user_y}); 1180
1181 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1087 $self->realloc; 1182 $self->realloc;
1088 }; 1183 };
1089 1184
1090 } elsif ($lr ^ $td) { 1185 } elsif ($lr ^ $td) {
1091 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1186 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1094 $self->{motion} = sub { 1189 $self->{motion} = sub {
1095 my ($ev, $x, $y) = @_; 1190 my ($ev, $x, $y) = @_;
1096 1191
1097 ($x, $y) = ($ev->{x}, $ev->{y}); 1192 ($x, $y) = ($ev->{x}, $ev->{y});
1098 1193
1099 $self->{user_x} = $bx + $x - $ox; 1194 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1100 $self->{user_y} = $by + $y - $oy; 1195 # HACK: the next line is required to enforce placement
1101 1196 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1102 $self->move ($self->{user_x}, $self->{user_y});
1103 $self->realloc;
1104 }; 1197 };
1198 } else {
1199 return 0;
1200 }
1201
1105 } 1202 1
1106} 1203}
1107 1204
1108sub button_up { 1205sub invoke_button_up {
1109 my ($self, $ev, $x, $y) = @_; 1206 my ($self, $ev, $x, $y) = @_;
1110 1207
1111 delete $self->{motion}; 1208 ! ! delete $self->{motion}
1112} 1209}
1113 1210
1114sub mouse_motion { 1211sub invoke_mouse_motion {
1115 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1116 1213
1117 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1214 $self->{motion}->($ev, $x, $y) if $self->{motion};
1215
1216 ! ! $self->{motion}
1118} 1217}
1119 1218
1120sub _draw { 1219sub _draw {
1121 my ($self) = @_; 1220 my ($self) = @_;
1122 1221
1222 my $child = $self->{children}[0];
1223
1123 my ($w, $h ) = ($self->{w}, $self->{h}); 1224 my ($w, $h ) = ($self->{w}, $self->{h});
1124 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1225 my ($cw, $ch) = ($child->{w}, $child->{h});
1125 1226
1126 glEnable GL_TEXTURE_2D; 1227 glEnable GL_TEXTURE_2D;
1127 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1128 1229
1129 my $border = $self->border; 1230 my $border = $self->border;
1130 1231
1131 glColor @{ $self->{border_bg} }; 1232 glColor @{ $self->{border_bg} };
1132 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1233 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1133 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1234 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1134 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1235 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1135 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1236 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1136 1237
1137 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1238 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1138 my $bg = $tex[0]; 1239 glColor @{ $self->{bg} };
1139 1240
1140 # TODO: repeat texture not scale 1241 # TODO: repeat texture not scale
1242 # solve this better(?)
1141 my $rep_x = $cw / $bg->{w}; 1243 $bg->{s} = $cw / $bg->{w};
1142 my $rep_y = $ch / $bg->{h}; 1244 $bg->{t} = $ch / $bg->{h};
1143
1144 glColor @{ $self->{bg} };
1145
1146 $bg->{s} = $rep_x;
1147 $bg->{t} = $rep_y;
1148 $bg->{wrap_mode} = 1;
1149 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1245 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1150 } 1246 }
1151 1247
1152 glDisable GL_TEXTURE_2D; 1248 glDisable GL_TEXTURE_2D;
1153 1249
1154 $self->{title}->draw if $self->{title};
1155
1156 $self->child->draw; 1250 $child->draw;
1251
1252 if ($self->{title_widget}) {
1253 glTranslate 0, $border - $self->{h};
1254 $self->{title_widget}->_draw;
1255
1256 glTranslate 0, - ($border - $self->{h});
1257 }
1258
1259 $self->{close_button}->draw
1260 if $self->{close_button};
1157} 1261}
1158 1262
1159############################################################################# 1263#############################################################################
1160 1264
1161package CFClient::UI::Table; 1265package CFClient::UI::Table;
… …
1184 1288
1185 $child->set_parent ($self); 1289 $child->set_parent ($self);
1186 $self->{children}[$y][$x] = $child; 1290 $self->{children}[$y][$x] = $child;
1187 1291
1188 $self->realloc; 1292 $self->realloc;
1293}
1294
1295sub remove {
1296 my ($self, $child) = @_;
1297
1298 # TODO: not yet implemented
1189} 1299}
1190 1300
1191# TODO: move to container class maybe? send children a signal on removal? 1301# TODO: move to container class maybe? send children a signal on removal?
1192sub clear { 1302sub clear {
1193 my ($self) = @_; 1303 my ($self) = @_;
… …
1234 (sum @$ws), 1344 (sum @$ws),
1235 (sum @$hs), 1345 (sum @$hs),
1236 ) 1346 )
1237} 1347}
1238 1348
1239sub size_allocate { 1349sub invoke_size_allocate {
1240 my ($self, $w, $h, $changed) = @_; 1350 my ($self, $w, $h) = @_;
1241 1351
1242 my ($ws, $hs) = $self->get_wh; 1352 my ($ws, $hs) = $self->get_wh;
1243 1353
1244 my $req_w = (sum @$ws) || 1; 1354 my $req_w = (sum @$ws) || 1;
1245 my $req_h = (sum @$hs) || 1; 1355 my $req_h = (sum @$hs) || 1;
… …
1276 } 1386 }
1277 1387
1278 $y += $row_h; 1388 $y += $row_h;
1279 } 1389 }
1280 1390
1391 1
1281} 1392}
1282 1393
1283sub find_widget { 1394sub find_widget {
1284 my ($self, $x, $y) = @_; 1395 my ($self, $x, $y) = @_;
1285 1396
… …
1322 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1433 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1323 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1434 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1324 ) 1435 )
1325} 1436}
1326 1437
1327sub size_allocate { 1438sub invoke_size_allocate {
1328 my ($self, $w, $h, $changed) = @_; 1439 my ($self, $w, $h) = @_;
1329 1440
1330 my $space = $self->{vertical} ? $h : $w; 1441 my $space = $self->{vertical} ? $h : $w;
1331 my $children = $self->{children}; 1442 my $children = $self->{children};
1332 1443
1333 my @req; 1444 my @req;
… …
1416 ellipsise => 3, # end 1527 ellipsise => 3, # end
1417 layout => (new CFClient::Layout), 1528 layout => (new CFClient::Layout),
1418 fontsize => 1, 1529 fontsize => 1,
1419 align => -1, 1530 align => -1,
1420 valign => -1, 1531 valign => -1,
1421 padding => 2, 1532 padding_x => 2,
1533 padding_y => 2,
1422 can_events => 0, 1534 can_events => 0,
1423 %arg 1535 %arg
1424 ); 1536 );
1425 1537
1426 if (exists $self->{template}) { 1538 if (exists $self->{template}) {
… …
1453 1565
1454 delete $self->{texture}; 1566 delete $self->{texture};
1455 $self->SUPER::update; 1567 $self->SUPER::update;
1456} 1568}
1457 1569
1570sub realloc {
1571 my ($self) = @_;
1572
1573 delete $self->{ox};
1574 $self->SUPER::realloc;
1575}
1576
1458sub set_text { 1577sub set_text {
1459 my ($self, $text) = @_; 1578 my ($self, $text) = @_;
1460 1579
1461 return if $self->{text} eq "T$text"; 1580 return if $self->{text} eq "T$text";
1462 $self->{text} = "T$text"; 1581 $self->{text} = "T$text";
1463 1582
1464 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1465 $self->{layout}->set_text ($text); 1584 $self->{layout}->set_text ($text);
1466 1585
1586 delete $self->{size_req};
1467 $self->realloc; 1587 $self->realloc;
1468 $self->update; 1588 $self->update;
1469} 1589}
1470 1590
1471sub set_markup { 1591sub set_markup {
… …
1477 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1597 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1478 1598
1479 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1599 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1480 $self->{layout}->set_markup ($markup); 1600 $self->{layout}->set_markup ($markup);
1481 1601
1602 delete $self->{size_req};
1482 $self->realloc; 1603 $self->realloc;
1483 $self->update; 1604 $self->update;
1484} 1605}
1485 1606
1486sub size_request { 1607sub size_request {
1487 my ($self) = @_; 1608 my ($self) = @_;
1488 1609
1610 $self->{size_req} ||= do {
1489 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1611 $self->{layout}->set_font ($self->{font}) if $self->{font};
1490 $self->{layout}->set_width ($self->{max_w} || -1); 1612 $self->{layout}->set_width ($self->{max_w} || -1);
1491 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1613 $self->{layout}->set_ellipsise ($self->{ellipsise});
1492 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1614 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1493 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1494 1616
1495 my ($w, $h) = $self->{layout}->size; 1617 my ($w, $h) = $self->{layout}->size;
1496 1618
1497 if (exists $self->{template}) { 1619 if (exists $self->{template}) {
1498 $self->{template}->set_font ($self->{font}) if $self->{font}; 1620 $self->{template}->set_font ($self->{font}) if $self->{font};
1499 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1500 1622
1501 my ($w2, $h2) = $self->{template}->size; 1623 my ($w2, $h2) = $self->{template}->size;
1502 1624
1503 $w = List::Util::max $w, $w2; 1625 $w = List::Util::max $w, $w2;
1504 $h = List::Util::max $h, $h2; 1626 $h = List::Util::max $h, $h2;
1627 }
1628
1629 [$w, $h]
1505 } 1630 };
1506 1631
1507 ( 1632 @{ $self->{size_req} }
1508 $w + $self->{padding} * 2,
1509 $h + $self->{padding} * 2,
1510 )
1511} 1633}
1512 1634
1513sub size_allocate { 1635sub invoke_size_allocate {
1514 my ($self, $w, $h, $changed) = @_; 1636 my ($self, $w, $h) = @_;
1637
1638 delete $self->{ox};
1515 1639
1516 delete $self->{texture} 1640 delete $self->{texture}
1517 if $changed; 1641 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1642
1643 1
1518} 1644}
1519 1645
1520sub set_fontsize { 1646sub set_fontsize {
1521 my ($self, $fontsize) = @_; 1647 my ($self, $fontsize) = @_;
1522 1648
1523 $self->{fontsize} = $fontsize; 1649 $self->{fontsize} = $fontsize;
1524 delete $self->{texture}; 1650 delete $self->{texture};
1525 1651
1526 $self->realloc; 1652 $self->realloc;
1653}
1654
1655sub reconfigure {
1656 my ($self) = @_;
1657
1658 delete $self->{size_req};
1659
1660 $self->SUPER::reconfigure;
1527} 1661}
1528 1662
1529sub _draw { 1663sub _draw {
1530 my ($self) = @_; 1664 my ($self) = @_;
1531 1665
… …
1537 $self->{layout}->set_width ($self->{w}); 1671 $self->{layout}->set_width ($self->{w});
1538 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1672 $self->{layout}->set_ellipsise ($self->{ellipsise});
1539 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1540 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1541 1675
1542 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1676 new_from_layout CFClient::Texture $self->{layout}
1677 };
1543 1678
1679 unless (exists $self->{ox}) {
1544 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1545 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1546 : ($self->{w} - $tex->{w}) * 0.5); 1682 : ($self->{w} - $tex->{w}) * 0.5);
1547 1683
1548 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1549 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1550 : ($self->{h} - $tex->{h}) * 0.5); 1686 : ($self->{h} - $tex->{h}) * 0.5);
1551
1552 $tex
1553 }; 1687 };
1554 1688
1555 glEnable GL_TEXTURE_2D; 1689 glEnable GL_TEXTURE_2D;
1556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1690
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1557 1693
1558 if ($tex->{format} == GL_ALPHA) { 1694 if ($tex->{format} == GL_ALPHA) {
1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1559 glColor @{$self->{fg}}; 1696 glColor @{$self->{fg}};
1560 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1697 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1561 } else { 1698 } else {
1699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1562 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1700 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1563 } 1701 }
1564 1702
1565 glDisable GL_TEXTURE_2D; 1703 glDisable GL_TEXTURE_2D;
1566} 1704}
1567 1705
… …
1584 can_hover => 1, 1722 can_hover => 1,
1585 can_focus => 1, 1723 can_focus => 1,
1586 valign => 0, 1724 valign => 0,
1587 can_events => 1, 1725 can_events => 1,
1588 #text => ... 1726 #text => ...
1727 #hidden => "*",
1589 @_ 1728 @_
1590 ) 1729 )
1591} 1730}
1592 1731
1593sub _set_text { 1732sub _set_text {
… …
1595 1734
1596 delete $self->{cur_h}; 1735 delete $self->{cur_h};
1597 1736
1598 return if $self->{text} eq $text; 1737 return if $self->{text} eq $text;
1599 1738
1600 delete $self->{texture};
1601
1602 $self->{last_activity} = $::NOW; 1739 $self->{last_activity} = $::NOW;
1603 $self->{text} = $text; 1740 $self->{text} = $text;
1604 1741
1605 $text =~ s/./*/g if $self->{hidden}; 1742 $text =~ s/./*/g if $self->{hidden};
1606 $self->{layout}->set_text ("$text "); 1743 $self->{layout}->set_text ("$text ");
1744 delete $self->{size_req};
1607 1745
1608 $self->_emit (changed => $self->{text}); 1746 $self->emit (changed => $self->{text});
1747
1748 $self->realloc;
1749 $self->update;
1609} 1750}
1610 1751
1611sub set_text { 1752sub set_text {
1612 my ($self, $text) = @_; 1753 my ($self, $text) = @_;
1613 1754
1614 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1615 $self->_set_text ($text); 1756 $self->_set_text ($text);
1616
1617 $self->realloc;
1618} 1757}
1619 1758
1620sub get_text { 1759sub get_text {
1621 $_[0]{text} 1760 $_[0]{text}
1622} 1761}
… …
1627 my ($w, $h) = $self->SUPER::size_request; 1766 my ($w, $h) = $self->SUPER::size_request;
1628 1767
1629 ($w + 1, $h) # add 1 for cursor 1768 ($w + 1, $h) # add 1 for cursor
1630} 1769}
1631 1770
1632sub key_down { 1771sub invoke_key_down {
1633 my ($self, $ev) = @_; 1772 my ($self, $ev) = @_;
1634 1773
1635 my $mod = $ev->{mod}; 1774 my $mod = $ev->{mod};
1636 my $sym = $ev->{sym}; 1775 my $sym = $ev->{sym};
1637 my $uni = $ev->{unicode}; 1776 my $uni = $ev->{unicode};
… …
1649 } elsif ($sym == CFClient::SDLK_HOME) { 1788 } elsif ($sym == CFClient::SDLK_HOME) {
1650 $self->{cursor} = 0; 1789 $self->{cursor} = 0;
1651 } elsif ($sym == CFClient::SDLK_END) { 1790 } elsif ($sym == CFClient::SDLK_END) {
1652 $self->{cursor} = length $text; 1791 $self->{cursor} = length $text;
1653 } elsif ($uni == 27) { 1792 } elsif ($uni == 27) {
1654 $self->_emit ('escape'); 1793 $self->emit ('escape');
1655 } elsif ($uni) { 1794 } elsif ($uni) {
1656 substr $text, $self->{cursor}++, 0, chr $uni; 1795 substr $text, $self->{cursor}++, 0, chr $uni;
1796 } else {
1797 return 0;
1657 } 1798 }
1658 1799
1659 $self->_set_text ($text); 1800 $self->_set_text ($text);
1660 1801
1661 $self->realloc; 1802 $self->realloc;
1662}
1663 1803
1804 1
1805}
1806
1664sub focus_in { 1807sub invoke_focus_in {
1665 my ($self) = @_; 1808 my ($self) = @_;
1666 1809
1667 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1668 1811
1669 $self->SUPER::focus_in; 1812 $self->SUPER::invoke_focus_in
1670} 1813}
1671 1814
1672sub button_down { 1815sub invoke_button_down {
1673 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1674 1817
1675 $self->SUPER::button_down ($ev, $x, $y); 1818 $self->SUPER::invoke_button_down ($ev, $x, $y);
1676 1819
1677 my $idx = $self->{layout}->xy_to_index ($x, $y); 1820 my $idx = $self->{layout}->xy_to_index ($x, $y);
1678 1821
1679 # byte-index to char-index 1822 # byte-index to char-index
1680 my $text = $self->{text}; 1823 my $text = $self->{text};
1681 utf8::encode $text; 1824 utf8::encode $text;
1682 $self->{cursor} = length substr $text, 0, $idx; 1825 $self->{cursor} = length substr $text, 0, $idx;
1683 1826
1684 $self->_set_text ($self->{text}); 1827 $self->_set_text ($self->{text});
1685 $self->update; 1828 $self->update;
1829
1830 1
1686} 1831}
1687 1832
1688sub mouse_motion { 1833sub invoke_mouse_motion {
1689 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1690# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1835# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1836
1837 1
1691} 1838}
1692 1839
1693sub _draw { 1840sub _draw {
1694 my ($self) = @_; 1841 my ($self) = @_;
1695 1842
1696 local $self->{fg} = $self->{fg}; 1843 local $self->{fg} = $self->{fg};
1697 1844
1698 if ($FOCUS == $self) { 1845 if ($FOCUS == $self) {
1699 glColor @{$self->{active_bg}}; 1846 glColor_premultiply @{$self->{active_bg}};
1700 $self->{fg} = $self->{active_fg}; 1847 $self->{fg} = $self->{active_fg};
1701 } else { 1848 } else {
1702 glColor @{$self->{bg}}; 1849 glColor_premultiply @{$self->{bg}};
1703 } 1850 }
1704 1851
1705 glEnable GL_BLEND; 1852 glEnable GL_BLEND;
1706 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1853 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1707 glBegin GL_QUADS; 1854 glBegin GL_QUADS;
1708 glVertex 0 , 0; 1855 glVertex 0 , 0;
1709 glVertex 0 , $self->{h}; 1856 glVertex 0 , $self->{h};
1710 glVertex $self->{w}, $self->{h}; 1857 glVertex $self->{w}, $self->{h};
1711 glVertex $self->{w}, 0; 1858 glVertex $self->{w}, 0;
… …
1736 1883
1737our @ISA = CFClient::UI::EntryBase::; 1884our @ISA = CFClient::UI::EntryBase::;
1738 1885
1739use CFClient::OpenGL; 1886use CFClient::OpenGL;
1740 1887
1741sub key_down { 1888sub invoke_key_down {
1742 my ($self, $ev) = @_; 1889 my ($self, $ev) = @_;
1743 1890
1744 my $sym = $ev->{sym}; 1891 my $sym = $ev->{sym};
1745 1892
1746 if ($sym == 13) { 1893 if ($sym == 13) {
1747 unshift @{$self->{history}}, 1894 unshift @{$self->{history}},
1748 my $txt = $self->get_text; 1895 my $txt = $self->get_text;
1896
1749 $self->{history_pointer} = -1; 1897 $self->{history_pointer} = -1;
1750 $self->{history_saveback} = ''; 1898 $self->{history_saveback} = '';
1751 $self->_emit (activate => $txt); 1899 $self->emit (activate => $txt);
1752 $self->update; 1900 $self->update;
1753 1901
1754 } elsif ($sym == CFClient::SDLK_UP) { 1902 } elsif ($sym == CFClient::SDLK_UP) {
1755 if ($self->{history_pointer} < 0) { 1903 if ($self->{history_pointer} < 0) {
1756 $self->{history_saveback} = $self->get_text; 1904 $self->{history_saveback} = $self->get_text;
… …
1772 } else { 1920 } else {
1773 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1774 } 1922 }
1775 1923
1776 } else { 1924 } else {
1777 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::invoke_key_down ($ev)
1926 }
1927
1778 } 1928 1
1779
1780} 1929}
1781 1930
1782############################################################################# 1931#############################################################################
1783 1932
1784package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1793 1942
1794sub new { 1943sub new {
1795 my $class = shift; 1944 my $class = shift;
1796 1945
1797 $class->SUPER::new ( 1946 $class->SUPER::new (
1798 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1799 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1800 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1801 can_hover => 1, 1951 can_hover => 1,
1802 align => 0, 1952 align => 0,
1803 valign => 0, 1953 valign => 0,
1804 can_events => 1, 1954 can_events => 1,
1805 @_ 1955 @_
1806 ) 1956 )
1807} 1957}
1808 1958
1809sub activate { }
1810
1811sub button_up { 1959sub invoke_button_up {
1812 my ($self, $ev, $x, $y) = @_; 1960 my ($self, $ev, $x, $y) = @_;
1813 1961
1814 $self->emit ("activate") 1962 $self->emit ("activate")
1815 if $x >= 0 && $x < $self->{w} 1963 if $x >= 0 && $x < $self->{w}
1816 && $y >= 0 && $y < $self->{h}; 1964 && $y >= 0 && $y < $self->{h};
1965
1966 1
1817} 1967}
1818 1968
1819sub _draw { 1969sub _draw {
1820 my ($self) = @_; 1970 my ($self) = @_;
1821 1971
1822 local $self->{fg} = $self->{fg}; 1972 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1823
1824 if ($GRAB == $self) {
1825 $self->{fg} = $self->{active_fg};
1826 }
1827 1973
1828 glEnable GL_TEXTURE_2D; 1974 glEnable GL_TEXTURE_2D;
1829 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1975 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1830 glColor 0, 0, 0, 1; 1976 glColor 0, 0, 0, 1;
1831 1977
… …
1836 $self->SUPER::_draw; 1982 $self->SUPER::_draw;
1837} 1983}
1838 1984
1839############################################################################# 1985#############################################################################
1840 1986
1987package CFClient::UI::ImageButton;
1988
1989our @ISA = CFClient::UI::Image::;
1990
1991use CFClient::OpenGL;
1992
1993my %textures;
1994
1995sub new {
1996 my $class = shift;
1997
1998 my $self = $class->SUPER::new (
1999 padding_x => 4,
2000 padding_y => 4,
2001 fg => [1, 1, 1],
2002 active_fg => [0, 0, 1],
2003 can_hover => 1,
2004 align => 0,
2005 valign => 0,
2006 can_events => 1,
2007 @_
2008 );
2009}
2010
2011sub invoke_button_up {
2012 my ($self, $ev, $x, $y) = @_;
2013
2014 $self->emit ("activate")
2015 if $x >= 0 && $x < $self->{w}
2016 && $y >= 0 && $y < $self->{h};
2017
2018 1
2019}
2020
2021#############################################################################
2022
1841package CFClient::UI::CheckBox; 2023package CFClient::UI::CheckBox;
1842 2024
1843our @ISA = CFClient::UI::DrawBG::; 2025our @ISA = CFClient::UI::DrawBG::;
1844 2026
1845my @tex = 2027my @tex =
… …
1850 2032
1851sub new { 2033sub new {
1852 my $class = shift; 2034 my $class = shift;
1853 2035
1854 $class->SUPER::new ( 2036 $class->SUPER::new (
1855 padding => 2, 2037 padding_x => 2,
2038 padding_y => 2,
1856 fg => [1, 1, 1], 2039 fg => [1, 1, 1],
1857 active_fg => [1, 1, 0], 2040 active_fg => [1, 1, 0],
1858 bg => [0, 0, 0, 0.2], 2041 bg => [0, 0, 0, 0.2],
1859 active_bg => [1, 1, 1, 0.5], 2042 active_bg => [1, 1, 1, 0.5],
1860 state => 0, 2043 state => 0,
… …
1864} 2047}
1865 2048
1866sub size_request { 2049sub size_request {
1867 my ($self) = @_; 2050 my ($self) = @_;
1868 2051
1869 ($self->{padding} * 2 + 6) x 2 2052 (6) x 2
1870} 2053}
1871 2054
1872sub button_down { 2055sub invoke_button_down {
1873 my ($self, $ev, $x, $y) = @_; 2056 my ($self, $ev, $x, $y) = @_;
1874 2057
1875 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2058 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1876 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2059 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1877 $self->{state} = !$self->{state}; 2060 $self->{state} = !$self->{state};
1878 $self->_emit (changed => $self->{state}); 2061 $self->emit (changed => $self->{state});
2062 } else {
2063 return 0
2064 }
2065
1879 } 2066 1
1880} 2067}
1881 2068
1882sub _draw { 2069sub _draw {
1883 my ($self) = @_; 2070 my ($self) = @_;
1884 2071
1885 $self->SUPER::_draw; 2072 $self->SUPER::_draw;
1886 2073
1887 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2074 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1888 2075
1889 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2076 my ($w, $h) = @$self{qw(w h)};
2077
2078 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1890 2079
1891 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2080 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1892 2081
1893 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2082 my $tex = $self->{state} ? $tex[1] : $tex[0];
1894 2083
… …
2049 2238
2050 my $h1 = $self->{h} * (1 - $ycut1); 2239 my $h1 = $self->{h} * (1 - $ycut1);
2051 my $h2 = $self->{h} * (1 - $ycut2); 2240 my $h2 = $self->{h} * (1 - $ycut2);
2052 2241
2053 glEnable GL_BLEND; 2242 glEnable GL_BLEND;
2054 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2243 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2244 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2055 glEnable GL_TEXTURE_2D; 2245 glEnable GL_TEXTURE_2D;
2056 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2246 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2057 2247
2058 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2248 glBindTexture GL_TEXTURE_2D, $t1->{name};
2059 glBegin GL_QUADS; 2249 glBegin GL_QUADS;
… …
2159 fg => [1, 1, 1], 2349 fg => [1, 1, 1],
2160 active_fg => [0, 0, 0], 2350 active_fg => [0, 0, 0],
2161 bg => [0, 0, 0, 0.2], 2351 bg => [0, 0, 0, 0.2],
2162 active_bg => [1, 1, 1, 0.5], 2352 active_bg => [1, 1, 1, 0.5],
2163 range => [0, 0, 100, 10, 0], 2353 range => [0, 0, 100, 10, 0],
2164 req_w => $::WIDTH / 80, 2354 min_w => $::WIDTH / 80,
2165 req_h => $::WIDTH / 80, 2355 min_h => $::WIDTH / 80,
2166 vertical => 0, 2356 vertical => 0,
2167 can_hover => 1, 2357 can_hover => 1,
2168 inner_pad => 0.02, 2358 inner_pad => 0.02,
2169 @_ 2359 @_
2170 ); 2360 );
… …
2173 $self->update; 2363 $self->update;
2174 2364
2175 $self 2365 $self
2176} 2366}
2177 2367
2178sub changed { }
2179
2180sub set_range { 2368sub set_range {
2181 my ($self, $range) = @_; 2369 my ($self, $range) = @_;
2182 2370
2183 ($range, $self->{range}) = ($self->{range}, $range); 2371 ($range, $self->{range}) = ($self->{range}, $range);
2184 2372
2185 $self->update
2186 if "@$range" ne "@{$self->{range}}"; 2373 if ("@$range" ne "@{$self->{range}}") {
2374 $self->update;
2375 $self->set_value ($self->{range}[0]);
2376 }
2187} 2377}
2188 2378
2189sub set_value { 2379sub set_value {
2190 my ($self, $value) = @_; 2380 my ($self, $value) = @_;
2191 2381
… …
2202 if $unit; 2392 if $unit;
2203 2393
2204 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2394 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2205 2395
2206 if ($value != $old_value) { 2396 if ($value != $old_value) {
2207 $self->_emit (changed => $value); 2397 $self->emit (changed => $value);
2208 $self->update; 2398 $self->update;
2209 } 2399 }
2210} 2400}
2211 2401
2212sub size_request { 2402sub size_request {
2213 my ($self) = @_; 2403 my ($self) = @_;
2214 2404
2215 my $w = $self->{req_w}; 2405 ($self->{req_w}, $self->{req_h})
2216 my $h = $self->{req_h};
2217
2218 $self->{vertical} ? ($h, $w) : ($w, $h)
2219} 2406}
2220 2407
2221sub button_down { 2408sub invoke_button_down {
2222 my ($self, $ev, $x, $y) = @_; 2409 my ($self, $ev, $x, $y) = @_;
2223 2410
2224 $self->SUPER::button_down ($ev, $x, $y); 2411 $self->SUPER::invoke_button_down ($ev, $x, $y);
2225 2412
2226 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2413 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227 2414
2228 $self->mouse_motion ($ev, $x, $y); 2415 $self->invoke_mouse_motion ($ev, $x, $y)
2229} 2416}
2230 2417
2231sub mouse_motion { 2418sub invoke_mouse_motion {
2232 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2233 2420
2234 if ($GRAB == $self) { 2421 if ($GRAB == $self) {
2235 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2422 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2236 2423
2237 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2424 my (undef, $lo, $hi, $page) = @{$self->{range}};
2238 2425
2239 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2426 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240 2427
2241 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2428 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2429 } else {
2430 return 0;
2431 }
2432
2242 } 2433 1
2243} 2434}
2244 2435
2245sub update { 2436sub update {
2246 my ($self) = @_; 2437 my ($self) = @_;
2247 2438
2248 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2439 delete $self->{knob_w};
2440 $self->SUPER::update;
2441}
2442
2443sub _draw {
2444 my ($self) = @_;
2445
2446 unless ($self->{knob_w}) {
2249 $self->set_value ($self->{range}[0]); 2447 $self->set_value ($self->{range}[0]);
2250 2448
2251 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2449 my ($value, $lo, $hi, $page) = @{$self->{range}};
2252 my $range = ($hi - $page - $lo) || 1e-100; 2450 my $range = ($hi - $page - $lo) || 1e-100;
2253 2451
… …
2259 $value = ($value - $lo) / $range; 2457 $value = ($value - $lo) / $range;
2260 $value = $value * $self->{scale} + $self->{offset}; 2458 $value = $value * $self->{scale} + $self->{offset};
2261 2459
2262 $self->{knob_x} = $value - $knob_w * 0.5; 2460 $self->{knob_x} = $value - $knob_w * 0.5;
2263 $self->{knob_w} = $knob_w; 2461 $self->{knob_w} = $knob_w;
2264 }); 2462 }
2265
2266 $self->SUPER::update;
2267}
2268
2269sub _draw {
2270 my ($self) = @_;
2271 2463
2272 $self->SUPER::_draw (); 2464 $self->SUPER::_draw ();
2273 2465
2274 glScale $self->{w}, $self->{h}; 2466 glScale $self->{w}, $self->{h};
2275 2467
… …
2336sub set_range { shift->{slider}->set_range (@_) } 2528sub set_range { shift->{slider}->set_range (@_) }
2337sub set_value { shift->{slider}->set_value (@_) } 2529sub set_value { shift->{slider}->set_value (@_) }
2338 2530
2339############################################################################# 2531#############################################################################
2340 2532
2341package CFClient::UI::TextView; 2533package CFClient::UI::TextScroller;
2342 2534
2343our @ISA = CFClient::UI::HBox::; 2535our @ISA = CFClient::UI::HBox::;
2344 2536
2345use CFClient::OpenGL; 2537use CFClient::OpenGL;
2346 2538
… …
2348 my $class = shift; 2540 my $class = shift;
2349 2541
2350 my $self = $class->SUPER::new ( 2542 my $self = $class->SUPER::new (
2351 fontsize => 1, 2543 fontsize => 1,
2352 can_events => 0, 2544 can_events => 0,
2545 indent => 0,
2353 #font => default_font 2546 #font => default_font
2354 @_, 2547 @_,
2355 2548
2356 layout => (new CFClient::Layout 1), 2549 layout => (new CFClient::Layout 1),
2357 par => [], 2550 par => [],
… …
2372 2565
2373 $self->{fontsize} = $fontsize; 2566 $self->{fontsize} = $fontsize;
2374 $self->reflow; 2567 $self->reflow;
2375} 2568}
2376 2569
2377sub size_allocate { 2570sub invoke_size_allocate {
2378 my ($self, $w, $h, $changed) = @_; 2571 my ($self, $w, $h) = @_;
2379
2380 $self->SUPER::size_allocate ($w, $h, $changed);
2381
2382 return unless $changed;
2383 2572
2384 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2573 $self->{layout}->set_font ($self->{font}) if $self->{font};
2385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2574 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2386 $self->{layout}->set_width ($self->{children}[0]{w}); 2575 $self->{layout}->set_width ($self->{children}[0]{w});
2576 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2387 2577
2388 $self->reflow; 2578 $self->reflow;
2579
2580 $self->SUPER::invoke_size_allocate ($w, $h)
2389} 2581}
2390 2582
2391sub text_size { 2583sub text_size {
2392 my ($self, $text, $indent) = @_; 2584 my ($self, $text, $indent) = @_;
2393 2585
2394 my $layout = $self->{layout}; 2586 my $layout = $self->{layout};
2395 2587
2396 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2588 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2397 $layout->set_width ($self->{children}[0]{w} - $indent); 2589 $layout->set_width ($self->{children}[0]{w} - $indent);
2590 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2398 $layout->set_markup ($text); 2591 $layout->set_markup ($text);
2399 2592
2400 $layout->size 2593 $layout->size
2401} 2594}
2402 2595
… …
2441 2634
2442 return unless $self->{h} > 0; 2635 return unless $self->{h} > 0;
2443 2636
2444 delete $self->{texture}; 2637 delete $self->{texture};
2445 2638
2446 $ROOT->on_post_alloc ($self, sub { 2639 $ROOT->on_post_alloc ($self => sub {
2447 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2640 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2448 2641
2449 if (delete $self->{need_reflow}) { 2642 if (delete $self->{need_reflow}) {
2450 my $height = 0; 2643 my $height = 0;
2451 2644
… …
2454 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2647 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2455 2648
2456 for (@{$self->{par}}) { 2649 for (@{$self->{par}}) {
2457 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2650 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2458 $layout->set_width ($W - $_->[3]); 2651 $layout->set_width ($W - $_->[3]);
2652 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2459 $layout->set_markup ($_->[4]); 2653 $layout->set_markup ($_->[4]);
2460 my ($w, $h) = $layout->size; 2654 my ($w, $h) = $layout->size;
2461 $_->[0] = $w + $_->[3]; 2655 $_->[0] = $w + $_->[3];
2462 $_->[1] = $h; 2656 $_->[1] = $h;
2463 } 2657 }
… …
2466 } 2660 }
2467 2661
2468 $self->{height} = $height; 2662 $self->{height} = $height;
2469 2663
2470 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2664 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2471 2665
2472 delete $self->{texture}; 2666 delete $self->{texture};
2473 } 2667 }
2474 2668
2475 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2669 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2476 glClearColor 0.5, 0.5, 0.5, 0; 2670 glClearColor 0, 0, 0, 0;
2477 glClear GL_COLOR_BUFFER_BIT; 2671 glClear GL_COLOR_BUFFER_BIT;
2478 2672
2479 my $top = int $self->{children}[1]{range}[0]; 2673 my $top = int $self->{children}[1]{range}[0];
2480 2674
2481 my $y0 = $top; 2675 my $y0 = $top;
… …
2495 my $h = $par->[1]; 2689 my $h = $par->[1];
2496 2690
2497 if ($y0 < $y + $h && $y < $y1) { 2691 if ($y0 < $y + $h && $y < $y1) {
2498 $layout->set_foreground (@{ $par->[2] }); 2692 $layout->set_foreground (@{ $par->[2] });
2499 $layout->set_width ($W - $par->[3]); 2693 $layout->set_width ($W - $par->[3]);
2694 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2500 $layout->set_markup ($par->[4]); 2695 $layout->set_markup ($par->[4]);
2501 2696
2502 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2697 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2503 2698
2504 glRasterPos $par->[3], $y - $y0; 2699 glRasterPos $par->[3], $y - $y0;
… …
2516sub _draw { 2711sub _draw {
2517 my ($self) = @_; 2712 my ($self) = @_;
2518 2713
2519 glEnable GL_TEXTURE_2D; 2714 glEnable GL_TEXTURE_2D;
2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521 glColor 1, 1, 1, 1; 2716 glColor 0, 0, 0, 1;
2522 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2717 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2523 glDisable GL_TEXTURE_2D; 2718 glDisable GL_TEXTURE_2D;
2524 2719
2525 $self->{children}[1]->draw; 2720 $self->{children}[1]->draw;
2526 2721
2527} 2722}
… …
2610} 2805}
2611 2806
2612sub set_tooltip_from { 2807sub set_tooltip_from {
2613 my ($self, $widget) = @_; 2808 my ($self, $widget) = @_;
2614 2809
2810 my $tooltip = $widget->{tooltip};
2811
2812 if ($ENV{CFPLUS_DEBUG} & 2) {
2813 $tooltip .= "\n\n" . (ref $widget) . "\n"
2814 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2815 . "req $widget->{req_w} $widget->{req_h}\n"
2816 . "visible $widget->{visible}";
2817 }
2818
2819 $tooltip =~ s/^\n+//;
2820 $tooltip =~ s/\n+$//;
2821
2615 $self->add (new CFClient::UI::Label 2822 $self->add (new CFClient::UI::Label
2616 markup => $widget->{tooltip}, 2823 markup => $tooltip,
2617 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2824 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2618 fontsize => 0.8, 2825 fontsize => 0.8,
2619 fg => [0, 0, 0, 1], 2826 fg => [0, 0, 0, 1],
2620 ellipsise => 0, 2827 ellipsise => 0,
2621 font => ($widget->{tooltip_font} || $::FONT_PROP), 2828 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2628 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2835 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2629 2836
2630 ($w + 4, $h + 4) 2837 ($w + 4, $h + 4)
2631} 2838}
2632 2839
2633sub size_allocate { 2840sub invoke_size_allocate {
2634 my ($self, $w, $h, $changed) = @_; 2841 my ($self, $w, $h) = @_;
2635 2842
2636 return unless $changed;
2637
2638 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2843 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2639} 2844}
2640 2845
2641sub visibility_change { 2846sub invoke_visibility_change {
2642 my ($self, $visible) = @_; 2847 my ($self, $visible) = @_;
2643 2848
2644 return unless $visible; 2849 return unless $visible;
2645 2850
2646 $self->{root}->on_post_alloc ("move_$self" => sub { 2851 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2648 or return; 2853 or return;
2649 2854
2650 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2855 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2651 2856
2652 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2857 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2653 if $x + $self->{w} > $::WIDTH; 2858 if $x + $self->{w} > $self->{root}{w};
2654 2859
2655 $self->move ($x, $y); 2860 $self->move_abs ($x, $y);
2656 }); 2861 });
2657} 2862}
2658 2863
2659sub _draw { 2864sub _draw {
2660 my ($self) = @_; 2865 my ($self) = @_;
… …
2747 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2952 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2748 2953
2749 if ($tex) { 2954 if ($tex) {
2750 glEnable GL_TEXTURE_2D; 2955 glEnable GL_TEXTURE_2D;
2751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2956 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2752 glColor 1, 1, 1, 1; 2957 glColor 0, 0, 0, 1;
2753 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2958 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2754 glDisable GL_TEXTURE_2D; 2959 glDisable GL_TEXTURE_2D;
2755 } 2960 }
2756} 2961}
2757 2962
2758sub DESTROY { 2963sub destroy {
2759 my ($self) = @_; 2964 my ($self) = @_;
2760 2965
2761 $self->{timer}->cancel 2966 $self->{timer}->cancel
2762 if $self->{timer}; 2967 if $self->{timer};
2763 2968
2764 $self->SUPER::DESTROY; 2969 $self->SUPER::destroy;
2765} 2970}
2766 2971
2767############################################################################# 2972#############################################################################
2768 2973
2769package CFClient::UI::Inventory; 2974package CFClient::UI::Buttonbar;
2770 2975
2771our @ISA = CFClient::UI::ScrolledWindow::; 2976our @ISA = CFClient::UI::HBox::;
2772 2977
2773sub new { 2978# TODO: should actualyl wrap buttons and other goodies.
2774 my $class = shift;
2775
2776 my $self = $class->SUPER::new (
2777 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2778 @_,
2779 );
2780
2781 $self
2782}
2783
2784sub set_items {
2785 my ($self, $items) = @_;
2786
2787 $self->{scrolled}->clear;
2788 return unless $items;
2789
2790 my @items = sort {
2791 ($a->{type} <=> $b->{type})
2792 or ($a->{name} cmp $b->{name})
2793 } @$items;
2794
2795 $self->{real_items} = \@items;
2796
2797 my $row = 0;
2798 for my $item (@items) {
2799 CFClient::Item::update_widgets $item;
2800
2801 $self->{scrolled}->add (0, $row, $item->{face_widget});
2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2804
2805 $row++;
2806 }
2807}
2808 2979
2809############################################################################# 2980#############################################################################
2810 2981
2811package CFClient::UI::Menu; 2982package CFClient::UI::Menu;
2812 2983
… …
2824 ); 2995 );
2825 2996
2826 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2997 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2827 2998
2828 for my $item (@{ $self->{items} }) { 2999 for my $item (@{ $self->{items} }) {
2829 my ($widget, $cb) = @$item; 3000 my ($widget, $cb, $tooltip) = @$item;
2830 3001
2831 # handle various types of items, only text for now 3002 # handle various types of items, only text for now
2832 if (!ref $widget) { 3003 if (!ref $widget) {
2833 $widget = new CFClient::UI::Label 3004 $widget = new CFClient::UI::Label
2834 can_hover => 1, 3005 can_hover => 1,
2835 can_events => 1, 3006 can_events => 1,
2836 text => $widget; 3007 markup => $widget,
3008 tooltip => $tooltip
2837 } 3009 }
2838 3010
2839 $self->{item}{$widget} = $item; 3011 $self->{item}{$widget} = $item;
2840 3012
2841 $self->{vbox}->add ($widget); 3013 $self->{vbox}->add ($widget);
… …
2846 3018
2847# popup given the event (must be a mouse button down event currently) 3019# popup given the event (must be a mouse button down event currently)
2848sub popup { 3020sub popup {
2849 my ($self, $ev) = @_; 3021 my ($self, $ev) = @_;
2850 3022
2851 $self->_emit ("popdown"); 3023 $self->emit ("popdown");
2852 3024
2853 # maybe save $GRAB? must be careful about events... 3025 # maybe save $GRAB? must be careful about events...
2854 $GRAB = $self; 3026 $GRAB = $self;
2855 $self->{button} = $ev->{button}; 3027 $self->{button} = $ev->{button};
2856 3028
2857 $self->show; 3029 $self->show;
2858 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3030 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2859} 3031}
2860 3032
2861sub mouse_motion { 3033sub invoke_mouse_motion {
2862 my ($self, $ev, $x, $y) = @_; 3034 my ($self, $ev, $x, $y) = @_;
2863 3035
2864 # TODO: should use vbox->find_widget or so 3036 # TODO: should use vbox->find_widget or so
2865 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3037 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2866 $self->{hover} = $self->{item}{$HOVER}; 3038 $self->{hover} = $self->{item}{$HOVER};
2867}
2868 3039
3040 0
3041}
3042
2869sub button_up { 3043sub invoke_button_up {
2870 my ($self, $ev, $x, $y) = @_; 3044 my ($self, $ev, $x, $y) = @_;
2871 3045
2872 if ($ev->{button} == $self->{button}) { 3046 if ($ev->{button} == $self->{button}) {
2873 undef $GRAB; 3047 undef $GRAB;
2874 $self->hide; 3048 $self->hide;
2875 3049
2876 $self->_emit ("popdown"); 3050 $self->emit ("popdown");
2877 $self->{hover}[1]->() if $self->{hover}; 3051 $self->{hover}[1]->() if $self->{hover};
3052 } else {
3053 return 0
3054 }
3055
2878 } 3056 1
2879} 3057}
2880 3058
2881############################################################################# 3059#############################################################################
2882 3060
2883package CFClient::UI::Statusbox; 3061package CFClient::UI::Multiplexer;
2884 3062
2885our @ISA = CFClient::UI::VBox::; 3063our @ISA = CFClient::UI::Container::;
2886 3064
2887sub new { 3065sub new {
2888 my $class = shift; 3066 my $class = shift;
2889 3067
2890 $class->SUPER::new ( 3068 my $self = $class->SUPER::new (
3069 @_,
3070 );
3071
3072 $self->{current} = $self->{children}[0]
3073 if @{ $self->{children} };
3074
3075 $self
3076}
3077
3078sub add {
3079 my ($self, @widgets) = @_;
3080
3081 $self->SUPER::add (@widgets);
3082
3083 $self->{current} = $self->{children}[0]
3084 if @{ $self->{children} };
3085}
3086
3087sub set_current_page {
3088 my ($self, $page_or_widget) = @_;
3089
3090 my $widget = ref $page_or_widget
3091 ? $page_or_widget
3092 : $self->{children}[$page_or_widget];
3093
3094 $self->{current} = $widget;
3095 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3096
3097 $self->emit (page_changed => $self->{current});
3098
3099 $self->realloc;
3100}
3101
3102sub visible_children {
3103 $_[0]{current}
3104}
3105
3106sub size_request {
3107 my ($self) = @_;
3108
3109 $self->{current}->size_request
3110}
3111
3112sub invoke_size_allocate {
3113 my ($self, $w, $h) = @_;
3114
3115 $self->{current}->configure (0, 0, $w, $h);
3116
3117 1
3118}
3119
3120sub _draw {
3121 my ($self) = @_;
3122
3123 $self->{current}->draw;
3124}
3125
3126#############################################################################
3127
3128package CFClient::UI::Notebook;
3129
3130our @ISA = CFClient::UI::VBox::;
3131
3132sub new {
3133 my $class = shift;
3134
3135 my $self = $class->SUPER::new (
3136 buttonbar => (new CFClient::UI::Buttonbar),
3137 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3138 # filter => # will be put between multiplexer and $self
3139 @_,
3140 );
3141
3142 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3143 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3144
3145 $self
3146}
3147
3148sub add {
3149 my ($self, $title, $widget, $tooltip) = @_;
3150
3151 Scalar::Util::weaken $self;
3152
3153 $self->{buttonbar}->add (new CFClient::UI::Button
3154 markup => $title,
3155 tooltip => $tooltip,
3156 on_activate => sub { $self->set_current_page ($widget) },
3157 );
3158
3159 $self->{multiplexer}->add ($widget);
3160}
3161
3162sub set_current_page {
3163 my ($self, $page) = @_;
3164
3165 $self->{multiplexer}->set_current_page ($page);
3166 $self->emit (page_changed => $self->{multiplexer}{current});
3167}
3168
3169#############################################################################
3170
3171package CFClient::UI::Combobox;
3172
3173use utf8;
3174
3175our @ISA = CFClient::UI::Button::;
3176
3177sub new {
3178 my $class = shift;
3179
3180 my $self = $class->SUPER::new (
3181 options => [], # [value, title, longdesc], ...
3182 value => undef,
3183 @_,
3184 );
3185
3186 $self->_set_value ($self->{value});
3187
3188 $self
3189}
3190
3191sub invoke_button_down {
3192 my ($self, $ev) = @_;
3193
3194 my @menu_items;
3195
3196 for (@{ $self->{options} }) {
3197 my ($value, $title, $tooltip) = @$_;
3198
3199 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3200 }
3201
3202 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3203}
3204
3205sub _set_value {
3206 my ($self, $value) = @_;
3207
3208 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3209 or return;
3210
3211 $self->{value} = $item->[0];
3212 $self->set_markup ("$item->[1] ⇓");
3213 $self->set_tooltip ($item->[2]);
3214}
3215
3216sub set_value {
3217 my ($self, $value) = @_;
3218
3219 return unless $self->{value} ne $value;
3220
3221 $self->_set_value ($value);
3222 $self->emit (changed => $value);
3223}
3224
3225#############################################################################
3226
3227package CFClient::UI::Statusbox;
3228
3229our @ISA = CFClient::UI::VBox::;
3230
3231sub new {
3232 my $class = shift;
3233
3234 my $self = $class->SUPER::new (
2891 fontsize => 0.8, 3235 fontsize => 0.8,
2892 @_, 3236 @_,
2893 ) 3237 );
3238
3239 Scalar::Util::weaken (my $this = $self);
3240
3241 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3242
3243 $self
2894} 3244}
2895 3245
2896sub reorder { 3246sub reorder {
2897 my ($self) = @_; 3247 my ($self) = @_;
2898 my $NOW = time; 3248 my $NOW = Time::HiRes::time;
3249
3250 # freeze display when hovering over any label
3251 return if $CFClient::UI::TOOLTIP->{owner}
3252 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3253 values %{ $self->{item} };
2899 3254
2900 while (my ($k, $v) = each %{ $self->{item} }) { 3255 while (my ($k, $v) = each %{ $self->{item} }) {
2901 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3256 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2902 } 3257 }
2903 3258
… …
2906 my @items = sort { 3261 my @items = sort {
2907 $a->{pri} <=> $b->{pri} 3262 $a->{pri} <=> $b->{pri}
2908 or $b->{id} <=> $a->{id} 3263 or $b->{id} <=> $a->{id}
2909 } values %{ $self->{item} }; 3264 } values %{ $self->{item} };
2910 3265
3266 $self->{timer}->interval (1);
3267
2911 my $count = 10 + 1; 3268 my $count = 10 + 1;
2912 for my $item (@items) { 3269 for my $item (@items) {
2913 last unless --$count; 3270 last unless --$count;
2914 3271
2915 push @widgets, $item->{label} ||= do { 3272 my $label = $item->{label} ||= do {
2916 # TODO: doesn't handle markup well (read as: at all) 3273 # TODO: doesn't handle markup well (read as: at all)
2917 my $short = $item->{count} > 1 3274 my $short = $item->{count} > 1
2918 ? "<b>$item->{count} ×</b> $item->{text}" 3275 ? "<b>$item->{count} ×</b> $item->{text}"
2919 : $item->{text}; 3276 : $item->{text};
2920 3277
… …
2928 tooltip => $item->{tooltip}, 3285 tooltip => $item->{tooltip},
2929 tooltip_font => $::FONT_PROP, 3286 tooltip_font => $::FONT_PROP,
2930 tooltip_width => 0.67, 3287 tooltip_width => 0.67,
2931 fontsize => $item->{fontsize} || $self->{fontsize}, 3288 fontsize => $item->{fontsize} || $self->{fontsize},
2932 max_w => $::WIDTH * 0.44, 3289 max_w => $::WIDTH * 0.44,
2933 fg => $item->{fg}, 3290 fg => [@{ $item->{fg} }],
2934 can_events => 1, 3291 can_events => 1,
2935 can_hover => 1 3292 can_hover => 1
2936 }; 3293 };
3294
3295 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3296 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3297 $label->update;
3298 $label->set_max_size (undef, $label->{req_h} * $diff)
3299 if $diff < 1;
3300 $self->{timer}->interval (1/30);
3301 } else {
3302 $label->{fg}[3] = $item->{fg}[3] || 1;
3303 }
3304
3305 push @widgets, $label;
2937 } 3306 }
2938 3307
2939 $self->clear; 3308 $self->clear;
2940 $self->SUPER::add (reverse @widgets); 3309 $self->SUPER::add (reverse @widgets);
2941} 3310}
… …
2946 $text =~ s/^\s+//; 3315 $text =~ s/^\s+//;
2947 $text =~ s/\s+$//; 3316 $text =~ s/\s+$//;
2948 3317
2949 return unless $text; 3318 return unless $text;
2950 3319
2951 my $timeout = time + ((delete $arg{timeout}) || 60); 3320 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2952 3321
2953 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3322 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2954 3323
2955 if (my $item = $self->{item}{$group}) { 3324 if (my $item = $self->{item}{$group}) {
2956 if ($item->{text} eq $text) { 3325 if ($item->{text} eq $text) {
2957 $item->{count}++; 3326 $item->{count}++;
2958 } else { 3327 } else {
2959 $item->{count} = 1; 3328 $item->{count} = 1;
2960 $item->{text} = $item->{tooltip} = $text; 3329 $item->{text} = $item->{tooltip} = $text;
2961 } 3330 }
2962 $item->{id} = ++$self->{id}; 3331 $item->{id} += 0.2;#d#
2963 $item->{timeout} = $timeout; 3332 $item->{timeout} = $timeout;
2964 delete $item->{label}; 3333 delete $item->{label};
2965 } else { 3334 } else {
2966 $self->{item}{$group} = { 3335 $self->{item}{$group} = {
2967 id => ++$self->{id}, 3336 id => ++$self->{id},
… …
2986 3355
2987 $self->reorder; 3356 $self->reorder;
2988 $self->SUPER::reconfigure; 3357 $self->SUPER::reconfigure;
2989} 3358}
2990 3359
3360sub destroy {
3361 my ($self) = @_;
3362
3363 $self->{timer}->cancel;
3364
3365 $self->SUPER::destroy;
3366}
3367
2991############################################################################# 3368#############################################################################
2992 3369
3370package CFClient::UI::Inventory;
3371
3372our @ISA = CFClient::UI::ScrolledWindow::;
3373
3374sub new {
3375 my $class = shift;
3376
3377 my $self = $class->SUPER::new (
3378 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3379 @_,
3380 );
3381
3382 $self
3383}
3384
3385sub set_items {
3386 my ($self, $items) = @_;
3387
3388 $self->{child}->clear;
3389 return unless $items;
3390
3391 my @items = sort {
3392 ($a->{type} <=> $b->{type})
3393 or ($a->{name} cmp $b->{name})
3394 } @$items;
3395
3396 $self->{real_items} = \@items;
3397
3398 my $row = 0;
3399 for my $item (@items) {
3400 CFClient::Item::update_widgets $item;
3401
3402 $self->{child}->add (0, $row, $item->{face_widget});
3403 $self->{child}->add (1, $row, $item->{desc_widget});
3404 $self->{child}->add (2, $row, $item->{weight_widget});
3405
3406 $row++;
3407 }
3408}
3409
3410#############################################################################
3411
3412package CFClient::UI::BindEditor;
3413
3414our @ISA = CFClient::UI::FancyFrame::;
3415
3416sub new {
3417 my $class = shift;
3418
3419 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3420
3421 $self->add (my $vb = new CFClient::UI::VBox);
3422
3423
3424 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3425 text => "start recording",
3426 tooltip => "Start/Stops recording of actions."
3427 ."All subsequent actions after the recording started will be captured."
3428 ."The actions are displayed after the record was stopped."
3429 ."To bind the action you have to click on the 'Bind' button",
3430 on_activate => sub {
3431 unless ($self->{recording}) {
3432 $self->start;
3433 } else {
3434 $self->stop;
3435 }
3436 });
3437
3438 $vb->add (new CFClient::UI::Label text => "Actions:");
3439 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3440
3441 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3442 $vb->add (my $hb = new CFClient::UI::HBox);
3443 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3444 $hb->add (new CFClient::UI::Button
3445 text => "bind",
3446 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3447 on_activate => sub {
3448 $self->ask_for_bind;
3449 });
3450
3451 $vb->add (my $hb = new CFClient::UI::HBox);
3452 $hb->add (new CFClient::UI::Button
3453 text => "ok",
3454 expand => 1,
3455 tooltip => "This closes the binding editor and saves the binding",
3456 on_activate => sub {
3457 $self->hide;
3458 $self->commit;
3459 });
3460
3461 $hb->add (new CFClient::UI::Button
3462 text => "cancel",
3463 expand => 1,
3464 tooltip => "This closes the binding editor without saving",
3465 on_activate => sub {
3466 $self->hide;
3467 $self->{binding_cancel}->()
3468 if $self->{binding_cancel};
3469 });
3470
3471 $self->update_binding_widgets;
3472
3473 $self
3474}
3475
3476sub commit {
3477 my ($self) = @_;
3478 my ($mod, $sym, $cmds) = $self->get_binding;
3479 if ($sym != 0 && @$cmds > 0) {
3480 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3481 ."'. Don't forget 'Save Config'!");
3482 $self->{binding_change}->($mod, $sym, $cmds)
3483 if $self->{binding_change};
3484 } else {
3485 $::STATUSBOX->add ("No action bound, no key or action specified!");
3486 $self->{binding_cancel}->()
3487 if $self->{binding_cancel};
3488 }
3489}
3490
3491sub start {
3492 my ($self) = @_;
3493
3494 $self->{rec_btn}->set_text ("stop recording");
3495 $self->{recording} = 1;
3496 $self->clear_command_list;
3497 $::CONN->start_record if $::CONN;
3498}
3499
3500sub stop {
3501 my ($self) = @_;
3502
3503 $self->{rec_btn}->set_text ("start recording");
3504 $self->{recording} = 0;
3505
3506 my $rec;
3507 $rec = $::CONN->stop_record if $::CONN;
3508 return unless ref $rec eq 'ARRAY';
3509 $self->set_command_list ($rec);
3510}
3511
3512
3513sub ask_for_bind_and_commit {
3514 my ($self) = @_;
3515 $self->ask_for_bind (1);
3516}
3517
3518sub ask_for_bind {
3519 my ($self, $commit, $end_cb) = @_;
3520
3521 CFClient::Binder::open_binding_dialog (sub {
3522 my ($mod, $sym) = @_;
3523 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3524 $self->update_binding_widgets;
3525 $self->commit if $commit;
3526 $end_cb->() if $end_cb;
3527 });
3528}
3529
3530# $mod and $sym are the modifiers and key symbol
3531# $cmds is a array ref of strings (the commands)
3532# $cb is the callback that is executed on OK
3533# $ccb is the callback that is executed on CANCEL and
3534# when the binding was unsuccessful on OK
3535sub set_binding {
3536 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3537
3538 $self->clear_command_list;
3539 $self->{recording} = 0;
3540 $self->{rec_btn}->set_text ("start recording");
3541
3542 $self->{binding} = [$mod, $sym];
3543 $self->{commands} = $cmds;
3544
3545 $self->{binding_change} = $cb;
3546 $self->{binding_cancel} = $ccb;
3547
3548 $self->update_binding_widgets;
3549}
3550
3551# this is a shortcut method that asks for a binding
3552# and then just binds it.
3553sub do_quick_binding {
3554 my ($self, $cmds, $end_cb) = @_;
3555 $self->set_binding (undef, undef, $cmds, sub {
3556 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3557 });
3558 $self->ask_for_bind (1, $end_cb);
3559}
3560
3561sub update_binding_widgets {
3562 my ($self) = @_;
3563 my ($mod, $sym, $cmds) = $self->get_binding;
3564 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3565 $self->set_command_list ($cmds);
3566}
3567
3568sub get_binding {
3569 my ($self) = @_;
3570 return (
3571 $self->{binding}->[0],
3572 $self->{binding}->[1],
3573 [ grep { defined $_ } @{$self->{commands}} ]
3574 );
3575}
3576
3577sub clear_command_list {
3578 my ($self) = @_;
3579 $self->{cmdbox}->clear ();
3580}
3581
3582sub set_command_list {
3583 my ($self, $cmds) = @_;
3584
3585 $self->{cmdbox}->clear ();
3586 $self->{commands} = $cmds;
3587
3588 my $idx = 0;
3589
3590 for (@$cmds) {
3591 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3592
3593 my $i = $idx;
3594 $hb->add (new CFClient::UI::Label text => $_);
3595 $hb->add (new CFClient::UI::Button
3596 text => "delete",
3597 tooltip => "Deletes the action from the record",
3598 on_activate => sub {
3599 $self->{cmdbox}->remove ($hb);
3600 $cmds->[$i] = undef;
3601 });
3602
3603
3604 $idx++
3605 }
3606}
3607
3608#############################################################################
3609
3610package CFClient::UI::SpellList;
3611
3612our @ISA = CFClient::UI::Table::;
3613
3614sub new {
3615 my $class = shift;
3616
3617 my $self = $class->SUPER::new (
3618 binding => [],
3619 commands => [],
3620 @_,
3621 )
3622}
3623
3624my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3625
3626my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3627 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3628my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3629 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3630my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3631 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3632my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3633 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3634my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3636
3637sub rebuild_spell_list {
3638 my ($self) = @_;
3639
3640 $CFClient::UI::ROOT->on_refresh ($self => sub {
3641 $self->clear;
3642
3643 return unless $::CONN;
3644
3645 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3646 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3647 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3648 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3649 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3650
3651 my $row = 0;
3652
3653 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3654 my $spell = $self->{spell}{$_};
3655
3656 $row++;
3657
3658 my $spell_cb = sub {
3659 my ($widget, $ev) = @_;
3660
3661 if ($ev->{button} == 1) {
3662 $::CONN->user_send ("cast $spell->{name}");
3663 } elsif ($ev->{button} == 2) {
3664 $::CONN->user_send ("invoke $spell->{name}");
3665 } elsif ($ev->{button} == 3) {
3666 (new CFClient::UI::Menu
3667 items => [
3668 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3669 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3670 ],
3671 )->popup ($ev);
3672 } else {
3673 return 0;
3674 }
3675
3676 1
3677 };
3678
3679 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3680
3681 #TODO: add path info to tooltip
3682 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3683
3684 $self->add (0, $row, new CFClient::UI::Face
3685 face => $spell->{face},
3686 can_hover => 1,
3687 can_events => 1,
3688 tooltip => $tooltip,
3689 on_button_down => $spell_cb,
3690 );
3691
3692 $self->add (1, $row, new CFClient::UI::Label
3693 expand => 1,
3694 text => $spell->{name},
3695 can_hover => 1,
3696 can_events => 1,
3697 tooltip => $tooltip,
3698 on_button_down => $spell_cb,
3699 );
3700
3701 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3702 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3703 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3704 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3705 }
3706 });
3707}
3708
3709sub add_spell {
3710 my ($self, $spell) = @_;
3711
3712 $self->{spell}->{$spell->{name}} = $spell;
3713 $self->rebuild_spell_list;
3714}
3715
3716sub remove_spell {
3717 my ($self, $spell) = @_;
3718
3719 delete $self->{spell}->{$spell->{name}};
3720 $self->rebuild_spell_list;
3721}
3722
3723sub clear_spells {
3724 my ($self) = @_;
3725
3726 $self->{spell} = {};
3727 $self->rebuild_spell_list;
3728}
3729
3730#############################################################################
3731
2993package CFClient::UI::Root; 3732package CFClient::UI::Root;
2994 3733
2995our @ISA = CFClient::UI::Container::; 3734our @ISA = CFClient::UI::Container::;
3735
3736use List::Util qw(min max);
2996 3737
2997use CFClient::OpenGL; 3738use CFClient::OpenGL;
2998 3739
2999sub new { 3740sub new {
3000 my $class = shift; 3741 my $class = shift;
… …
3007 Scalar::Util::weaken ($self->{root} = $self); 3748 Scalar::Util::weaken ($self->{root} = $self);
3008 3749
3009 $self 3750 $self
3010} 3751}
3011 3752
3012sub configure {
3013 my ($self, $x, $y, $w, $h) = @_;
3014
3015 $self->{w} = $w;
3016 $self->{h} = $h;
3017}
3018
3019sub reconfigure {
3020 my ($self) = @_;
3021
3022 $self->SUPER::reconfigure;
3023
3024 $self->size_allocate ($self->{w}, $self->{h}, 1)
3025 if $self->{w};
3026}
3027
3028sub size_request { 3753sub size_request {
3029 my ($self) = @_; 3754 my ($self) = @_;
3030 3755
3031 ($self->{w}, $self->{h}) 3756 ($self->{w}, $self->{h})
3032} 3757}
3033 3758
3759sub _to_pixel {
3760 my ($coord, $size, $max) = @_;
3761
3762 $coord =
3763 $coord eq "center" ? ($max - $size) * 0.5
3764 : $coord eq "max" ? $max
3765 : $coord;
3766
3767 $coord = 0 if $coord < 0;
3768 $coord = $max - $size if $coord > $max - $size;
3769
3770 int $coord + 0.5
3771}
3772
3034sub size_allocate { 3773sub invoke_size_allocate {
3035 my ($self, $w, $h, $changed) = @_; 3774 my ($self, $w, $h) = @_;
3036 3775
3037 for my $child ($self->children) { 3776 for my $child ($self->children) {
3038 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3777 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3039 3778
3040 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3779 $X = $child->{force_x} if exists $child->{force_x};
3041 if exists $child->{req_x}; 3780 $Y = $child->{force_y} if exists $child->{force_y};
3042 3781
3043 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3782 $X = _to_pixel $X, $W, $self->{w};
3044 if exists $child->{req_y}; 3783 $Y = _to_pixel $Y, $H, $self->{h};
3045
3046 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3047
3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050 3784
3051 $child->configure ($X, $Y, $W, $H); 3785 $child->configure ($X, $Y, $W, $H);
3052 } 3786 }
3787
3788 1
3053} 3789}
3054 3790
3055sub coord2local { 3791sub coord2local {
3056 my ($self, $x, $y) = @_; 3792 my ($self, $x, $y) = @_;
3057 3793
… …
3071} 3807}
3072 3808
3073sub add { 3809sub add {
3074 my ($self, @children) = @_; 3810 my ($self, @children) = @_;
3075 3811
3076 for my $child (@children) {
3077 $child->{is_toplevel} = 1; 3812 $_->{is_toplevel} = 1
3078 3813 for @children;
3079 # integerise window positions
3080 $child->{x} = int $child->{x};
3081 $child->{y} = int $child->{y};
3082 }
3083 3814
3084 $self->SUPER::add (@children); 3815 $self->SUPER::add (@children);
3085} 3816}
3086 3817
3087sub remove { 3818sub remove {
3088 my ($self, @children) = @_; 3819 my ($self, @children) = @_;
3089 3820
3090 $self->SUPER::remove (@children); 3821 $self->SUPER::remove (@children);
3822
3823 delete $self->{is_toplevel}
3824 for @children;
3091 3825
3092 while (@children) { 3826 while (@children) {
3093 my $w = pop @children; 3827 my $w = pop @children;
3094 push @children, $w->children; 3828 push @children, $w->children;
3095 $w->set_invisible; 3829 $w->set_invisible;
… …
3115 $_->() 3849 $_->()
3116 for values %{delete $self->{refresh_hook}}; 3850 for values %{delete $self->{refresh_hook}};
3117 } 3851 }
3118 3852
3119 if ($self->{realloc}) { 3853 if ($self->{realloc}) {
3854 my %queue;
3120 my @queue; 3855 my @queue;
3856 my $widget;
3121 3857
3858 outer:
3122 while () { 3859 while () {
3123 if ($self->{realloc}) { 3860 if (my $realloc = delete $self->{realloc}) {
3124 #TODO use array-of-depth approach 3861 for $widget (values %$realloc) {
3862 $widget->{visible} or next; # do not resize invisible widgets
3125 3863
3126 @queue = sort { $a->{visible} <=> $b->{visible} } 3864 $queue{$widget+0}++ and next; # duplicates are common
3127 @queue, values %{delete $self->{realloc}}; 3865
3866 push @{ $queue[$widget->{visible}] }, $widget;
3867 }
3128 } 3868 }
3129 3869
3870 while () {
3871 @queue or last outer;
3872
3873 $widget = pop @{ $queue[-1] || [] }
3874 and last;
3875
3876 pop @queue;
3877 }
3878
3879 delete $queue{$widget+0};
3880
3881 my ($w, $h) = $widget->size_request;
3882
3883 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3884 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3885
3886 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3887 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3888
3889 $w = $widget->{force_w} if exists $widget->{force_w};
3890 $h = $widget->{force_h} if exists $widget->{force_h};
3891
3892 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3893 || delete $widget->{force_realloc}) {
3894 $widget->{req_w} = $w;
3895 $widget->{req_h} = $h;
3896
3897 $self->{size_alloc}{$widget+0} = $widget;
3898
3899 if (my $parent = $widget->{parent}) {
3900 $self->{realloc}{$parent+0} = $parent
3901 unless $queue{$parent+0};
3902
3903 $parent->{force_size_alloc} = 1;
3904 $self->{size_alloc}{$parent+0} = $parent;
3905 }
3906 }
3907
3908 delete $self->{realloc}{$widget+0};
3909 }
3910 }
3911
3912 while (my $size_alloc = delete $self->{size_alloc}) {
3913 my @queue = sort { $b->{visible} <=> $a->{visible} }
3914 values %$size_alloc;
3915
3916 while () {
3130 my $widget = pop @queue || last; 3917 my $widget = pop @queue || last;
3131 3918
3132 $widget->{visible} or last; # do not resize invisible widgets 3919 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3133
3134 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3135 ? @$widget{qw(def_w def_h)}
3136 : $widget->size_request;
3137
3138 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3139
3140 $widget->{req_w} = $w;
3141 $widget->{req_h} = $h;
3142
3143 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3144
3145 push @queue, $widget->{parent}
3146 if $widget->{parent};
3147 }
3148 }
3149
3150 while (my $size_alloc = delete $self->{size_alloc}) {
3151 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3152 values %$size_alloc;
3153
3154 while () {
3155 my ($widget, $w, $h) = @{ pop @queue or last };
3156 3920
3157 $w = 0 if $w < 0; 3921 $w = 0 if $w < 0;
3158 $h = 0 if $h < 0; 3922 $h = 0 if $h < 0;
3159 3923
3160 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3924 $w = int $w + 0.5;
3925 $h = int $h + 0.5;
3161 3926
3927 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3928 $widget->{old_w} = $widget->{w};
3929 $widget->{old_h} = $widget->{h};
3930
3162 $widget->{w} = $w; 3931 $widget->{w} = $w;
3163 $widget->{h} = $h; 3932 $widget->{h} = $h;
3164 3933
3165 $widget->emit (size_allocate => $w, $h, $changed); 3934 $widget->emit (size_allocate => $w, $h);
3935 }
3166 } 3936 }
3167 } 3937 }
3168 3938
3169 while ($self->{post_alloc_hook}) { 3939 while ($self->{post_alloc_hook}) {
3170 $_->() 3940 $_->()
3171 for values %{delete $self->{post_alloc_hook}}; 3941 for values %{delete $self->{post_alloc_hook}};
3172 } 3942 }
3943
3173 3944
3174 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3945 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3175 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3946 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3176 glClear GL_COLOR_BUFFER_BIT; 3947 glClear GL_COLOR_BUFFER_BIT;
3177 3948
… …
3179 glLoadIdentity; 3950 glLoadIdentity;
3180 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3951 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3181 glMatrixMode GL_MODELVIEW; 3952 glMatrixMode GL_MODELVIEW;
3182 glLoadIdentity; 3953 glLoadIdentity;
3183 3954
3955 {
3956 package CFClient::UI::Base;
3957
3958 ($draw_x, $draw_y, $draw_w, $draw_h) =
3959 (0, 0, $self->{w}, $self->{h});
3960 }
3961
3184 $self->_draw; 3962 $self->_draw;
3185} 3963}
3186 3964
3187############################################################################# 3965#############################################################################
3188 3966

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines