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.252 by root, Sun May 28 23:21:28 2006 UTC vs.
Revision 1.306 by root, Sun Jun 18 17:39:36 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) {
27 $TOOLTIP->hide;
28
45 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
46 32
47 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
48 34
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 36
51 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
52
53 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
54
55 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
56 if $x + $TOOLTIP->{w} > $::WIDTH;
57
58 $TOOLTIP->move ($x, $y);
59 $TOOLTIP->show; 38 $TOOLTIP->show;
60 } 39 }
61 40
62 return; 41 return;
63 } 42 }
64 } 43 }
65 } 44 }
66 45
67 $TOOLTIP->hide; 46 $TOOLTIP->hide;
68 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;
69} 71}
70 72
71# class methods for events 73# class methods for events
72sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
73 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
87 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
88 90
89 $GRAB = $widget; 91 $GRAB = $widget;
90 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
91 93
92 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
93 } 95 }
94 96
95 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
96 98
97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
112 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
113 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
114 $grab->update if $grab; 116 $grab->update if $grab;
115 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
116 118
117 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
118 } 120 }
119} 121}
120 122
121sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
122 my ($ev) = @_; 124 my ($ev) = @_;
… …
128 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
129 131
130 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
131 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
132 134
133 check_tooltip; 135 $TOOLTIP_WATCHER->start;
134 } 136 }
135 137
136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER; 139 if $HOVER;
138} 140}
… …
170sub rescale_widgets { 172sub rescale_widgets {
171 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
172 174
173 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
174 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
175 $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.]+$/;
176 $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};
177 $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};
178 $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.]+$/;
179 $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};
180 $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
181 } 190 }
182 } 191 }
183 192
184 reconfigure_widgets; 193 reconfigure_widgets;
185} 194}
… …
194 203
195sub new { 204sub new {
196 my $class = shift; 205 my $class = shift;
197 206
198 my $self = bless { 207 my $self = bless {
199 x => 0, 208 x => "center",
200 y => 0, 209 y => "center",
201 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
202 can_events => 1, 213 can_events => 1,
203 @_ 214 @_
204 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
205 218
206 for (keys %$self) { 219 for (keys %$self) {
207 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
208 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
209 } 222 }
210 } 223 }
211 224
212 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
213
214 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
215 $self->{req_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
216 $self->{req_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
217 $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};
218 $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};
219 } 235 }
220 236
221 $self 237 $self
222} 238}
223 239
… …
234 return if $self->{parent}; 250 return if $self->{parent};
235 251
236 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
237} 253}
238 254
239sub center {
240 my ($self) = @_;
241
242 $CFClient::UI::ROOT->on_post_alloc (
243 "center_$self" => sub {
244 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
245 },
246 );
247
248 $self->update;
249}
250
251sub set_visible { 255sub set_visible {
252 my ($self) = @_; 256 my ($self) = @_;
253 257
254 return if $self->{visible}; 258 return if $self->{visible};
255 259
… …
268 272
269 return unless $self->{visible}; 273 return unless $self->{visible};
270 274
271 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
272 276
277 delete $self->{visible};
273 delete $self->{root}; 278 delete $self->{root};
274 delete $self->{visible};
275 279
276 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
277 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
278 282
279 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
280 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
281 285
282 $self->focus_out; 286 $self->emit ("focus_out");
283
284 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
285} 288}
286 289
287sub set_visibility { 290sub set_visibility {
288 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
308 311
309 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
310 if $self->{parent}; 313 if $self->{parent};
311} 314}
312 315
313sub move { 316sub move_abs {
314 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
315 318
316 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
317 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
318 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
319 322
320 $self->update; 323 $self->update;
321} 324}
322 325
323sub set_size { 326sub set_size {
324 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
325 328
326 $self->{def_w} = $w; 329 $self->{force_w} = $w;
327 $self->{def_h} = $h; 330 $self->{force_h} = $h;
328 331
329 $self->realloc; 332 $self->realloc;
330} 333}
331 334
332sub size_request { 335sub size_request {
… …
336 339
337sub configure { 340sub configure {
338 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
339 342
340 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
341 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
342 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
343 348
344 # use alignment to adjust x, y 349 # use alignment to adjust x, y
345 350
346 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
347 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
348
349 ($w, $h) = ($w2, $h2);
350 } 353 }
351 354
352 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
353 $self->{x} = $x; 356 $self->{x} = $x;
354 $self->{y} = $y; 357 $self->{y} = $y;
355 $self->update; 358 $self->update;
356 } 359 }
357 360
358 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
359 return unless $self->{visible}; 362 return unless $self->{visible};
360 363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
361 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 367 $self->{root}{size_alloc}{$self+0} = $self;
362 } 368 }
363}
364
365sub size_allocate {
366 # nothing to be done
367} 369}
368 370
369sub children { 371sub children {
372 # nop
373}
374
375sub visible_children {
376 $_[0]->children
370} 377}
371 378
372sub set_max_size { 379sub set_max_size {
373 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
374 381
375 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
376 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
377} 386}
378 387
379sub set_tooltip { 388sub set_tooltip {
380 my ($self, $tooltip) = @_; 389 my ($self, $tooltip) = @_;
381 390
… …
386 395
387 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
388 397
389 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
390 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
391 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
392 } 401 }
393} 402}
394 403
395# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
396sub coord2local { 405sub coord2local {
… …
404 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
405 414
406 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
407} 416}
408 417
409sub focus_in { 418sub invoke_focus_in {
410 my ($self) = @_; 419 my ($self) = @_;
411 420
412 return if $FOCUS == $self; 421 return if $FOCUS == $self;
413 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
414 423
415 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
416 425
417 $self->_emit (focus_in => $focus);
418
419 $focus->update if $focus; 426 $focus->update if $focus;
420 $FOCUS->update; 427 $FOCUS->update;
421}
422 428
429 0
430}
431
423sub focus_out { 432sub invoke_focus_out {
424 my ($self) = @_; 433 my ($self) = @_;
425 434
426 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
427 436
428 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
429 438
430 $self->_emit (focus_out => $focus);
431
432 $focus->update if $focus; #? 439 $focus->update if $focus; #?
433 440
434 $::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
435 unless $FOCUS; 442 unless $FOCUS;
436}
437 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
438sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
439sub button_up { } 454sub invoke_button_up { 1 }
440sub key_down { } 455sub invoke_key_down { 1 }
441sub key_up { } 456sub invoke_key_up { 1 }
442 457
443sub button_down { 458sub invoke_button_down {
444 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
445 460
446 $self->focus_in; 461 $self->grab_focus;
447}
448 462
449sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
450sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
451sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
452sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
453sub 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}
454 479
455sub find_widget { 480sub find_widget {
456 my ($self, $x, $y) = @_; 481 my ($self, $x, $y) = @_;
457 482
458 return () unless $self->{can_events}; 483 return () unless $self->{can_events};
… …
466 491
467sub set_parent { 492sub set_parent {
468 my ($self, $parent) = @_; 493 my ($self, $parent) = @_;
469 494
470 Scalar::Util::weaken ($self->{parent} = $parent); 495 Scalar::Util::weaken ($self->{parent} = $parent);
471
472 $self->set_visible if $parent->{visible}; 496 $self->set_visible if $parent->{visible};
473} 497}
474 498
475sub connect {
476 my ($self, $signal, $cb) = @_;
477
478 push @{ $self->{signal_cb}{$signal} }, $cb;
479}
480
481sub _emit {
482 my ($self, $signal, @args) = @_;
483
484 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
485}
486
487sub emit {
488 my ($self, $signal, @args) = @_;
489
490 $self->_emit ($signal, @args)
491 || $self->$signal (@args);
492}
493
494sub visibility_change {
495 #my ($self, $visible) = @_;
496}
497
498sub realloc { 499sub realloc {
499 my ($self) = @_; 500 my ($self) = @_;
500 501
501 if ($self->{visible}) { 502 if ($self->{visible}) {
502 return if $self->{root}{realloc}{$self}; 503 return if $self->{root}{realloc}{$self+0};
503 504
504 $self->{root}{realloc}{$self} = $self; 505 $self->{root}{realloc}{$self+0} = $self;
505 $self->{root}->update; 506 $self->{root}->update;
506 } else { 507 } else {
507 delete $self->{req_w}; 508 delete $self->{req_w};
509 delete $self->{req_h};
508 } 510 }
509} 511}
510 512
511sub update { 513sub update {
512 my ($self) = @_; 514 my ($self) = @_;
513 515
514 $self->{parent}->update 516 $self->{parent}->update
515 if $self->{parent}; 517 if $self->{parent};
516} 518}
517 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
518sub draw { 531sub draw {
519 my ($self) = @_; 532 my ($self) = @_;
520 533
521 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);
522 545
523 glPushMatrix; 546 glPushMatrix;
524 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
525 $self->_draw;
526 glPopMatrix;
527 548
528 if ($self == $HOVER && $self->{can_hover}) { 549 if ($self == $HOVER && $self->{can_hover}) {
529 my ($x, $y) = @$self{qw(x y)};
530
531 glColor 1, 0.8, 0.5, 0.2; 550 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
532 glEnable GL_BLEND; 551 glEnable GL_BLEND;
533 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 552 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
534 glBegin GL_QUADS; 553 glBegin GL_QUADS;
535 glVertex $x , $y; 554 glVertex 0 , 0;
536 glVertex $x + $self->{w}, $y; 555 glVertex $self->{w}, 0;
537 glVertex $x + $self->{w}, $y + $self->{h}; 556 glVertex $self->{w}, $self->{h};
538 glVertex $x , $y + $self->{h}; 557 glVertex 0 , $self->{h};
539 glEnd; 558 glEnd;
540 glDisable GL_BLEND; 559 glDisable GL_BLEND;
541 } 560 }
542 561
543 if ($ENV{PCLIENT_DEBUG}) { 562 if ($ENV{CFPLUS_DEBUG} & 1) {
544 glPushMatrix; 563 glPushMatrix;
545 glColor 1, 1, 0, 1; 564 glColor 1, 1, 0, 1;
546 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 565 glTranslate 0.375, 0.375;
547 glBegin GL_LINE_LOOP; 566 glBegin GL_LINE_LOOP;
548 glVertex 0 , 0; 567 glVertex 0 , 0;
549 glVertex $self->{w} - 1, 0; 568 glVertex $self->{w} - 1, 0;
550 glVertex $self->{w} - 1, $self->{h} - 1; 569 glVertex $self->{w} - 1, $self->{h} - 1;
551 glVertex 0 , $self->{h} - 1; 570 glVertex 0 , $self->{h} - 1;
552 glEnd; 571 glEnd;
553 glPopMatrix; 572 glPopMatrix;
554 #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;
555 } 574 }
575
576 $self->_draw;
577 glPopMatrix;
556} 578}
557 579
558sub _draw { 580sub _draw {
559 my ($self) = @_; 581 my ($self) = @_;
560 582
… …
563 585
564sub DESTROY { 586sub DESTROY {
565 my ($self) = @_; 587 my ($self) = @_;
566 588
567 delete $WIDGET{$self+0}; 589 delete $WIDGET{$self+0};
568 #$self->deactivate; 590
591 eval { $self->destroy };
592 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
569} 593}
570 594
571############################################################################# 595#############################################################################
572 596
573package CFClient::UI::DrawBG; 597package CFClient::UI::DrawBG;
… …
598 622
599 if ($color && (@$color < 4 || $color->[3])) { 623 if ($color && (@$color < 4 || $color->[3])) {
600 my ($w, $h) = @$self{qw(w h)}; 624 my ($w, $h) = @$self{qw(w h)};
601 625
602 glEnable GL_BLEND; 626 glEnable GL_BLEND;
603 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 627 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
604 glColor @$color; 628 glColor_premultiply @$color;
605 629
606 glBegin GL_QUADS; 630 glBegin GL_QUADS;
607 glVertex 0 , 0; 631 glVertex 0 , 0;
608 glVertex 0 , $h; 632 glVertex 0 , $h;
609 glVertex $w, $h; 633 glVertex $w, $h;
… …
624 my ($class, %arg) = @_; 648 my ($class, %arg) = @_;
625 $class->SUPER::new (can_events => 0, %arg); 649 $class->SUPER::new (can_events => 0, %arg);
626} 650}
627 651
628sub size_request { 652sub size_request {
629 (0, 0) 653 my ($self) = @_;
654
655 ($self->{w} + 0, $self->{h} + 0)
630} 656}
631 657
632sub draw { } 658sub draw { }
633 659
634############################################################################# 660#############################################################################
… …
638our @ISA = CFClient::UI::Base::; 664our @ISA = CFClient::UI::Base::;
639 665
640sub new { 666sub new {
641 my ($class, %arg) = @_; 667 my ($class, %arg) = @_;
642 668
643 my $children = delete $arg{children} || []; 669 my $children = delete $arg{children};
644 670
645 my $self = $class->SUPER::new ( 671 my $self = $class->SUPER::new (
646 children => [], 672 children => [],
647 can_events => 0, 673 can_events => 0,
648 %arg, 674 %arg,
649 ); 675 );
676
650 $self->add ($_) for @$children; 677 $self->add (@$children)
678 if $children;
651 679
652 $self 680 $self
653} 681}
654 682
655sub add { 683sub add {
… …
703 $x -= $self->{x}; 731 $x -= $self->{x};
704 $y -= $self->{y}; 732 $y -= $self->{y};
705 733
706 my $res; 734 my $res;
707 735
708 for (reverse @{ $self->{children} }) { 736 for (reverse $self->visible_children) {
709 $res = $_->find_widget ($x, $y) 737 $res = $_->find_widget ($x, $y)
710 and return $res; 738 and return $res;
711 } 739 }
712 740
713 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 741 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
734} 762}
735 763
736sub add { 764sub add {
737 my ($self, $child) = @_; 765 my ($self, $child) = @_;
738 766
739 $self->{children} = []; 767 $self->SUPER::remove ($_) for @{ $self->{children} };
740
741 $self->SUPER::add ($child); 768 $self->SUPER::add ($child);
742} 769}
743 770
744sub remove { 771sub remove {
745 my ($self, $widget) = @_; 772 my ($self, $widget) = @_;
… …
754 781
755sub size_request { 782sub size_request {
756 $_[0]{children}[0]->size_request 783 $_[0]{children}[0]->size_request
757} 784}
758 785
759sub size_allocate { 786sub invoke_size_allocate {
760 my ($self, $w, $h, $changed) = @_; 787 my ($self, $w, $h) = @_;
761 788
762 $self->{children}[0]->configure (0, 0, $w, $h); 789 $self->{children}[0]->configure (0, 0, $w, $h);
790
791 1
763} 792}
764 793
765############################################################################# 794#############################################################################
795
796# back-buffered drawing area
766 797
767package CFClient::UI::Window; 798package CFClient::UI::Window;
768 799
769our @ISA = CFClient::UI::Bin::; 800our @ISA = CFClient::UI::Bin::;
770 801
… …
781 812
782 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 813 $ROOT->on_post_alloc ($self => sub { $self->render_child });
783 $self->SUPER::update; 814 $self->SUPER::update;
784} 815}
785 816
786sub size_allocate { 817sub invoke_size_allocate {
787 my ($self, $w, $h, $changed) = @_; 818 my ($self, $w, $h) = @_;
788 819
789 $self->SUPER::size_allocate ($w, $h, $changed);
790 $self->update 820 $self->update;
791 if $changed; 821
822 $self->SUPER::invoke_size_allocate ($w, $h)
792} 823}
793 824
794sub _render { 825sub _render {
826 my ($self) = @_;
827
795 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
796} 829}
797 830
798sub render_child { 831sub render_child {
799 my ($self) = @_; 832 my ($self) = @_;
800 833
801 $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 {
802 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
803 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
804 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
805 $self->_render; 845 $self->_render;
806 }; 846 };
807} 847}
808 848
809sub _draw { 849sub _draw {
810 my ($self) = @_; 850 my ($self) = @_;
811 851
812 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
813 853
814 my $tex = $self->{texture} 854 my $tex = $self->{texture}
815 or return; 855 or return;
816 856
817 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
818 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
819 glColor 1, 1, 1, 1; 859 glColor 0, 0, 0, 1;
820 860
821 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
822 862
823 glDisable GL_TEXTURE_2D; 863 glDisable GL_TEXTURE_2D;
824} 864}
… …
840} 880}
841 881
842sub size_request { 882sub size_request {
843 my ($self) = @_; 883 my ($self) = @_;
844 884
845 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)};
846 886
847 $w = 10 if $self->{scroll_x}; 887 $w = 10 if $self->{scroll_x};
848 $h = 10 if $self->{scroll_y}; 888 $h = 10 if $self->{scroll_y};
849 889
850 ($w, $h) 890 ($w, $h)
851} 891}
852 892
853sub size_allocate { 893sub invoke_size_allocate {
854 my ($self, $w, $h, $changed) = @_; 894 my ($self, $w, $h) = @_;
855 895
896 my $child = $self->child;
897
856 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
857 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
858 900
859 $self->child->configure (0, 0, $w, $h); 901 $self->child->configure (0, 0, $w, $h);
860 $self->update; 902 $self->update;
903
904 1
861} 905}
862 906
863sub set_offset { 907sub set_offset {
864 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
865 909
… …
898} 942}
899 943
900sub _render { 944sub _render {
901 my ($self) = @_; 945 my ($self) = @_;
902 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
903 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
904 951
905 $self->SUPER::_render; 952 $self->SUPER::_render;
906} 953}
907 954
… …
910package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
911 958
912our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
913 960
914sub new { 961sub new {
915 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
916 965
917 my $self; 966 my $self;
918 967
919 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
920 vertical => 1, 969 vertical => 1,
… …
925 ; 974 ;
926 975
927 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
928 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
929 slider => $slider, 978 slider => $slider,
930 @_, 979 %arg,
931 ); 980 );
932 981
933 $self->{vp}->add ($self->{scrolled});
934 $self->add ($self->{vp});
935 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
936 984
937 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
938} 992}
939 993
940sub update { 994sub update {
941 my ($self) = @_; 995 my ($self) = @_;
942 996
… …
945 # todo: overwrite size_allocate of child 999 # todo: overwrite size_allocate of child
946 my $child = $self->{vp}->child; 1000 my $child = $self->{vp}->child;
947 $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]);
948} 1002}
949 1003
950sub size_allocate { 1004sub invoke_size_allocate {
951 my ($self, $w, $h, $changed) = @_; 1005 my ($self, $w, $h) = @_;
952
953 $self->SUPER::size_allocate ($w, $h, $changed);
954 1006
955 my $child = $self->{vp}->child; 1007 my $child = $self->{vp}->child;
956 $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)
957} 1011}
958 1012
959#TODO# update range on size_allocate depending on child 1013#TODO# update range on size_allocate depending on child
960# update viewport offset on scroll 1014# update viewport offset on scroll
961 1015
… …
981 1035
982 if ($self->{bg}) { 1036 if ($self->{bg}) {
983 my ($w, $h) = @$self{qw(w h)}; 1037 my ($w, $h) = @$self{qw(w h)};
984 1038
985 glEnable GL_BLEND; 1039 glEnable GL_BLEND;
986 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1040 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
987 glColor @{ $self->{bg} }; 1041 glColor_premultiply @{ $self->{bg} };
988 1042
989 glBegin GL_QUADS; 1043 glBegin GL_QUADS;
990 glVertex 0 , 0; 1044 glVertex 0 , 0;
991 glVertex 0 , $h; 1045 glVertex 0 , $h;
992 glVertex $w, $h; 1046 glVertex $w, $h;
… …
1005 1059
1006our @ISA = CFClient::UI::Bin::; 1060our @ISA = CFClient::UI::Bin::;
1007 1061
1008use CFClient::OpenGL; 1062use CFClient::OpenGL;
1009 1063
1010my @tex = 1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
1011 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1012 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);
1013 1071
1014sub new { 1072sub new {
1015 my $class = shift; 1073 my ($class, %arg) = @_;
1016 1074
1017 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
1018 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
1019 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
1020 border => 0.6, 1078 border => 0.6,
1021 is_toplevel => 1,
1022 can_events => 1, 1079 can_events => 1,
1023 @_ 1080 min_w => 16,
1081 min_h => 16,
1082 %arg,
1024 ); 1083 );
1025 1084
1026 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title_widget} = new CFClient::UI::Label
1027 align => 0, 1086 align => 0,
1028 valign => 1, 1087 valign => 1,
1029 text => $self->{title}, 1088 text => $self->{title},
1030 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 }
1031 1100
1032 $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};
1033} 1110}
1034 1111
1035sub border { 1112sub border {
1036 int $_[0]{border} * $::FONTSIZE 1113 int $_[0]{border} * $::FONTSIZE
1037} 1114}
1038 1115
1039sub size_request { 1116sub size_request {
1040 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};
1041 1124
1042 my ($w, $h) = $self->SUPER::size_request; 1125 my ($w, $h) = $self->SUPER::size_request;
1043 1126
1044 ( 1127 (
1045 $w + $self->border * 2, 1128 $w + $self->border * 2,
1046 $h + $self->border * 2, 1129 $h + $self->border * 2,
1047 ) 1130 )
1048} 1131}
1049 1132
1050sub size_allocate { 1133sub invoke_size_allocate {
1051 my ($self, $w, $h, $changed) = @_; 1134 my ($self, $w, $h) = @_;
1052 1135
1053 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 }
1054 1141
1142 my $border = $self->border;
1143
1055 $h -= List::Util::max 0, $self->border * 2; 1144 $h -= List::Util::max 0, $border * 2;
1056 $w -= List::Util::max 0, $self->border * 2; 1145 $w -= List::Util::max 0, $border * 2;
1057 1146
1058 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1059 if $self->{title};
1060
1061 $self->child->configure ($self->border, $self->border, $w, $h); 1147 $self->child->configure ($border, $border, $w, $h);
1062}
1063 1148
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button};
1151
1152 1
1153}
1154
1064sub button_down { 1155sub invoke_button_down {
1065 my ($self, $ev, $x, $y) = @_; 1156 my ($self, $ev, $x, $y) = @_;
1066 1157
1067 my ($w, $h) = @$self{qw(w h)}; 1158 my ($w, $h) = @$self{qw(w h)};
1068 my $border = $self->border; 1159 my $border = $self->border;
1069 1160
… …
1082 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
1083 1174
1084 my $dx = $ev->{x} - $ox; 1175 my $dx = $ev->{x} - $ox;
1085 my $dy = $ev->{y} - $oy; 1176 my $dy = $ev->{y} - $oy;
1086 1177
1087 $self->{user_x} = $wx + $dx * $mx;
1088 $self->{user_y} = $wy + $dy * $my;
1089 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1178 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1090 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1179 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1091 $self->move ($self->{user_x}, $self->{user_y}); 1180
1181 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1092 $self->realloc; 1182 $self->realloc;
1093 }; 1183 };
1094 1184
1095 } elsif ($lr ^ $td) { 1185 } elsif ($lr ^ $td) {
1096 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1186 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1099 $self->{motion} = sub { 1189 $self->{motion} = sub {
1100 my ($ev, $x, $y) = @_; 1190 my ($ev, $x, $y) = @_;
1101 1191
1102 ($x, $y) = ($ev->{x}, $ev->{y}); 1192 ($x, $y) = ($ev->{x}, $ev->{y});
1103 1193
1104 $self->{user_x} = $bx + $x - $ox; 1194 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1105 $self->{user_y} = $by + $y - $oy; 1195 # HACK: the next line is required to enforce placement
1106 1196 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1107 $self->move ($self->{user_x}, $self->{user_y});
1108 $self->realloc;
1109 }; 1197 };
1198 } else {
1199 return 0;
1200 }
1201
1110 } 1202 1
1111} 1203}
1112 1204
1113sub button_up { 1205sub invoke_button_up {
1114 my ($self, $ev, $x, $y) = @_; 1206 my ($self, $ev, $x, $y) = @_;
1115 1207
1116 delete $self->{motion}; 1208 ! ! delete $self->{motion}
1117} 1209}
1118 1210
1119sub mouse_motion { 1211sub invoke_mouse_motion {
1120 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1121 1213
1122 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1214 $self->{motion}->($ev, $x, $y) if $self->{motion};
1215
1216 ! ! $self->{motion}
1123} 1217}
1124 1218
1125sub _draw { 1219sub _draw {
1126 my ($self) = @_; 1220 my ($self) = @_;
1127 1221
1222 my $child = $self->{children}[0];
1223
1128 my ($w, $h ) = ($self->{w}, $self->{h}); 1224 my ($w, $h ) = ($self->{w}, $self->{h});
1129 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1225 my ($cw, $ch) = ($child->{w}, $child->{h});
1130 1226
1131 glEnable GL_TEXTURE_2D; 1227 glEnable GL_TEXTURE_2D;
1132 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1133 1229
1134 my $border = $self->border; 1230 my $border = $self->border;
1135 1231
1136 glColor @{ $self->{border_bg} }; 1232 glColor @{ $self->{border_bg} };
1137 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1233 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1138 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1234 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1139 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1235 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1140 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1236 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1141 1237
1142 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1238 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1143 my $bg = $tex[0]; 1239 glColor @{ $self->{bg} };
1144 1240
1145 # TODO: repeat texture not scale 1241 # TODO: repeat texture not scale
1242 # solve this better(?)
1146 my $rep_x = $cw / $bg->{w}; 1243 $bg->{s} = $cw / $bg->{w};
1147 my $rep_y = $ch / $bg->{h}; 1244 $bg->{t} = $ch / $bg->{h};
1148
1149 glColor @{ $self->{bg} };
1150
1151 $bg->{s} = $rep_x;
1152 $bg->{t} = $rep_y;
1153 $bg->{wrap_mode} = 1;
1154 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1245 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1155 } 1246 }
1156 1247
1157 glDisable GL_TEXTURE_2D; 1248 glDisable GL_TEXTURE_2D;
1158 1249
1159 $self->{title}->draw if $self->{title};
1160
1161 $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};
1162} 1261}
1163 1262
1164############################################################################# 1263#############################################################################
1165 1264
1166package CFClient::UI::Table; 1265package CFClient::UI::Table;
… …
1189 1288
1190 $child->set_parent ($self); 1289 $child->set_parent ($self);
1191 $self->{children}[$y][$x] = $child; 1290 $self->{children}[$y][$x] = $child;
1192 1291
1193 $self->realloc; 1292 $self->realloc;
1293}
1294
1295sub remove {
1296 my ($self, $child) = @_;
1297
1298 # TODO: not yet implemented
1194} 1299}
1195 1300
1196# 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?
1197sub clear { 1302sub clear {
1198 my ($self) = @_; 1303 my ($self) = @_;
… …
1239 (sum @$ws), 1344 (sum @$ws),
1240 (sum @$hs), 1345 (sum @$hs),
1241 ) 1346 )
1242} 1347}
1243 1348
1244sub size_allocate { 1349sub invoke_size_allocate {
1245 my ($self, $w, $h, $changed) = @_; 1350 my ($self, $w, $h) = @_;
1246 1351
1247 my ($ws, $hs) = $self->get_wh; 1352 my ($ws, $hs) = $self->get_wh;
1248 1353
1249 my $req_w = (sum @$ws) || 1; 1354 my $req_w = (sum @$ws) || 1;
1250 my $req_h = (sum @$hs) || 1; 1355 my $req_h = (sum @$hs) || 1;
… …
1281 } 1386 }
1282 1387
1283 $y += $row_h; 1388 $y += $row_h;
1284 } 1389 }
1285 1390
1391 1
1286} 1392}
1287 1393
1288sub find_widget { 1394sub find_widget {
1289 my ($self, $x, $y) = @_; 1395 my ($self, $x, $y) = @_;
1290 1396
… …
1327 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1433 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1434 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 ) 1435 )
1330} 1436}
1331 1437
1332sub size_allocate { 1438sub invoke_size_allocate {
1333 my ($self, $w, $h, $changed) = @_; 1439 my ($self, $w, $h) = @_;
1334 1440
1335 my $space = $self->{vertical} ? $h : $w; 1441 my $space = $self->{vertical} ? $h : $w;
1336 my $children = $self->{children}; 1442 my $children = $self->{children};
1337 1443
1338 my @req; 1444 my @req;
… …
1421 ellipsise => 3, # end 1527 ellipsise => 3, # end
1422 layout => (new CFClient::Layout), 1528 layout => (new CFClient::Layout),
1423 fontsize => 1, 1529 fontsize => 1,
1424 align => -1, 1530 align => -1,
1425 valign => -1, 1531 valign => -1,
1426 padding => 2, 1532 padding_x => 2,
1533 padding_y => 2,
1427 can_events => 0, 1534 can_events => 0,
1428 %arg 1535 %arg
1429 ); 1536 );
1430 1537
1431 if (exists $self->{template}) { 1538 if (exists $self->{template}) {
… …
1458 1565
1459 delete $self->{texture}; 1566 delete $self->{texture};
1460 $self->SUPER::update; 1567 $self->SUPER::update;
1461} 1568}
1462 1569
1570sub realloc {
1571 my ($self) = @_;
1572
1573 delete $self->{ox};
1574 $self->SUPER::realloc;
1575}
1576
1463sub set_text { 1577sub set_text {
1464 my ($self, $text) = @_; 1578 my ($self, $text) = @_;
1465 1579
1466 return if $self->{text} eq "T$text"; 1580 return if $self->{text} eq "T$text";
1467 $self->{text} = "T$text"; 1581 $self->{text} = "T$text";
1468 1582
1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1470 $self->{layout}->set_text ($text); 1584 $self->{layout}->set_text ($text);
1471 1585
1586 delete $self->{size_req};
1472 $self->realloc; 1587 $self->realloc;
1473 $self->update; 1588 $self->update;
1474} 1589}
1475 1590
1476sub set_markup { 1591sub set_markup {
… …
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1597 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1598
1484 $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;
1485 $self->{layout}->set_markup ($markup); 1600 $self->{layout}->set_markup ($markup);
1486 1601
1602 delete $self->{size_req};
1487 $self->realloc; 1603 $self->realloc;
1488 $self->update; 1604 $self->update;
1489} 1605}
1490 1606
1491sub size_request { 1607sub size_request {
1492 my ($self) = @_; 1608 my ($self) = @_;
1493 1609
1610 $self->{size_req} ||= do {
1494 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1611 $self->{layout}->set_font ($self->{font}) if $self->{font};
1495 $self->{layout}->set_width ($self->{max_w} || -1); 1612 $self->{layout}->set_width ($self->{max_w} || -1);
1496 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1613 $self->{layout}->set_ellipsise ($self->{ellipsise});
1497 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1614 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1498 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1499 1616
1500 my ($w, $h) = $self->{layout}->size; 1617 my ($w, $h) = $self->{layout}->size;
1501 1618
1502 if (exists $self->{template}) { 1619 if (exists $self->{template}) {
1503 $self->{template}->set_font ($self->{font}) if $self->{font}; 1620 $self->{template}->set_font ($self->{font}) if $self->{font};
1504 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1505 1622
1506 my ($w2, $h2) = $self->{template}->size; 1623 my ($w2, $h2) = $self->{template}->size;
1507 1624
1508 $w = List::Util::max $w, $w2; 1625 $w = List::Util::max $w, $w2;
1509 $h = List::Util::max $h, $h2; 1626 $h = List::Util::max $h, $h2;
1627 }
1628
1629 [$w, $h]
1510 } 1630 };
1511 1631
1512 ( 1632 @{ $self->{size_req} }
1513 $w + $self->{padding} * 2,
1514 $h + $self->{padding} * 2,
1515 )
1516} 1633}
1517 1634
1518sub size_allocate { 1635sub invoke_size_allocate {
1519 my ($self, $w, $h, $changed) = @_; 1636 my ($self, $w, $h) = @_;
1637
1638 delete $self->{ox};
1520 1639
1521 delete $self->{texture} 1640 delete $self->{texture}
1522 if $changed; 1641 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1642
1643 1
1523} 1644}
1524 1645
1525sub set_fontsize { 1646sub set_fontsize {
1526 my ($self, $fontsize) = @_; 1647 my ($self, $fontsize) = @_;
1527 1648
1528 $self->{fontsize} = $fontsize; 1649 $self->{fontsize} = $fontsize;
1529 delete $self->{texture}; 1650 delete $self->{texture};
1530 1651
1531 $self->realloc; 1652 $self->realloc;
1653}
1654
1655sub reconfigure {
1656 my ($self) = @_;
1657
1658 delete $self->{size_req};
1659
1660 $self->SUPER::reconfigure;
1532} 1661}
1533 1662
1534sub _draw { 1663sub _draw {
1535 my ($self) = @_; 1664 my ($self) = @_;
1536 1665
… …
1542 $self->{layout}->set_width ($self->{w}); 1671 $self->{layout}->set_width ($self->{w});
1543 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1672 $self->{layout}->set_ellipsise ($self->{ellipsise});
1544 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546 1675
1547 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1676 new_from_layout CFClient::Texture $self->{layout}
1677 };
1548 1678
1679 unless (exists $self->{ox}) {
1549 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1550 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1551 : ($self->{w} - $tex->{w}) * 0.5); 1682 : ($self->{w} - $tex->{w}) * 0.5);
1552 1683
1553 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1554 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1555 : ($self->{h} - $tex->{h}) * 0.5); 1686 : ($self->{h} - $tex->{h}) * 0.5);
1556
1557 $tex
1558 }; 1687 };
1559 1688
1560 glEnable GL_TEXTURE_2D; 1689 glEnable GL_TEXTURE_2D;
1561 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};
1562 1693
1563 if ($tex->{format} == GL_ALPHA) { 1694 if ($tex->{format} == GL_ALPHA) {
1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1564 glColor @{$self->{fg}}; 1696 glColor @{$self->{fg}};
1565 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1697 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1566 } else { 1698 } else {
1699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1567 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1700 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1568 } 1701 }
1569 1702
1570 glDisable GL_TEXTURE_2D; 1703 glDisable GL_TEXTURE_2D;
1571} 1704}
1572 1705
… …
1589 can_hover => 1, 1722 can_hover => 1,
1590 can_focus => 1, 1723 can_focus => 1,
1591 valign => 0, 1724 valign => 0,
1592 can_events => 1, 1725 can_events => 1,
1593 #text => ... 1726 #text => ...
1727 #hidden => "*",
1594 @_ 1728 @_
1595 ) 1729 )
1596} 1730}
1597 1731
1598sub _set_text { 1732sub _set_text {
… …
1600 1734
1601 delete $self->{cur_h}; 1735 delete $self->{cur_h};
1602 1736
1603 return if $self->{text} eq $text; 1737 return if $self->{text} eq $text;
1604 1738
1605 delete $self->{texture};
1606
1607 $self->{last_activity} = $::NOW; 1739 $self->{last_activity} = $::NOW;
1608 $self->{text} = $text; 1740 $self->{text} = $text;
1609 1741
1610 $text =~ s/./*/g if $self->{hidden}; 1742 $text =~ s/./*/g if $self->{hidden};
1611 $self->{layout}->set_text ("$text "); 1743 $self->{layout}->set_text ("$text ");
1744 delete $self->{size_req};
1612 1745
1613 $self->_emit (changed => $self->{text}); 1746 $self->emit (changed => $self->{text});
1747
1748 $self->realloc;
1749 $self->update;
1614} 1750}
1615 1751
1616sub set_text { 1752sub set_text {
1617 my ($self, $text) = @_; 1753 my ($self, $text) = @_;
1618 1754
1619 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1620 $self->_set_text ($text); 1756 $self->_set_text ($text);
1621
1622 $self->realloc;
1623} 1757}
1624 1758
1625sub get_text { 1759sub get_text {
1626 $_[0]{text} 1760 $_[0]{text}
1627} 1761}
… …
1632 my ($w, $h) = $self->SUPER::size_request; 1766 my ($w, $h) = $self->SUPER::size_request;
1633 1767
1634 ($w + 1, $h) # add 1 for cursor 1768 ($w + 1, $h) # add 1 for cursor
1635} 1769}
1636 1770
1637sub key_down { 1771sub invoke_key_down {
1638 my ($self, $ev) = @_; 1772 my ($self, $ev) = @_;
1639 1773
1640 my $mod = $ev->{mod}; 1774 my $mod = $ev->{mod};
1641 my $sym = $ev->{sym}; 1775 my $sym = $ev->{sym};
1642 my $uni = $ev->{unicode}; 1776 my $uni = $ev->{unicode};
… …
1654 } elsif ($sym == CFClient::SDLK_HOME) { 1788 } elsif ($sym == CFClient::SDLK_HOME) {
1655 $self->{cursor} = 0; 1789 $self->{cursor} = 0;
1656 } elsif ($sym == CFClient::SDLK_END) { 1790 } elsif ($sym == CFClient::SDLK_END) {
1657 $self->{cursor} = length $text; 1791 $self->{cursor} = length $text;
1658 } elsif ($uni == 27) { 1792 } elsif ($uni == 27) {
1659 $self->_emit ('escape'); 1793 $self->emit ('escape');
1660 } elsif ($uni) { 1794 } elsif ($uni) {
1661 substr $text, $self->{cursor}++, 0, chr $uni; 1795 substr $text, $self->{cursor}++, 0, chr $uni;
1796 } else {
1797 return 0;
1662 } 1798 }
1663 1799
1664 $self->_set_text ($text); 1800 $self->_set_text ($text);
1665 1801
1666 $self->realloc; 1802 $self->realloc;
1667}
1668 1803
1804 1
1805}
1806
1669sub focus_in { 1807sub invoke_focus_in {
1670 my ($self) = @_; 1808 my ($self) = @_;
1671 1809
1672 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1673 1811
1674 $self->SUPER::focus_in; 1812 $self->SUPER::invoke_focus_in
1675} 1813}
1676 1814
1677sub button_down { 1815sub invoke_button_down {
1678 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1679 1817
1680 $self->SUPER::button_down ($ev, $x, $y); 1818 $self->SUPER::invoke_button_down ($ev, $x, $y);
1681 1819
1682 my $idx = $self->{layout}->xy_to_index ($x, $y); 1820 my $idx = $self->{layout}->xy_to_index ($x, $y);
1683 1821
1684 # byte-index to char-index 1822 # byte-index to char-index
1685 my $text = $self->{text}; 1823 my $text = $self->{text};
1686 utf8::encode $text; 1824 utf8::encode $text;
1687 $self->{cursor} = length substr $text, 0, $idx; 1825 $self->{cursor} = length substr $text, 0, $idx;
1688 1826
1689 $self->_set_text ($self->{text}); 1827 $self->_set_text ($self->{text});
1690 $self->update; 1828 $self->update;
1829
1830 1
1691} 1831}
1692 1832
1693sub mouse_motion { 1833sub invoke_mouse_motion {
1694 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1695# 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
1696} 1838}
1697 1839
1698sub _draw { 1840sub _draw {
1699 my ($self) = @_; 1841 my ($self) = @_;
1700 1842
1701 local $self->{fg} = $self->{fg}; 1843 local $self->{fg} = $self->{fg};
1702 1844
1703 if ($FOCUS == $self) { 1845 if ($FOCUS == $self) {
1704 glColor @{$self->{active_bg}}; 1846 glColor_premultiply @{$self->{active_bg}};
1705 $self->{fg} = $self->{active_fg}; 1847 $self->{fg} = $self->{active_fg};
1706 } else { 1848 } else {
1707 glColor @{$self->{bg}}; 1849 glColor_premultiply @{$self->{bg}};
1708 } 1850 }
1709 1851
1710 glEnable GL_BLEND; 1852 glEnable GL_BLEND;
1711 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1853 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1712 glBegin GL_QUADS; 1854 glBegin GL_QUADS;
1713 glVertex 0 , 0; 1855 glVertex 0 , 0;
1714 glVertex 0 , $self->{h}; 1856 glVertex 0 , $self->{h};
1715 glVertex $self->{w}, $self->{h}; 1857 glVertex $self->{w}, $self->{h};
1716 glVertex $self->{w}, 0; 1858 glVertex $self->{w}, 0;
… …
1741 1883
1742our @ISA = CFClient::UI::EntryBase::; 1884our @ISA = CFClient::UI::EntryBase::;
1743 1885
1744use CFClient::OpenGL; 1886use CFClient::OpenGL;
1745 1887
1746sub key_down { 1888sub invoke_key_down {
1747 my ($self, $ev) = @_; 1889 my ($self, $ev) = @_;
1748 1890
1749 my $sym = $ev->{sym}; 1891 my $sym = $ev->{sym};
1750 1892
1751 if ($sym == 13) { 1893 if ($sym == 13) {
1752 unshift @{$self->{history}}, 1894 unshift @{$self->{history}},
1753 my $txt = $self->get_text; 1895 my $txt = $self->get_text;
1896
1754 $self->{history_pointer} = -1; 1897 $self->{history_pointer} = -1;
1755 $self->{history_saveback} = ''; 1898 $self->{history_saveback} = '';
1756 $self->_emit (activate => $txt); 1899 $self->emit (activate => $txt);
1757 $self->update; 1900 $self->update;
1758 1901
1759 } elsif ($sym == CFClient::SDLK_UP) { 1902 } elsif ($sym == CFClient::SDLK_UP) {
1760 if ($self->{history_pointer} < 0) { 1903 if ($self->{history_pointer} < 0) {
1761 $self->{history_saveback} = $self->get_text; 1904 $self->{history_saveback} = $self->get_text;
… …
1777 } else { 1920 } else {
1778 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1779 } 1922 }
1780 1923
1781 } else { 1924 } else {
1782 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::invoke_key_down ($ev)
1926 }
1927
1783 } 1928 1
1784
1785} 1929}
1786 1930
1787############################################################################# 1931#############################################################################
1788 1932
1789package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1798 1942
1799sub new { 1943sub new {
1800 my $class = shift; 1944 my $class = shift;
1801 1945
1802 $class->SUPER::new ( 1946 $class->SUPER::new (
1803 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1804 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1805 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1806 can_hover => 1, 1951 can_hover => 1,
1807 align => 0, 1952 align => 0,
1808 valign => 0, 1953 valign => 0,
1809 can_events => 1, 1954 can_events => 1,
1810 @_ 1955 @_
1811 ) 1956 )
1812} 1957}
1813 1958
1814sub activate { }
1815
1816sub button_up { 1959sub invoke_button_up {
1817 my ($self, $ev, $x, $y) = @_; 1960 my ($self, $ev, $x, $y) = @_;
1818 1961
1819 $self->emit ("activate") 1962 $self->emit ("activate")
1820 if $x >= 0 && $x < $self->{w} 1963 if $x >= 0 && $x < $self->{w}
1821 && $y >= 0 && $y < $self->{h}; 1964 && $y >= 0 && $y < $self->{h};
1965
1966 1
1822} 1967}
1823 1968
1824sub _draw { 1969sub _draw {
1825 my ($self) = @_; 1970 my ($self) = @_;
1826 1971
1827 local $self->{fg} = $self->{fg}; 1972 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1828
1829 if ($GRAB == $self) {
1830 $self->{fg} = $self->{active_fg};
1831 }
1832 1973
1833 glEnable GL_TEXTURE_2D; 1974 glEnable GL_TEXTURE_2D;
1834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1975 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1835 glColor 0, 0, 0, 1; 1976 glColor 0, 0, 0, 1;
1836 1977
… …
1841 $self->SUPER::_draw; 1982 $self->SUPER::_draw;
1842} 1983}
1843 1984
1844############################################################################# 1985#############################################################################
1845 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
1846package CFClient::UI::CheckBox; 2023package CFClient::UI::CheckBox;
1847 2024
1848our @ISA = CFClient::UI::DrawBG::; 2025our @ISA = CFClient::UI::DrawBG::;
1849 2026
1850my @tex = 2027my @tex =
… …
1855 2032
1856sub new { 2033sub new {
1857 my $class = shift; 2034 my $class = shift;
1858 2035
1859 $class->SUPER::new ( 2036 $class->SUPER::new (
1860 padding => 2, 2037 padding_x => 2,
2038 padding_y => 2,
1861 fg => [1, 1, 1], 2039 fg => [1, 1, 1],
1862 active_fg => [1, 1, 0], 2040 active_fg => [1, 1, 0],
1863 bg => [0, 0, 0, 0.2], 2041 bg => [0, 0, 0, 0.2],
1864 active_bg => [1, 1, 1, 0.5], 2042 active_bg => [1, 1, 1, 0.5],
1865 state => 0, 2043 state => 0,
… …
1869} 2047}
1870 2048
1871sub size_request { 2049sub size_request {
1872 my ($self) = @_; 2050 my ($self) = @_;
1873 2051
1874 ($self->{padding} * 2 + 6) x 2 2052 (6) x 2
1875} 2053}
1876 2054
1877sub button_down { 2055sub invoke_button_down {
1878 my ($self, $ev, $x, $y) = @_; 2056 my ($self, $ev, $x, $y) = @_;
1879 2057
1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2058 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2059 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882 $self->{state} = !$self->{state}; 2060 $self->{state} = !$self->{state};
1883 $self->_emit (changed => $self->{state}); 2061 $self->emit (changed => $self->{state});
2062 } else {
2063 return 0
2064 }
2065
1884 } 2066 1
1885} 2067}
1886 2068
1887sub _draw { 2069sub _draw {
1888 my ($self) = @_; 2070 my ($self) = @_;
1889 2071
1890 $self->SUPER::_draw; 2072 $self->SUPER::_draw;
1891 2073
1892 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2074 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893 2075
1894 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;
1895 2079
1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2080 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897 2081
1898 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2082 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899 2083
… …
2054 2238
2055 my $h1 = $self->{h} * (1 - $ycut1); 2239 my $h1 = $self->{h} * (1 - $ycut1);
2056 my $h2 = $self->{h} * (1 - $ycut2); 2240 my $h2 = $self->{h} * (1 - $ycut2);
2057 2241
2058 glEnable GL_BLEND; 2242 glEnable GL_BLEND;
2059 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;
2060 glEnable GL_TEXTURE_2D; 2245 glEnable GL_TEXTURE_2D;
2061 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2246 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062 2247
2063 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2248 glBindTexture GL_TEXTURE_2D, $t1->{name};
2064 glBegin GL_QUADS; 2249 glBegin GL_QUADS;
… …
2164 fg => [1, 1, 1], 2349 fg => [1, 1, 1],
2165 active_fg => [0, 0, 0], 2350 active_fg => [0, 0, 0],
2166 bg => [0, 0, 0, 0.2], 2351 bg => [0, 0, 0, 0.2],
2167 active_bg => [1, 1, 1, 0.5], 2352 active_bg => [1, 1, 1, 0.5],
2168 range => [0, 0, 100, 10, 0], 2353 range => [0, 0, 100, 10, 0],
2169 req_w => $::WIDTH / 80, 2354 min_w => $::WIDTH / 80,
2170 req_h => $::WIDTH / 80, 2355 min_h => $::WIDTH / 80,
2171 vertical => 0, 2356 vertical => 0,
2172 can_hover => 1, 2357 can_hover => 1,
2173 inner_pad => 0.02, 2358 inner_pad => 0.02,
2174 @_ 2359 @_
2175 ); 2360 );
… …
2178 $self->update; 2363 $self->update;
2179 2364
2180 $self 2365 $self
2181} 2366}
2182 2367
2183sub changed { }
2184
2185sub set_range { 2368sub set_range {
2186 my ($self, $range) = @_; 2369 my ($self, $range) = @_;
2187 2370
2188 ($range, $self->{range}) = ($self->{range}, $range); 2371 ($range, $self->{range}) = ($self->{range}, $range);
2189 2372
2190 $self->update
2191 if "@$range" ne "@{$self->{range}}"; 2373 if ("@$range" ne "@{$self->{range}}") {
2374 $self->update;
2375 $self->set_value ($self->{range}[0]);
2376 }
2192} 2377}
2193 2378
2194sub set_value { 2379sub set_value {
2195 my ($self, $value) = @_; 2380 my ($self, $value) = @_;
2196 2381
… …
2207 if $unit; 2392 if $unit;
2208 2393
2209 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2394 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2210 2395
2211 if ($value != $old_value) { 2396 if ($value != $old_value) {
2212 $self->_emit (changed => $value); 2397 $self->emit (changed => $value);
2213 $self->update; 2398 $self->update;
2214 } 2399 }
2215} 2400}
2216 2401
2217sub size_request { 2402sub size_request {
2218 my ($self) = @_; 2403 my ($self) = @_;
2219 2404
2220 my $w = $self->{req_w}; 2405 ($self->{req_w}, $self->{req_h})
2221 my $h = $self->{req_h};
2222
2223 $self->{vertical} ? ($h, $w) : ($w, $h)
2224} 2406}
2225 2407
2226sub button_down { 2408sub invoke_button_down {
2227 my ($self, $ev, $x, $y) = @_; 2409 my ($self, $ev, $x, $y) = @_;
2228 2410
2229 $self->SUPER::button_down ($ev, $x, $y); 2411 $self->SUPER::invoke_button_down ($ev, $x, $y);
2230 2412
2231 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2413 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2232 2414
2233 $self->mouse_motion ($ev, $x, $y); 2415 $self->mouse_motion ($ev, $x, $y)
2234} 2416}
2235 2417
2236sub mouse_motion { 2418sub invoke_mouse_motion {
2237 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2238 2420
2239 if ($GRAB == $self) { 2421 if ($GRAB == $self) {
2240 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2422 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2241 2423
2242 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2424 my (undef, $lo, $hi, $page) = @{$self->{range}};
2243 2425
2244 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2426 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2245 2427
2246 $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
2247 } 2433 1
2248} 2434}
2249 2435
2250sub update { 2436sub update {
2251 my ($self) = @_; 2437 my ($self) = @_;
2252 2438
2253 $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}) {
2254 $self->set_value ($self->{range}[0]); 2447 $self->set_value ($self->{range}[0]);
2255 2448
2256 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2449 my ($value, $lo, $hi, $page) = @{$self->{range}};
2257 my $range = ($hi - $page - $lo) || 1e-100; 2450 my $range = ($hi - $page - $lo) || 1e-100;
2258 2451
… …
2264 $value = ($value - $lo) / $range; 2457 $value = ($value - $lo) / $range;
2265 $value = $value * $self->{scale} + $self->{offset}; 2458 $value = $value * $self->{scale} + $self->{offset};
2266 2459
2267 $self->{knob_x} = $value - $knob_w * 0.5; 2460 $self->{knob_x} = $value - $knob_w * 0.5;
2268 $self->{knob_w} = $knob_w; 2461 $self->{knob_w} = $knob_w;
2269 }); 2462 }
2270
2271 $self->SUPER::update;
2272}
2273
2274sub _draw {
2275 my ($self) = @_;
2276 2463
2277 $self->SUPER::_draw (); 2464 $self->SUPER::_draw ();
2278 2465
2279 glScale $self->{w}, $self->{h}; 2466 glScale $self->{w}, $self->{h};
2280 2467
… …
2341sub set_range { shift->{slider}->set_range (@_) } 2528sub set_range { shift->{slider}->set_range (@_) }
2342sub set_value { shift->{slider}->set_value (@_) } 2529sub set_value { shift->{slider}->set_value (@_) }
2343 2530
2344############################################################################# 2531#############################################################################
2345 2532
2346package CFClient::UI::TextView; 2533package CFClient::UI::TextScroller;
2347 2534
2348our @ISA = CFClient::UI::HBox::; 2535our @ISA = CFClient::UI::HBox::;
2349 2536
2350use CFClient::OpenGL; 2537use CFClient::OpenGL;
2351 2538
… …
2353 my $class = shift; 2540 my $class = shift;
2354 2541
2355 my $self = $class->SUPER::new ( 2542 my $self = $class->SUPER::new (
2356 fontsize => 1, 2543 fontsize => 1,
2357 can_events => 0, 2544 can_events => 0,
2545 indent => 0,
2358 #font => default_font 2546 #font => default_font
2359 @_, 2547 @_,
2360 2548
2361 layout => (new CFClient::Layout 1), 2549 layout => (new CFClient::Layout 1),
2362 par => [], 2550 par => [],
… …
2377 2565
2378 $self->{fontsize} = $fontsize; 2566 $self->{fontsize} = $fontsize;
2379 $self->reflow; 2567 $self->reflow;
2380} 2568}
2381 2569
2382sub size_allocate { 2570sub invoke_size_allocate {
2383 my ($self, $w, $h, $changed) = @_; 2571 my ($self, $w, $h) = @_;
2384
2385 $self->SUPER::size_allocate ($w, $h, $changed);
2386
2387 return unless $changed;
2388 2572
2389 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2573 $self->{layout}->set_font ($self->{font}) if $self->{font};
2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2574 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2391 $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});
2392 2577
2393 $self->reflow; 2578 $self->reflow;
2579
2580 $self->SUPER::invoke_size_allocate ($w, $h)
2394} 2581}
2395 2582
2396sub text_size { 2583sub text_size {
2397 my ($self, $text, $indent) = @_; 2584 my ($self, $text, $indent) = @_;
2398 2585
2399 my $layout = $self->{layout}; 2586 my $layout = $self->{layout};
2400 2587
2401 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2588 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2402 $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});
2403 $layout->set_markup ($text); 2591 $layout->set_markup ($text);
2404 2592
2405 $layout->size 2593 $layout->size
2406} 2594}
2407 2595
… …
2446 2634
2447 return unless $self->{h} > 0; 2635 return unless $self->{h} > 0;
2448 2636
2449 delete $self->{texture}; 2637 delete $self->{texture};
2450 2638
2451 $ROOT->on_post_alloc ($self, sub { 2639 $ROOT->on_post_alloc ($self => sub {
2452 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2640 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2453 2641
2454 if (delete $self->{need_reflow}) { 2642 if (delete $self->{need_reflow}) {
2455 my $height = 0; 2643 my $height = 0;
2456 2644
… …
2459 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2647 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2460 2648
2461 for (@{$self->{par}}) { 2649 for (@{$self->{par}}) {
2462 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2650 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2463 $layout->set_width ($W - $_->[3]); 2651 $layout->set_width ($W - $_->[3]);
2652 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2464 $layout->set_markup ($_->[4]); 2653 $layout->set_markup ($_->[4]);
2465 my ($w, $h) = $layout->size; 2654 my ($w, $h) = $layout->size;
2466 $_->[0] = $w + $_->[3]; 2655 $_->[0] = $w + $_->[3];
2467 $_->[1] = $h; 2656 $_->[1] = $h;
2468 } 2657 }
… …
2471 } 2660 }
2472 2661
2473 $self->{height} = $height; 2662 $self->{height} = $height;
2474 2663
2475 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2664 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2476 2665
2477 delete $self->{texture}; 2666 delete $self->{texture};
2478 } 2667 }
2479 2668
2480 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2669 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2481 glClearColor 0.5, 0.5, 0.5, 0; 2670 glClearColor 0, 0, 0, 0;
2482 glClear GL_COLOR_BUFFER_BIT; 2671 glClear GL_COLOR_BUFFER_BIT;
2483 2672
2484 my $top = int $self->{children}[1]{range}[0]; 2673 my $top = int $self->{children}[1]{range}[0];
2485 2674
2486 my $y0 = $top; 2675 my $y0 = $top;
… …
2500 my $h = $par->[1]; 2689 my $h = $par->[1];
2501 2690
2502 if ($y0 < $y + $h && $y < $y1) { 2691 if ($y0 < $y + $h && $y < $y1) {
2503 $layout->set_foreground (@{ $par->[2] }); 2692 $layout->set_foreground (@{ $par->[2] });
2504 $layout->set_width ($W - $par->[3]); 2693 $layout->set_width ($W - $par->[3]);
2694 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2505 $layout->set_markup ($par->[4]); 2695 $layout->set_markup ($par->[4]);
2506 2696
2507 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2697 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2508 2698
2509 glRasterPos $par->[3], $y - $y0; 2699 glRasterPos $par->[3], $y - $y0;
… …
2521sub _draw { 2711sub _draw {
2522 my ($self) = @_; 2712 my ($self) = @_;
2523 2713
2524 glEnable GL_TEXTURE_2D; 2714 glEnable GL_TEXTURE_2D;
2525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2526 glColor 1, 1, 1, 1; 2716 glColor 0, 0, 0, 1;
2527 $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});
2528 glDisable GL_TEXTURE_2D; 2718 glDisable GL_TEXTURE_2D;
2529 2719
2530 $self->{children}[1]->draw; 2720 $self->{children}[1]->draw;
2531 2721
2532} 2722}
… …
2615} 2805}
2616 2806
2617sub set_tooltip_from { 2807sub set_tooltip_from {
2618 my ($self, $widget) = @_; 2808 my ($self, $widget) = @_;
2619 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
2620 $self->add (new CFClient::UI::Label 2822 $self->add (new CFClient::UI::Label
2621 markup => $widget->{tooltip}, 2823 markup => $tooltip,
2622 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2824 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2623 fontsize => 0.8, 2825 fontsize => 0.8,
2624 fg => [0, 0, 0, 1], 2826 fg => [0, 0, 0, 1],
2625 ellipsise => 0, 2827 ellipsise => 0,
2626 font => ($widget->{tooltip_font} || $::FONT_PROP), 2828 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2633 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2835 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2634 2836
2635 ($w + 4, $h + 4) 2837 ($w + 4, $h + 4)
2636} 2838}
2637 2839
2638sub size_allocate { 2840sub invoke_size_allocate {
2639 my ($self, $w, $h, $changed) = @_; 2841 my ($self, $w, $h) = @_;
2640 2842
2641 return unless $changed;
2642
2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2843 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2844}
2845
2846sub invoke_visibility_change {
2847 my ($self, $visible) = @_;
2848
2849 return unless $visible;
2850
2851 $self->{root}->on_post_alloc ("move_$self" => sub {
2852 my $widget = $self->{owner}
2853 or return;
2854
2855 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2856
2857 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2858 if $x + $self->{w} > $self->{root}{w};
2859
2860 $self->move_abs ($x, $y);
2861 });
2644} 2862}
2645 2863
2646sub _draw { 2864sub _draw {
2647 my ($self) = @_; 2865 my ($self) = @_;
2648 2866
… …
2734 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2952 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2735 2953
2736 if ($tex) { 2954 if ($tex) {
2737 glEnable GL_TEXTURE_2D; 2955 glEnable GL_TEXTURE_2D;
2738 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2956 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2739 glColor 1, 1, 1, 1; 2957 glColor 0, 0, 0, 1;
2740 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2958 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2741 glDisable GL_TEXTURE_2D; 2959 glDisable GL_TEXTURE_2D;
2742 } 2960 }
2743} 2961}
2744 2962
2745sub DESTROY { 2963sub destroy {
2746 my ($self) = @_; 2964 my ($self) = @_;
2747 2965
2748 $self->{timer}->cancel 2966 $self->{timer}->cancel
2749 if $self->{timer}; 2967 if $self->{timer};
2750 2968
2751 $self->SUPER::DESTROY; 2969 $self->SUPER::destroy;
2752} 2970}
2753 2971
2754############################################################################# 2972#############################################################################
2755 2973
2756package CFClient::UI::Inventory; 2974package CFClient::UI::Buttonbar;
2757 2975
2758our @ISA = CFClient::UI::ScrolledWindow::; 2976our @ISA = CFClient::UI::HBox::;
2759 2977
2760sub new { 2978# TODO: should actualyl wrap buttons and other goodies.
2761 my $class = shift;
2762
2763 my $self = $class->SUPER::new (
2764 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2765 @_,
2766 );
2767
2768 $self
2769}
2770
2771sub set_items {
2772 my ($self, $items) = @_;
2773
2774 $self->{scrolled}->clear;
2775 return unless $items;
2776
2777 my @items = sort {
2778 ($a->{type} <=> $b->{type})
2779 or ($a->{name} cmp $b->{name})
2780 } @$items;
2781
2782 $self->{real_items} = \@items;
2783
2784 my $row = 0;
2785 for my $item (@items) {
2786 CFClient::Item::update_widgets $item;
2787
2788 $self->{scrolled}->add (0, $row, $item->{face_widget});
2789 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2790 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2791
2792 $row++;
2793 }
2794}
2795 2979
2796############################################################################# 2980#############################################################################
2797 2981
2798package CFClient::UI::Menu; 2982package CFClient::UI::Menu;
2799 2983
… …
2811 ); 2995 );
2812 2996
2813 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2997 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2814 2998
2815 for my $item (@{ $self->{items} }) { 2999 for my $item (@{ $self->{items} }) {
2816 my ($widget, $cb) = @$item; 3000 my ($widget, $cb, $tooltip) = @$item;
2817 3001
2818 # handle various types of items, only text for now 3002 # handle various types of items, only text for now
2819 if (!ref $widget) { 3003 if (!ref $widget) {
2820 $widget = new CFClient::UI::Label 3004 $widget = new CFClient::UI::Label
2821 can_hover => 1, 3005 can_hover => 1,
2822 can_events => 1, 3006 can_events => 1,
2823 text => $widget; 3007 markup => $widget,
3008 tooltip => $tooltip
2824 } 3009 }
2825 3010
2826 $self->{item}{$widget} = $item; 3011 $self->{item}{$widget} = $item;
2827 3012
2828 $self->{vbox}->add ($widget); 3013 $self->{vbox}->add ($widget);
… …
2833 3018
2834# 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)
2835sub popup { 3020sub popup {
2836 my ($self, $ev) = @_; 3021 my ($self, $ev) = @_;
2837 3022
2838 $self->_emit ("popdown"); 3023 $self->emit ("popdown");
2839 3024
2840 # maybe save $GRAB? must be careful about events... 3025 # maybe save $GRAB? must be careful about events...
2841 $GRAB = $self; 3026 $GRAB = $self;
2842 $self->{button} = $ev->{button}; 3027 $self->{button} = $ev->{button};
2843 3028
2844 $self->show; 3029 $self->show;
2845 $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);
2846} 3031}
2847 3032
2848sub mouse_motion { 3033sub invoke_mouse_motion {
2849 my ($self, $ev, $x, $y) = @_; 3034 my ($self, $ev, $x, $y) = @_;
2850 3035
2851 # TODO: should use vbox->find_widget or so 3036 # TODO: should use vbox->find_widget or so
2852 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3037 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2853 $self->{hover} = $self->{item}{$HOVER}; 3038 $self->{hover} = $self->{item}{$HOVER};
2854}
2855 3039
3040 0
3041}
3042
2856sub button_up { 3043sub invoke_button_up {
2857 my ($self, $ev, $x, $y) = @_; 3044 my ($self, $ev, $x, $y) = @_;
2858 3045
2859 if ($ev->{button} == $self->{button}) { 3046 if ($ev->{button} == $self->{button}) {
2860 undef $GRAB; 3047 undef $GRAB;
2861 $self->hide; 3048 $self->hide;
2862 3049
2863 $self->_emit ("popdown"); 3050 $self->emit ("popdown");
2864 $self->{hover}[1]->() if $self->{hover}; 3051 $self->{hover}[1]->() if $self->{hover};
3052 } else {
3053 return 0
3054 }
3055
2865 } 3056 1
2866} 3057}
2867 3058
2868############################################################################# 3059#############################################################################
2869 3060
2870package CFClient::UI::Statusbox; 3061package CFClient::UI::Multiplexer;
2871 3062
2872our @ISA = CFClient::UI::VBox::; 3063our @ISA = CFClient::UI::Container::;
2873 3064
2874sub new { 3065sub new {
2875 my $class = shift; 3066 my $class = shift;
2876 3067
2877 $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 (
2878 fontsize => 0.8, 3235 fontsize => 0.8,
2879 @_, 3236 @_,
2880 ) 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
2881} 3244}
2882 3245
2883sub reorder { 3246sub reorder {
2884 my ($self) = @_; 3247 my ($self) = @_;
2885 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} };
2886 3254
2887 while (my ($k, $v) = each %{ $self->{item} }) { 3255 while (my ($k, $v) = each %{ $self->{item} }) {
2888 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3256 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2889 } 3257 }
2890 3258
… …
2893 my @items = sort { 3261 my @items = sort {
2894 $a->{pri} <=> $b->{pri} 3262 $a->{pri} <=> $b->{pri}
2895 or $b->{id} <=> $a->{id} 3263 or $b->{id} <=> $a->{id}
2896 } values %{ $self->{item} }; 3264 } values %{ $self->{item} };
2897 3265
3266 $self->{timer}->interval (1);
3267
2898 my $count = 10 + 1; 3268 my $count = 10 + 1;
2899 for my $item (@items) { 3269 for my $item (@items) {
2900 last unless --$count; 3270 last unless --$count;
2901 3271
2902 push @widgets, $item->{label} ||= do { 3272 my $label = $item->{label} ||= do {
2903 # TODO: doesn't handle markup well (read as: at all) 3273 # TODO: doesn't handle markup well (read as: at all)
2904 my $short = $item->{count} > 1 3274 my $short = $item->{count} > 1
2905 ? "<b>$item->{count} ×</b> $item->{text}" 3275 ? "<b>$item->{count} ×</b> $item->{text}"
2906 : $item->{text}; 3276 : $item->{text};
2907 3277
… …
2915 tooltip => $item->{tooltip}, 3285 tooltip => $item->{tooltip},
2916 tooltip_font => $::FONT_PROP, 3286 tooltip_font => $::FONT_PROP,
2917 tooltip_width => 0.67, 3287 tooltip_width => 0.67,
2918 fontsize => $item->{fontsize} || $self->{fontsize}, 3288 fontsize => $item->{fontsize} || $self->{fontsize},
2919 max_w => $::WIDTH * 0.44, 3289 max_w => $::WIDTH * 0.44,
2920 fg => $item->{fg}, 3290 fg => [@{ $item->{fg} }],
2921 can_events => 1, 3291 can_events => 1,
2922 can_hover => 1 3292 can_hover => 1
2923 }; 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;
2924 } 3306 }
2925 3307
2926 $self->clear; 3308 $self->clear;
2927 $self->SUPER::add (reverse @widgets); 3309 $self->SUPER::add (reverse @widgets);
2928} 3310}
… …
2933 $text =~ s/^\s+//; 3315 $text =~ s/^\s+//;
2934 $text =~ s/\s+$//; 3316 $text =~ s/\s+$//;
2935 3317
2936 return unless $text; 3318 return unless $text;
2937 3319
2938 my $timeout = time + ((delete $arg{timeout}) || 60); 3320 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2939 3321
2940 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3322 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2941 3323
2942 if (my $item = $self->{item}{$group}) { 3324 if (my $item = $self->{item}{$group}) {
2943 if ($item->{text} eq $text) { 3325 if ($item->{text} eq $text) {
2944 $item->{count}++; 3326 $item->{count}++;
2945 } else { 3327 } else {
2946 $item->{count} = 1; 3328 $item->{count} = 1;
2947 $item->{text} = $item->{tooltip} = $text; 3329 $item->{text} = $item->{tooltip} = $text;
2948 } 3330 }
2949 $item->{id} = ++$self->{id}; 3331 $item->{id} += 0.2;#d#
2950 $item->{timeout} = $timeout; 3332 $item->{timeout} = $timeout;
2951 delete $item->{label}; 3333 delete $item->{label};
2952 } else { 3334 } else {
2953 $self->{item}{$group} = { 3335 $self->{item}{$group} = {
2954 id => ++$self->{id}, 3336 id => ++$self->{id},
… …
2973 3355
2974 $self->reorder; 3356 $self->reorder;
2975 $self->SUPER::reconfigure; 3357 $self->SUPER::reconfigure;
2976} 3358}
2977 3359
3360sub destroy {
3361 my ($self) = @_;
3362
3363 $self->{timer}->cancel;
3364
3365 $self->SUPER::destroy;
3366}
3367
2978############################################################################# 3368#############################################################################
2979 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
2980package CFClient::UI::Root; 3732package CFClient::UI::Root;
2981 3733
2982our @ISA = CFClient::UI::Container::; 3734our @ISA = CFClient::UI::Container::;
3735
3736use List::Util qw(min max);
2983 3737
2984use CFClient::OpenGL; 3738use CFClient::OpenGL;
2985 3739
2986sub new { 3740sub new {
2987 my $class = shift; 3741 my $class = shift;
… …
2994 Scalar::Util::weaken ($self->{root} = $self); 3748 Scalar::Util::weaken ($self->{root} = $self);
2995 3749
2996 $self 3750 $self
2997} 3751}
2998 3752
2999sub configure {
3000 my ($self, $x, $y, $w, $h) = @_;
3001
3002 $self->{w} = $w;
3003 $self->{h} = $h;
3004}
3005
3006sub reconfigure {
3007 my ($self) = @_;
3008
3009 $self->SUPER::reconfigure;
3010
3011 $self->size_allocate ($self->{w}, $self->{h}, 1)
3012 if $self->{w};
3013}
3014
3015sub size_request { 3753sub size_request {
3016 my ($self) = @_; 3754 my ($self) = @_;
3017 3755
3018 ($self->{w}, $self->{h}) 3756 ($self->{w}, $self->{h})
3019} 3757}
3020 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
3021sub size_allocate { 3773sub invoke_size_allocate {
3022 my ($self, $w, $h, $changed) = @_; 3774 my ($self, $w, $h) = @_;
3023 3775
3024 for my $child ($self->children) { 3776 for my $child ($self->children) {
3025 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)};
3026 3778
3027 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3779 $X = $child->{force_x} if exists $child->{force_x};
3028 if exists $child->{req_x}; 3780 $Y = $child->{force_y} if exists $child->{force_y};
3029 3781
3030 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3782 $X = _to_pixel $X, $W, $self->{w};
3031 if exists $child->{req_y}; 3783 $Y = _to_pixel $Y, $H, $self->{h};
3032
3033 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3034
3035 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3036 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3037 3784
3038 $child->configure ($X, $Y, $W, $H); 3785 $child->configure ($X, $Y, $W, $H);
3039 } 3786 }
3787
3788 1
3040} 3789}
3041 3790
3042sub coord2local { 3791sub coord2local {
3043 my ($self, $x, $y) = @_; 3792 my ($self, $x, $y) = @_;
3044 3793
… …
3058} 3807}
3059 3808
3060sub add { 3809sub add {
3061 my ($self, @children) = @_; 3810 my ($self, @children) = @_;
3062 3811
3063 for my $child (@children) {
3064 $child->{is_toplevel} = 1; 3812 $_->{is_toplevel} = 1
3065 3813 for @children;
3066 # integerise window positions
3067 $child->{x} = int $child->{x};
3068 $child->{y} = int $child->{y};
3069 }
3070 3814
3071 $self->SUPER::add (@children); 3815 $self->SUPER::add (@children);
3072} 3816}
3073 3817
3074sub remove { 3818sub remove {
3075 my ($self, @children) = @_; 3819 my ($self, @children) = @_;
3076 3820
3077 $self->SUPER::remove (@children); 3821 $self->SUPER::remove (@children);
3822
3823 delete $self->{is_toplevel}
3824 for @children;
3078 3825
3079 while (@children) { 3826 while (@children) {
3080 my $w = pop @children; 3827 my $w = pop @children;
3081 push @children, $w->children; 3828 push @children, $w->children;
3082 $w->set_invisible; 3829 $w->set_invisible;
… …
3102 $_->() 3849 $_->()
3103 for values %{delete $self->{refresh_hook}}; 3850 for values %{delete $self->{refresh_hook}};
3104 } 3851 }
3105 3852
3106 if ($self->{realloc}) { 3853 if ($self->{realloc}) {
3854 my %queue;
3107 my @queue; 3855 my @queue;
3856 my $widget;
3108 3857
3858 outer:
3109 while () { 3859 while () {
3110 if ($self->{realloc}) { 3860 if (my $realloc = delete $self->{realloc}) {
3111 #TODO use array-of-depth approach 3861 for $widget (values %$realloc) {
3862 $widget->{visible} or next; # do not resize invisible widgets
3112 3863
3113 @queue = sort { $a->{visible} <=> $b->{visible} } 3864 $queue{$widget+0}++ and next; # duplicates are common
3114 @queue, values %{delete $self->{realloc}}; 3865
3866 push @{ $queue[$widget->{visible}] }, $widget;
3867 }
3115 } 3868 }
3116 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 () {
3117 my $widget = pop @queue || last; 3917 my $widget = pop @queue || last;
3118 3918
3119 $widget->{visible} or last; # do not resize invisible widgets 3919 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3120
3121 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3122 ? @$widget{qw(def_w def_h)}
3123 : $widget->size_request;
3124
3125 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3126
3127 $widget->{req_w} = $w;
3128 $widget->{req_h} = $h;
3129
3130 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3131
3132 push @queue, $widget->{parent}
3133 if $widget->{parent};
3134 }
3135 }
3136
3137 while (my $size_alloc = delete $self->{size_alloc}) {
3138 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3139 values %$size_alloc;
3140
3141 while () {
3142 my ($widget, $w, $h) = @{ pop @queue or last };
3143 3920
3144 $w = 0 if $w < 0; 3921 $w = 0 if $w < 0;
3145 $h = 0 if $h < 0; 3922 $h = 0 if $h < 0;
3146 3923
3147 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3924 $w = int $w + 0.5;
3925 $h = int $h + 0.5;
3148 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
3149 $widget->{w} = $w; 3931 $widget->{w} = $w;
3150 $widget->{h} = $h; 3932 $widget->{h} = $h;
3151 3933
3152 $widget->emit (size_allocate => $w, $h, $changed); 3934 $widget->emit (size_allocate => $w, $h);
3935 }
3153 } 3936 }
3154 } 3937 }
3155 3938
3156 while ($self->{post_alloc_hook}) { 3939 while ($self->{post_alloc_hook}) {
3157 $_->() 3940 $_->()
3158 for values %{delete $self->{post_alloc_hook}}; 3941 for values %{delete $self->{post_alloc_hook}};
3159 } 3942 }
3943
3160 3944
3161 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3945 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3162 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3946 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3163 glClear GL_COLOR_BUFFER_BIT; 3947 glClear GL_COLOR_BUFFER_BIT;
3164 3948
… …
3166 glLoadIdentity; 3950 glLoadIdentity;
3167 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3951 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3168 glMatrixMode GL_MODELVIEW; 3952 glMatrixMode GL_MODELVIEW;
3169 glLoadIdentity; 3953 glLoadIdentity;
3170 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
3171 $self->_draw; 3962 $self->_draw;
3172} 3963}
3173 3964
3174############################################################################# 3965#############################################################################
3175 3966

Diff Legend

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