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.319 by root, Sun Jul 2 21:07:26 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 {
333 require Carp; 336 require Carp;
334 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
335} 338}
336 339
340sub baseline_shift {
341 0
342}
343
337sub configure { 344sub configure {
338 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
339 346
340 if ($self->{aspect}) { 347 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h);
349
341 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 350 $w = List::Util::min $w, int $h * $self->{aspect};
342 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 351 $h = List::Util::min $h, int $w / $self->{aspect};
343 352
344 # use alignment to adjust x, y 353 # use alignment to adjust x, y
345 354
346 $x += int +($w - $w2) * 0.5; 355 $x += int 0.5 * ($ow - $w);
347 $y += int +($h - $h2) * 0.5; 356 $y += int 0.5 * ($oh - $h);
348
349 ($w, $h) = ($w2, $h2);
350 } 357 }
351 358
352 if ($self->{x} != $x || $self->{y} != $y) { 359 if ($self->{x} ne $x || $self->{y} ne $y) {
353 $self->{x} = $x; 360 $self->{x} = $x;
354 $self->{y} = $y; 361 $self->{y} = $y;
355 $self->update; 362 $self->update;
356 } 363 }
357 364
358 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
359 return unless $self->{visible}; 366 return unless $self->{visible};
360 367
368 $self->{alloc_w} = $w;
369 $self->{alloc_h} = $h;
370
361 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 371 $self->{root}{size_alloc}{$self+0} = $self;
362 } 372 }
363}
364
365sub size_allocate {
366 # nothing to be done
367} 373}
368 374
369sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
370} 381}
371 382
372sub set_max_size { 383sub set_max_size {
373 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
374 385
375 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
376 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
377} 390}
378 391
379sub set_tooltip { 392sub set_tooltip {
380 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
381 394
… …
386 399
387 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
388 401
389 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
390 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
391 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
392 } 405 }
393} 406}
394 407
395# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
396sub coord2local { 409sub coord2local {
… …
404 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
405 418
406 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
407} 420}
408 421
409sub focus_in { 422sub invoke_focus_in {
410 my ($self) = @_; 423 my ($self) = @_;
411 424
412 return if $FOCUS == $self; 425 return if $FOCUS == $self;
413 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
414 427
415 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
416 429
417 $self->_emit (focus_in => $focus); 430 $self->update;
418 431
419 $focus->update if $focus; 432 0
420 $FOCUS->update;
421} 433}
422 434
423sub focus_out { 435sub invoke_focus_out {
424 my ($self) = @_; 436 my ($self) = @_;
425 437
426 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
427 439
428 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
429 441
430 $self->_emit (focus_out => $focus); 442 $self->update;
431 443
432 $focus->update if $focus; #?
433
434 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
435 unless $FOCUS; 445 unless $FOCUS;
436}
437 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
438sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
439sub button_up { } 458sub invoke_button_up { 1 }
440sub key_down { } 459sub invoke_key_down { 1 }
441sub key_up { } 460sub invoke_key_up { 1 }
442 461
443sub button_down { 462sub invoke_button_down {
444 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
445 464
446 $self->focus_in; 465 $self->grab_focus;
447}
448 466
449sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
450sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
451sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
452sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
453sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483}
454 484
455sub find_widget { 485sub find_widget {
456 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
457 487
458 return () unless $self->{can_events}; 488 return () unless $self->{can_events};
… …
466 496
467sub set_parent { 497sub set_parent {
468 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
469 499
470 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
471
472 $self->set_visible if $parent->{visible}; 501 $self->set_visible if $parent->{visible};
473} 502}
474 503
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 { 504sub realloc {
499 my ($self) = @_; 505 my ($self) = @_;
500 506
501 if ($self->{visible}) { 507 if ($self->{visible}) {
502 return if $self->{root}{realloc}{$self}; 508 return if $self->{root}{realloc}{$self+0};
503 509
504 $self->{root}{realloc}{$self} = $self; 510 $self->{root}{realloc}{$self+0} = $self;
505 $self->{root}->update; 511 $self->{root}->update;
506 } else { 512 } else {
507 delete $self->{req_w}; 513 delete $self->{req_w};
514 delete $self->{req_h};
508 } 515 }
509} 516}
510 517
511sub update { 518sub update {
512 my ($self) = @_; 519 my ($self) = @_;
513 520
514 $self->{parent}->update 521 $self->{parent}->update
515 if $self->{parent}; 522 if $self->{parent};
516} 523}
517 524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
535
518sub draw { 536sub draw {
519 my ($self) = @_; 537 my ($self) = @_;
520 538
521 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
522 548
523 glPushMatrix; 549 glPushMatrix;
524 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
525 $self->_draw;
526 glPopMatrix;
527 551
528 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
529 my ($x, $y) = @$self{qw(x y)};
530
531 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
532 glEnable GL_BLEND; 554 glEnable GL_BLEND;
533 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
534 glBegin GL_QUADS; 556 glBegin GL_QUADS;
535 glVertex $x , $y; 557 glVertex 0 , 0;
536 glVertex $x + $self->{w}, $y; 558 glVertex $self->{w}, 0;
537 glVertex $x + $self->{w}, $y + $self->{h}; 559 glVertex $self->{w}, $self->{h};
538 glVertex $x , $y + $self->{h}; 560 glVertex 0 , $self->{h};
539 glEnd; 561 glEnd;
540 glDisable GL_BLEND; 562 glDisable GL_BLEND;
541 } 563 }
542 564
543 if ($ENV{PCLIENT_DEBUG}) { 565 if ($ENV{CFPLUS_DEBUG} & 1) {
544 glPushMatrix; 566 glPushMatrix;
545 glColor 1, 1, 0, 1; 567 glColor 1, 1, 0, 1;
546 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 568 glTranslate 0.375, 0.375;
547 glBegin GL_LINE_LOOP; 569 glBegin GL_LINE_LOOP;
548 glVertex 0 , 0; 570 glVertex 0 , 0;
549 glVertex $self->{w} - 1, 0; 571 glVertex $self->{w} - 1, 0;
550 glVertex $self->{w} - 1, $self->{h} - 1; 572 glVertex $self->{w} - 1, $self->{h} - 1;
551 glVertex 0 , $self->{h} - 1; 573 glVertex 0 , $self->{h} - 1;
552 glEnd; 574 glEnd;
553 glPopMatrix; 575 glPopMatrix;
554 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
555 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
556} 581}
557 582
558sub _draw { 583sub _draw {
559 my ($self) = @_; 584 my ($self) = @_;
560 585
… …
563 588
564sub DESTROY { 589sub DESTROY {
565 my ($self) = @_; 590 my ($self) = @_;
566 591
567 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
568 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
569} 596}
570 597
571############################################################################# 598#############################################################################
572 599
573package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
598 625
599 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
600 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
601 628
602 glEnable GL_BLEND; 629 glEnable GL_BLEND;
603 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
604 glColor @$color; 631 glColor_premultiply @$color;
605 632
606 glBegin GL_QUADS; 633 glBegin GL_QUADS;
607 glVertex 0 , 0; 634 glVertex 0 , 0;
608 glVertex 0 , $h; 635 glVertex 0 , $h;
609 glVertex $w, $h; 636 glVertex $w, $h;
… …
624 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
625 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
626} 653}
627 654
628sub size_request { 655sub size_request {
629 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
630} 659}
631 660
632sub draw { } 661sub draw { }
633 662
634############################################################################# 663#############################################################################
… …
638our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
639 668
640sub new { 669sub new {
641 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
642 671
643 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
644 673
645 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
646 children => [], 675 children => [],
647 can_events => 0, 676 can_events => 0,
648 %arg, 677 %arg,
649 ); 678 );
679
650 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
651 682
652 $self 683 $self
653} 684}
654 685
655sub add { 686sub add {
… …
703 $x -= $self->{x}; 734 $x -= $self->{x};
704 $y -= $self->{y}; 735 $y -= $self->{y};
705 736
706 my $res; 737 my $res;
707 738
708 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
709 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
710 and return $res; 741 and return $res;
711 } 742 }
712 743
713 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
734} 765}
735 766
736sub add { 767sub add {
737 my ($self, $child) = @_; 768 my ($self, $child) = @_;
738 769
739 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
740
741 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
742} 772}
743 773
744sub remove { 774sub remove {
745 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
754 784
755sub size_request { 785sub size_request {
756 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
757} 787}
758 788
759sub size_allocate { 789sub invoke_size_allocate {
760 my ($self, $w, $h, $changed) = @_; 790 my ($self, $w, $h) = @_;
761 791
762 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
763} 795}
764 796
765############################################################################# 797#############################################################################
798
799# back-buffered drawing area
766 800
767package CFClient::UI::Window; 801package CFClient::UI::Window;
768 802
769our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
770 804
… …
781 815
782 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
783 $self->SUPER::update; 817 $self->SUPER::update;
784} 818}
785 819
786sub size_allocate { 820sub invoke_size_allocate {
787 my ($self, $w, $h, $changed) = @_; 821 my ($self, $w, $h) = @_;
788 822
789 $self->SUPER::size_allocate ($w, $h, $changed);
790 $self->update 823 $self->update;
791 if $changed; 824
825 $self->SUPER::invoke_size_allocate ($w, $h)
792} 826}
793 827
794sub _render { 828sub _render {
829 my ($self) = @_;
830
795 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
796} 832}
797 833
798sub render_child { 834sub render_child {
799 my ($self) = @_; 835 my ($self) = @_;
800 836
801 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
802 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
803 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
804 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
805 $self->_render; 848 $self->_render;
806 }; 849 };
807} 850}
808 851
809sub _draw { 852sub _draw {
810 my ($self) = @_; 853 my ($self) = @_;
811 854
812 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
813 856
814 my $tex = $self->{texture} 857 my $tex = $self->{texture}
815 or return; 858 or return;
816 859
817 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
818 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
819 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
820 863
821 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
822 865
823 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
824} 867}
… …
840} 883}
841 884
842sub size_request { 885sub size_request {
843 my ($self) = @_; 886 my ($self) = @_;
844 887
845 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
846 889
847 $w = 10 if $self->{scroll_x}; 890 $w = 10 if $self->{scroll_x};
848 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
849 892
850 ($w, $h) 893 ($w, $h)
851} 894}
852 895
853sub size_allocate { 896sub invoke_size_allocate {
854 my ($self, $w, $h, $changed) = @_; 897 my ($self, $w, $h) = @_;
855 898
899 my $child = $self->child;
900
856 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
857 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
858 903
859 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
860 $self->update; 905 $self->update;
906
907 1
861} 908}
862 909
863sub set_offset { 910sub set_offset {
864 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
865 912
… …
898} 945}
899 946
900sub _render { 947sub _render {
901 my ($self) = @_; 948 my ($self) = @_;
902 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
903 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
904 954
905 $self->SUPER::_render; 955 $self->SUPER::_render;
906} 956}
907 957
… …
910package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
911 961
912our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
913 963
914sub new { 964sub new {
915 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
916 968
917 my $self; 969 my $self;
918 970
919 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
920 vertical => 1, 972 vertical => 1,
… …
925 ; 977 ;
926 978
927 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
928 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
929 slider => $slider, 981 slider => $slider,
930 @_, 982 %arg,
931 ); 983 );
932 984
933 $self->{vp}->add ($self->{scrolled});
934 $self->add ($self->{vp});
935 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
936 987
937 $self 988 $self
938} 989}
939 990
991#TODO# update range on size_allocate depending on child
992
993sub add {
994 my ($self, $widget) = @_;
995
996 $self->{vp}->add ($self->{child} = $widget);
997}
998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
940sub update { 1005sub update {
941 my ($self) = @_; 1006 my ($self) = @_;
942 1007
943 $self->SUPER::update; 1008 $self->SUPER::update;
944 1009
945 # todo: overwrite size_allocate of child 1010 $self->update_slider;
946 my $child = $self->{vp}->child;
947 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
948} 1011}
949 1012
950sub size_allocate { 1013sub invoke_size_allocate {
951 my ($self, $w, $h, $changed) = @_; 1014 my ($self, $w, $h) = @_;
952 1015
1016 $self->update_slider;
1017
953 $self->SUPER::size_allocate ($w, $h, $changed); 1018 $self->SUPER::invoke_size_allocate ($w, $h)
954
955 my $child = $self->{vp}->child;
956 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
957} 1019}
958
959#TODO# update range on size_allocate depending on child
960# update viewport offset on scroll
961 1020
962############################################################################# 1021#############################################################################
963 1022
964package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
965 1024
… …
981 1040
982 if ($self->{bg}) { 1041 if ($self->{bg}) {
983 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
984 1043
985 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
986 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
987 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
988 1047
989 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
990 glVertex 0 , 0; 1049 glVertex 0 , 0;
991 glVertex 0 , $h; 1050 glVertex 0 , $h;
992 glVertex $w, $h; 1051 glVertex $w, $h;
… …
1005 1064
1006our @ISA = CFClient::UI::Bin::; 1065our @ISA = CFClient::UI::Bin::;
1007 1066
1008use CFClient::OpenGL; 1067use CFClient::OpenGL;
1009 1068
1010my @tex = 1069my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1;
1072
1073my @border =
1011 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 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); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1013 1076
1014sub new { 1077sub new {
1015 my $class = shift; 1078 my ($class, %arg) = @_;
1016 1079
1017 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
1018 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
1019 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
1020 border => 0.6, 1083 border => 0.6,
1021 is_toplevel => 1,
1022 can_events => 1, 1084 can_events => 1,
1023 @_ 1085 min_w => 16,
1086 min_h => 16,
1087 %arg,
1024 ); 1088 );
1025 1089
1026 $self->{title} &&= new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
1027 align => 0, 1091 align => 0,
1028 valign => 1, 1092 valign => 1,
1029 text => $self->{title}, 1093 text => $self->{title},
1030 fontsize => $self->{border}; 1094 fontsize => $self->{border},
1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
1031 1105
1032 $self 1106 $self
1107}
1108
1109sub add {
1110 my ($self, @widgets) = @_;
1111
1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1033} 1115}
1034 1116
1035sub border { 1117sub border {
1036 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1037} 1119}
1038 1120
1039sub size_request { 1121sub size_request {
1040 my ($self) = @_; 1122 my ($self) = @_;
1123
1124 $self->{title_widget}->size_request
1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
1041 1129
1042 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1043 1131
1044 ( 1132 (
1045 $w + $self->border * 2, 1133 $w + $self->border * 2,
1046 $h + $self->border * 2, 1134 $h + $self->border * 2,
1047 ) 1135 )
1048} 1136}
1049 1137
1050sub size_allocate { 1138sub invoke_size_allocate {
1051 my ($self, $w, $h, $changed) = @_; 1139 my ($self, $w, $h) = @_;
1052 1140
1053 return unless $changed; 1141 if ($self->{title_widget}) {
1142 $self->{title_widget}{w} = $w;
1143 $self->{title_widget}{h} = $h;
1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1145 }
1054 1146
1147 my $border = $self->border;
1148
1055 $h -= List::Util::max 0, $self->border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1056 $w -= List::Util::max 0, $self->border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1057 1151
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); 1152 $self->child->configure ($border, $border, $w, $h);
1062}
1063 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1164
1165 1
1166}
1167
1064sub button_down { 1168sub invoke_button_down {
1065 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1066 1170
1067 my ($w, $h) = @$self{qw(w h)}; 1171 my ($w, $h) = @$self{qw(w h)};
1068 my $border = $self->border; 1172 my $border = $self->border;
1069 1173
… …
1082 my ($ev, $x, $y) = @_; 1186 my ($ev, $x, $y) = @_;
1083 1187
1084 my $dx = $ev->{x} - $ox; 1188 my $dx = $ev->{x} - $ox;
1085 my $dy = $ev->{y} - $oy; 1189 my $dy = $ev->{y} - $oy;
1086 1190
1087 $self->{user_x} = $wx + $dx * $mx;
1088 $self->{user_y} = $wy + $dy * $my;
1089 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1191 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1090 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1192 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1091 $self->move ($self->{user_x}, $self->{user_y}); 1193
1194 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1092 $self->realloc; 1195 $self->realloc;
1093 }; 1196 };
1094 1197
1095 } elsif ($lr ^ $td) { 1198 } elsif ($lr ^ $td) {
1096 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1199 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1099 $self->{motion} = sub { 1202 $self->{motion} = sub {
1100 my ($ev, $x, $y) = @_; 1203 my ($ev, $x, $y) = @_;
1101 1204
1102 ($x, $y) = ($ev->{x}, $ev->{y}); 1205 ($x, $y) = ($ev->{x}, $ev->{y});
1103 1206
1104 $self->{user_x} = $bx + $x - $ox; 1207 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1105 $self->{user_y} = $by + $y - $oy; 1208 # HACK: the next line is required to enforce placement
1106 1209 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1107 $self->move ($self->{user_x}, $self->{user_y});
1108 $self->realloc;
1109 }; 1210 };
1211 } else {
1212 return 0;
1213 }
1214
1110 } 1215 1
1111} 1216}
1112 1217
1113sub button_up { 1218sub invoke_button_up {
1114 my ($self, $ev, $x, $y) = @_; 1219 my ($self, $ev, $x, $y) = @_;
1115 1220
1116 delete $self->{motion}; 1221 ! ! delete $self->{motion}
1117} 1222}
1118 1223
1119sub mouse_motion { 1224sub invoke_mouse_motion {
1120 my ($self, $ev, $x, $y) = @_; 1225 my ($self, $ev, $x, $y) = @_;
1121 1226
1122 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1227 $self->{motion}->($ev, $x, $y) if $self->{motion};
1228
1229 ! ! $self->{motion}
1123} 1230}
1124 1231
1125sub _draw { 1232sub _draw {
1126 my ($self) = @_; 1233 my ($self) = @_;
1127 1234
1235 my $child = $self->{children}[0];
1236
1128 my ($w, $h ) = ($self->{w}, $self->{h}); 1237 my ($w, $h ) = ($self->{w}, $self->{h});
1129 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1238 my ($cw, $ch) = ($child->{w}, $child->{h});
1130 1239
1131 glEnable GL_TEXTURE_2D; 1240 glEnable GL_TEXTURE_2D;
1132 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1241 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1133 1242
1134 my $border = $self->border; 1243 my $border = $self->border;
1135 1244
1136 glColor @{ $self->{border_bg} }; 1245 glColor @{ $self->{border_bg} };
1137 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1246 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1138 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1247 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1139 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1248 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1140 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1249 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1141 1250
1142 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1251 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1143 my $bg = $tex[0]; 1252 glColor @{ $self->{bg} };
1144 1253
1145 # TODO: repeat texture not scale 1254 # TODO: repeat texture not scale
1255 # solve this better(?)
1146 my $rep_x = $cw / $bg->{w}; 1256 $bg->{s} = $cw / $bg->{w};
1147 my $rep_y = $ch / $bg->{h}; 1257 $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); 1258 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1155 } 1259 }
1156 1260
1157 glDisable GL_TEXTURE_2D; 1261 glDisable GL_TEXTURE_2D;
1158 1262
1159 $self->{title}->draw if $self->{title};
1160
1161 $self->child->draw; 1263 $child->draw;
1264
1265 if ($self->{title_widget}) {
1266 glTranslate 0, $border - $self->{h};
1267 $self->{title_widget}->_draw;
1268
1269 glTranslate 0, - ($border - $self->{h});
1270 }
1271
1272 $self->{close_button}->draw
1273 if $self->{close_button};
1162} 1274}
1163 1275
1164############################################################################# 1276#############################################################################
1165 1277
1166package CFClient::UI::Table; 1278package CFClient::UI::Table;
… …
1189 1301
1190 $child->set_parent ($self); 1302 $child->set_parent ($self);
1191 $self->{children}[$y][$x] = $child; 1303 $self->{children}[$y][$x] = $child;
1192 1304
1193 $self->realloc; 1305 $self->realloc;
1306}
1307
1308sub remove {
1309 my ($self, $child) = @_;
1310
1311 # TODO: not yet implemented
1194} 1312}
1195 1313
1196# TODO: move to container class maybe? send children a signal on removal? 1314# TODO: move to container class maybe? send children a signal on removal?
1197sub clear { 1315sub clear {
1198 my ($self) = @_; 1316 my ($self) = @_;
… …
1239 (sum @$ws), 1357 (sum @$ws),
1240 (sum @$hs), 1358 (sum @$hs),
1241 ) 1359 )
1242} 1360}
1243 1361
1244sub size_allocate { 1362sub invoke_size_allocate {
1245 my ($self, $w, $h, $changed) = @_; 1363 my ($self, $w, $h) = @_;
1246 1364
1247 my ($ws, $hs) = $self->get_wh; 1365 my ($ws, $hs) = $self->get_wh;
1248 1366
1249 my $req_w = (sum @$ws) || 1; 1367 my $req_w = (sum @$ws) || 1;
1250 my $req_h = (sum @$hs) || 1; 1368 my $req_h = (sum @$hs) || 1;
… …
1281 } 1399 }
1282 1400
1283 $y += $row_h; 1401 $y += $row_h;
1284 } 1402 }
1285 1403
1404 1
1286} 1405}
1287 1406
1288sub find_widget { 1407sub find_widget {
1289 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1290 1409
… …
1327 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1447 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 ) 1448 )
1330} 1449}
1331 1450
1332sub size_allocate { 1451sub invoke_size_allocate {
1333 my ($self, $w, $h, $changed) = @_; 1452 my ($self, $w, $h) = @_;
1334 1453
1335 my $space = $self->{vertical} ? $h : $w; 1454 my $space = $self->{vertical} ? $h : $w;
1336 my $children = $self->{children}; 1455 my @children = $self->visible_children;
1337 1456
1338 my @req; 1457 my @req;
1339 1458
1340 if ($self->{homogeneous}) { 1459 if ($self->{homogeneous}) {
1341 @req = ($space / (@$children || 1)) x @$children; 1460 @req = ($space / (@children || 1)) x @children;
1342 } else { 1461 } else {
1343 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1344 my $req = List::Util::sum @req; 1463 my $req = List::Util::sum @req;
1345 1464
1346 if ($req > $space) { 1465 if ($req > $space) {
1347 # ah well, not enough space 1466 # ah well, not enough space
1348 $_ *= $space / $req for @req; 1467 $_ *= $space / $req for @req;
1349 } else { 1468 } else {
1350 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1351 1470
1352 $space = ($space - $req) / $expand; # remaining space to give away 1471 $space = ($space - $req) / $expand; # remaining space to give away
1353 1472
1354 $req[$_] += $space * $children->[$_]{expand} 1473 $req[$_] += $space * $children[$_]{expand}
1355 for 0 .. $#$children; 1474 for 0 .. $#children;
1356 } 1475 }
1357 } 1476 }
1358 1477
1359 CFClient::UI::harmonize \@req; 1478 CFClient::UI::harmonize \@req;
1360 1479
1361 my $pos = 0; 1480 my $pos = 0;
1362 for (0 .. $#$children) { 1481 for (0 .. $#children) {
1363 my $alloc = $req[$_]; 1482 my $alloc = $req[$_];
1364 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1365 1484
1366 $pos += $alloc; 1485 $pos += $alloc;
1367 } 1486 }
1368 1487
1369 1 1488 1
… …
1421 ellipsise => 3, # end 1540 ellipsise => 3, # end
1422 layout => (new CFClient::Layout), 1541 layout => (new CFClient::Layout),
1423 fontsize => 1, 1542 fontsize => 1,
1424 align => -1, 1543 align => -1,
1425 valign => -1, 1544 valign => -1,
1426 padding => 2, 1545 padding_x => 2,
1546 padding_y => 2,
1427 can_events => 0, 1547 can_events => 0,
1428 %arg 1548 %arg
1429 ); 1549 );
1430 1550
1431 if (exists $self->{template}) { 1551 if (exists $self->{template}) {
… …
1458 1578
1459 delete $self->{texture}; 1579 delete $self->{texture};
1460 $self->SUPER::update; 1580 $self->SUPER::update;
1461} 1581}
1462 1582
1583sub realloc {
1584 my ($self) = @_;
1585
1586 delete $self->{ox};
1587 $self->SUPER::realloc;
1588}
1589
1463sub set_text { 1590sub set_text {
1464 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1465 1592
1466 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1467 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1468 1595
1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1596 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1470 $self->{layout}->set_text ($text); 1597 $self->{layout}->set_text ($text);
1471 1598
1599 delete $self->{size_req};
1472 $self->realloc; 1600 $self->realloc;
1473 $self->update; 1601 $self->update;
1474} 1602}
1475 1603
1476sub set_markup { 1604sub set_markup {
… …
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1610 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1611
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1612 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485 $self->{layout}->set_markup ($markup); 1613 $self->{layout}->set_markup ($markup);
1486 1614
1615 delete $self->{size_req};
1487 $self->realloc; 1616 $self->realloc;
1488 $self->update; 1617 $self->update;
1489} 1618}
1490 1619
1491sub size_request { 1620sub size_request {
1492 my ($self) = @_; 1621 my ($self) = @_;
1493 1622
1623 $self->{size_req} ||= do {
1494 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1624 $self->{layout}->set_font ($self->{font}) if $self->{font};
1495 $self->{layout}->set_width ($self->{max_w} || -1); 1625 $self->{layout}->set_width ($self->{max_w} || -1);
1496 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1626 $self->{layout}->set_ellipsise ($self->{ellipsise});
1497 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1627 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1498 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1628 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1499 1629
1500 my ($w, $h) = $self->{layout}->size; 1630 my ($w, $h) = $self->{layout}->size;
1501 1631
1502 if (exists $self->{template}) { 1632 if (exists $self->{template}) {
1503 $self->{template}->set_font ($self->{font}) if $self->{font}; 1633 $self->{template}->set_font ($self->{font}) if $self->{font};
1504 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1634 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1505 1635
1506 my ($w2, $h2) = $self->{template}->size; 1636 my ($w2, $h2) = $self->{template}->size;
1507 1637
1508 $w = List::Util::max $w, $w2; 1638 $w = List::Util::max $w, $w2;
1509 $h = List::Util::max $h, $h2; 1639 $h = List::Util::max $h, $h2;
1640 }
1641
1642 [$w, $h]
1510 } 1643 };
1511 1644
1512 ( 1645 @{ $self->{size_req} }
1513 $w + $self->{padding} * 2,
1514 $h + $self->{padding} * 2,
1515 )
1516} 1646}
1517 1647
1648sub baseline_shift {
1649 $_[0]{layout}->descent
1650}
1651
1518sub size_allocate { 1652sub invoke_size_allocate {
1519 my ($self, $w, $h, $changed) = @_; 1653 my ($self, $w, $h) = @_;
1654
1655 delete $self->{ox};
1520 1656
1521 delete $self->{texture} 1657 delete $self->{texture}
1522 if $changed; 1658 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1659
1660 1
1523} 1661}
1524 1662
1525sub set_fontsize { 1663sub set_fontsize {
1526 my ($self, $fontsize) = @_; 1664 my ($self, $fontsize) = @_;
1527 1665
1528 $self->{fontsize} = $fontsize; 1666 $self->{fontsize} = $fontsize;
1667 delete $self->{size_req};
1529 delete $self->{texture}; 1668 delete $self->{texture};
1530 1669
1531 $self->realloc; 1670 $self->realloc;
1671}
1672
1673sub reconfigure {
1674 my ($self) = @_;
1675
1676 delete $self->{size_req};
1677
1678 $self->SUPER::reconfigure;
1532} 1679}
1533 1680
1534sub _draw { 1681sub _draw {
1535 my ($self) = @_; 1682 my ($self) = @_;
1536 1683
… …
1542 $self->{layout}->set_width ($self->{w}); 1689 $self->{layout}->set_width ($self->{w});
1543 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1690 $self->{layout}->set_ellipsise ($self->{ellipsise});
1544 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546 1693
1547 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1694 new_from_layout CFClient::Texture $self->{layout}
1695 };
1548 1696
1697 unless (exists $self->{ox}) {
1549 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1550 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1699 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1551 : ($self->{w} - $tex->{w}) * 0.5); 1700 : ($self->{w} - $tex->{w}) * 0.5);
1552 1701
1553 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1554 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1703 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1555 : ($self->{h} - $tex->{h}) * 0.5); 1704 : ($self->{h} - $tex->{h}) * 0.5);
1556
1557 $tex
1558 }; 1705 };
1559 1706
1560 glEnable GL_TEXTURE_2D; 1707 glEnable GL_TEXTURE_2D;
1561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1708
1709 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1710 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1562 1711
1563 if ($tex->{format} == GL_ALPHA) { 1712 if ($tex->{format} == GL_ALPHA) {
1713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1564 glColor @{$self->{fg}}; 1714 glColor @{$self->{fg}};
1565 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1715 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1566 } else { 1716 } else {
1717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1567 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1718 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1568 } 1719 }
1569 1720
1570 glDisable GL_TEXTURE_2D; 1721 glDisable GL_TEXTURE_2D;
1571} 1722}
1572 1723
… …
1589 can_hover => 1, 1740 can_hover => 1,
1590 can_focus => 1, 1741 can_focus => 1,
1591 valign => 0, 1742 valign => 0,
1592 can_events => 1, 1743 can_events => 1,
1593 #text => ... 1744 #text => ...
1745 #hidden => "*",
1594 @_ 1746 @_
1595 ) 1747 )
1596} 1748}
1597 1749
1598sub _set_text { 1750sub _set_text {
… …
1600 1752
1601 delete $self->{cur_h}; 1753 delete $self->{cur_h};
1602 1754
1603 return if $self->{text} eq $text; 1755 return if $self->{text} eq $text;
1604 1756
1605 delete $self->{texture};
1606
1607 $self->{last_activity} = $::NOW; 1757 $self->{last_activity} = $::NOW;
1608 $self->{text} = $text; 1758 $self->{text} = $text;
1609 1759
1610 $text =~ s/./*/g if $self->{hidden}; 1760 $text =~ s/./*/g if $self->{hidden};
1611 $self->{layout}->set_text ("$text "); 1761 $self->{layout}->set_text ("$text ");
1762 delete $self->{size_req};
1612 1763
1613 $self->_emit (changed => $self->{text}); 1764 $self->emit (changed => $self->{text});
1765
1766 $self->realloc;
1767 $self->update;
1614} 1768}
1615 1769
1616sub set_text { 1770sub set_text {
1617 my ($self, $text) = @_; 1771 my ($self, $text) = @_;
1618 1772
1619 $self->{cursor} = length $text; 1773 $self->{cursor} = length $text;
1620 $self->_set_text ($text); 1774 $self->_set_text ($text);
1621
1622 $self->realloc;
1623} 1775}
1624 1776
1625sub get_text { 1777sub get_text {
1626 $_[0]{text} 1778 $_[0]{text}
1627} 1779}
… …
1632 my ($w, $h) = $self->SUPER::size_request; 1784 my ($w, $h) = $self->SUPER::size_request;
1633 1785
1634 ($w + 1, $h) # add 1 for cursor 1786 ($w + 1, $h) # add 1 for cursor
1635} 1787}
1636 1788
1637sub key_down { 1789sub invoke_key_down {
1638 my ($self, $ev) = @_; 1790 my ($self, $ev) = @_;
1639 1791
1640 my $mod = $ev->{mod}; 1792 my $mod = $ev->{mod};
1641 my $sym = $ev->{sym}; 1793 my $sym = $ev->{sym};
1642 my $uni = $ev->{unicode}; 1794 my $uni = $ev->{unicode};
… …
1654 } elsif ($sym == CFClient::SDLK_HOME) { 1806 } elsif ($sym == CFClient::SDLK_HOME) {
1655 $self->{cursor} = 0; 1807 $self->{cursor} = 0;
1656 } elsif ($sym == CFClient::SDLK_END) { 1808 } elsif ($sym == CFClient::SDLK_END) {
1657 $self->{cursor} = length $text; 1809 $self->{cursor} = length $text;
1658 } elsif ($uni == 27) { 1810 } elsif ($uni == 27) {
1659 $self->_emit ('escape'); 1811 $self->emit ('escape');
1660 } elsif ($uni) { 1812 } elsif ($uni) {
1661 substr $text, $self->{cursor}++, 0, chr $uni; 1813 substr $text, $self->{cursor}++, 0, chr $uni;
1814 } else {
1815 return 0;
1662 } 1816 }
1663 1817
1664 $self->_set_text ($text); 1818 $self->_set_text ($text);
1665 1819
1666 $self->realloc; 1820 $self->realloc;
1667}
1668 1821
1822 1
1823}
1824
1669sub focus_in { 1825sub invoke_focus_in {
1670 my ($self) = @_; 1826 my ($self) = @_;
1671 1827
1672 $self->{last_activity} = $::NOW; 1828 $self->{last_activity} = $::NOW;
1673 1829
1674 $self->SUPER::focus_in; 1830 $self->SUPER::invoke_focus_in
1675} 1831}
1676 1832
1677sub button_down { 1833sub invoke_button_down {
1678 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1679 1835
1680 $self->SUPER::button_down ($ev, $x, $y); 1836 $self->SUPER::invoke_button_down ($ev, $x, $y);
1681 1837
1682 my $idx = $self->{layout}->xy_to_index ($x, $y); 1838 my $idx = $self->{layout}->xy_to_index ($x, $y);
1683 1839
1684 # byte-index to char-index 1840 # byte-index to char-index
1685 my $text = $self->{text}; 1841 my $text = $self->{text};
1686 utf8::encode $text; 1842 utf8::encode $text;
1687 $self->{cursor} = length substr $text, 0, $idx; 1843 $self->{cursor} = length substr $text, 0, $idx;
1688 1844
1689 $self->_set_text ($self->{text}); 1845 $self->_set_text ($self->{text});
1690 $self->update; 1846 $self->update;
1847
1848 1
1691} 1849}
1692 1850
1693sub mouse_motion { 1851sub invoke_mouse_motion {
1694 my ($self, $ev, $x, $y) = @_; 1852 my ($self, $ev, $x, $y) = @_;
1695# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1853# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1854
1855 1
1696} 1856}
1697 1857
1698sub _draw { 1858sub _draw {
1699 my ($self) = @_; 1859 my ($self) = @_;
1700 1860
1701 local $self->{fg} = $self->{fg}; 1861 local $self->{fg} = $self->{fg};
1702 1862
1703 if ($FOCUS == $self) { 1863 if ($FOCUS == $self) {
1704 glColor @{$self->{active_bg}}; 1864 glColor_premultiply @{$self->{active_bg}};
1705 $self->{fg} = $self->{active_fg}; 1865 $self->{fg} = $self->{active_fg};
1706 } else { 1866 } else {
1707 glColor @{$self->{bg}}; 1867 glColor_premultiply @{$self->{bg}};
1708 } 1868 }
1709 1869
1710 glEnable GL_BLEND; 1870 glEnable GL_BLEND;
1711 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1871 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1712 glBegin GL_QUADS; 1872 glBegin GL_QUADS;
1713 glVertex 0 , 0; 1873 glVertex 0 , 0;
1714 glVertex 0 , $self->{h}; 1874 glVertex 0 , $self->{h};
1715 glVertex $self->{w}, $self->{h}; 1875 glVertex $self->{w}, $self->{h};
1716 glVertex $self->{w}, 0; 1876 glVertex $self->{w}, 0;
… …
1741 1901
1742our @ISA = CFClient::UI::EntryBase::; 1902our @ISA = CFClient::UI::EntryBase::;
1743 1903
1744use CFClient::OpenGL; 1904use CFClient::OpenGL;
1745 1905
1746sub key_down { 1906sub invoke_key_down {
1747 my ($self, $ev) = @_; 1907 my ($self, $ev) = @_;
1748 1908
1749 my $sym = $ev->{sym}; 1909 my $sym = $ev->{sym};
1750 1910
1751 if ($sym == 13) { 1911 if ($sym == 13) {
1752 unshift @{$self->{history}}, 1912 unshift @{$self->{history}},
1753 my $txt = $self->get_text; 1913 my $txt = $self->get_text;
1914
1754 $self->{history_pointer} = -1; 1915 $self->{history_pointer} = -1;
1755 $self->{history_saveback} = ''; 1916 $self->{history_saveback} = '';
1756 $self->_emit (activate => $txt); 1917 $self->emit (activate => $txt);
1757 $self->update; 1918 $self->update;
1758 1919
1759 } elsif ($sym == CFClient::SDLK_UP) { 1920 } elsif ($sym == CFClient::SDLK_UP) {
1760 if ($self->{history_pointer} < 0) { 1921 if ($self->{history_pointer} < 0) {
1761 $self->{history_saveback} = $self->get_text; 1922 $self->{history_saveback} = $self->get_text;
… …
1777 } else { 1938 } else {
1778 $self->set_text ($self->{history_saveback}); 1939 $self->set_text ($self->{history_saveback});
1779 } 1940 }
1780 1941
1781 } else { 1942 } else {
1782 $self->SUPER::key_down ($ev); 1943 return $self->SUPER::invoke_key_down ($ev)
1944 }
1945
1783 } 1946 1
1784
1785} 1947}
1786 1948
1787############################################################################# 1949#############################################################################
1788 1950
1789package CFClient::UI::Button; 1951package CFClient::UI::Button;
… …
1798 1960
1799sub new { 1961sub new {
1800 my $class = shift; 1962 my $class = shift;
1801 1963
1802 $class->SUPER::new ( 1964 $class->SUPER::new (
1803 padding => 4, 1965 padding_x => 4,
1966 padding_y => 4,
1804 fg => [1, 1, 1], 1967 fg => [1, 1, 1],
1805 active_fg => [0, 0, 1], 1968 active_fg => [0, 0, 1],
1806 can_hover => 1, 1969 can_hover => 1,
1807 align => 0, 1970 align => 0,
1808 valign => 0, 1971 valign => 0,
1809 can_events => 1, 1972 can_events => 1,
1810 @_ 1973 @_
1811 ) 1974 )
1812} 1975}
1813 1976
1814sub activate { }
1815
1816sub button_up { 1977sub invoke_button_up {
1817 my ($self, $ev, $x, $y) = @_; 1978 my ($self, $ev, $x, $y) = @_;
1818 1979
1819 $self->emit ("activate") 1980 $self->emit ("activate")
1820 if $x >= 0 && $x < $self->{w} 1981 if $x >= 0 && $x < $self->{w}
1821 && $y >= 0 && $y < $self->{h}; 1982 && $y >= 0 && $y < $self->{h};
1983
1984 1
1822} 1985}
1823 1986
1824sub _draw { 1987sub _draw {
1825 my ($self) = @_; 1988 my ($self) = @_;
1826 1989
1827 local $self->{fg} = $self->{fg}; 1990 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1828
1829 if ($GRAB == $self) {
1830 $self->{fg} = $self->{active_fg};
1831 }
1832 1991
1833 glEnable GL_TEXTURE_2D; 1992 glEnable GL_TEXTURE_2D;
1834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1993 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1835 glColor 0, 0, 0, 1; 1994 glColor 0, 0, 0, 1;
1836 1995
… …
1841 $self->SUPER::_draw; 2000 $self->SUPER::_draw;
1842} 2001}
1843 2002
1844############################################################################# 2003#############################################################################
1845 2004
2005package CFClient::UI::ImageButton;
2006
2007our @ISA = CFClient::UI::Image::;
2008
2009use CFClient::OpenGL;
2010
2011my %textures;
2012
2013sub new {
2014 my $class = shift;
2015
2016 my $self = $class->SUPER::new (
2017 padding_x => 4,
2018 padding_y => 4,
2019 fg => [1, 1, 1],
2020 active_fg => [0, 0, 1],
2021 can_hover => 1,
2022 align => 0,
2023 valign => 0,
2024 can_events => 1,
2025 @_
2026 );
2027}
2028
2029sub invoke_button_up {
2030 my ($self, $ev, $x, $y) = @_;
2031
2032 $self->emit ("activate")
2033 if $x >= 0 && $x < $self->{w}
2034 && $y >= 0 && $y < $self->{h};
2035
2036 1
2037}
2038
2039#############################################################################
2040
1846package CFClient::UI::CheckBox; 2041package CFClient::UI::CheckBox;
1847 2042
1848our @ISA = CFClient::UI::DrawBG::; 2043our @ISA = CFClient::UI::DrawBG::;
1849 2044
1850my @tex = 2045my @tex =
… …
1855 2050
1856sub new { 2051sub new {
1857 my $class = shift; 2052 my $class = shift;
1858 2053
1859 $class->SUPER::new ( 2054 $class->SUPER::new (
1860 padding => 2, 2055 padding_x => 2,
2056 padding_y => 2,
1861 fg => [1, 1, 1], 2057 fg => [1, 1, 1],
1862 active_fg => [1, 1, 0], 2058 active_fg => [1, 1, 0],
1863 bg => [0, 0, 0, 0.2], 2059 bg => [0, 0, 0, 0.2],
1864 active_bg => [1, 1, 1, 0.5], 2060 active_bg => [1, 1, 1, 0.5],
1865 state => 0, 2061 state => 0,
… …
1869} 2065}
1870 2066
1871sub size_request { 2067sub size_request {
1872 my ($self) = @_; 2068 my ($self) = @_;
1873 2069
1874 ($self->{padding} * 2 + 6) x 2 2070 (6) x 2
1875} 2071}
1876 2072
2073sub toggle {
2074 my ($self) = @_;
2075
2076 $self->{state} = !$self->{state};
2077 $self->emit (changed => $self->{state});
2078 $self->update;
2079}
2080
1877sub button_down { 2081sub invoke_button_down {
1878 my ($self, $ev, $x, $y) = @_; 2082 my ($self, $ev, $x, $y) = @_;
1879 2083
1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2084 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2085 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882 $self->{state} = !$self->{state}; 2086 $self->toggle;
1883 $self->_emit (changed => $self->{state}); 2087 } else {
2088 return 0
2089 }
2090
1884 } 2091 1
1885} 2092}
1886 2093
1887sub _draw { 2094sub _draw {
1888 my ($self) = @_; 2095 my ($self) = @_;
1889 2096
1890 $self->SUPER::_draw; 2097 $self->SUPER::_draw;
1891 2098
1892 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2099 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893 2100
1894 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2101 my ($w, $h) = @$self{qw(w h)};
2102
2103 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1895 2104
1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2105 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897 2106
1898 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2107 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899 2108
… …
1907package CFClient::UI::Image; 2116package CFClient::UI::Image;
1908 2117
1909our @ISA = CFClient::UI::Base::; 2118our @ISA = CFClient::UI::Base::;
1910 2119
1911use CFClient::OpenGL; 2120use CFClient::OpenGL;
1912use Carp qw/confess/;
1913 2121
1914our %loaded_images; 2122our %texture_cache;
1915 2123
1916sub new { 2124sub new {
1917 my $class = shift; 2125 my $class = shift;
1918 2126
1919 my $self = $class->SUPER::new (can_events => 0, @_); 2127 my $self = $class->SUPER::new (
2128 can_events => 0,
2129 @_,
2130 );
1920 2131
1921 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2132 $self->{path}
2133 or Carp::croak "required attribute 'path' not set";
1922 2134
1923 $loaded_images{$self->{image}} ||= 2135 $self->{tex} = $texture_cache{$self->{path}} ||=
1924 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2136 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1925 2137
1926 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2138 Scalar::Util::weaken $texture_cache{$self->{path}};
1927 2139
1928 Scalar::Util::weaken $loaded_images{$self->{image}}; 2140 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1929
1930 $self->{aspect} = $tex->{w} / $tex->{h};
1931 2141
1932 $self 2142 $self
1933} 2143}
1934 2144
1935sub size_request { 2145sub size_request {
1936 my ($self) = @_; 2146 my ($self) = @_;
1937 2147
1938 ($self->{tex}->{w}, $self->{tex}->{h}) 2148 ($self->{tex}{w}, $self->{tex}{h})
1939} 2149}
1940 2150
1941sub _draw { 2151sub _draw {
1942 my ($self) = @_; 2152 my ($self) = @_;
1943 2153
… …
2052 my $ycut1 = max 0, min 1, $ycut; 2262 my $ycut1 = max 0, min 1, $ycut;
2053 my $ycut2 = max 0, min 1, $ycut - 1; 2263 my $ycut2 = max 0, min 1, $ycut - 1;
2054 2264
2055 my $h1 = $self->{h} * (1 - $ycut1); 2265 my $h1 = $self->{h} * (1 - $ycut1);
2056 my $h2 = $self->{h} * (1 - $ycut2); 2266 my $h2 = $self->{h} * (1 - $ycut2);
2267 my $h3 = $self->{h};
2268
2269 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2057 2270
2058 glEnable GL_BLEND; 2271 glEnable GL_BLEND;
2059 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2272 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2273 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2060 glEnable GL_TEXTURE_2D; 2274 glEnable GL_TEXTURE_2D;
2061 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2275 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062 2276
2063 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2277 glBindTexture GL_TEXTURE_2D, $t1->{name};
2064 glBegin GL_QUADS; 2278 glBegin GL_QUADS;
… …
2079 2293
2080 if ($t3) { 2294 if ($t3) {
2081 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2295 glBindTexture GL_TEXTURE_2D, $t3->{name};
2082 glBegin GL_QUADS; 2296 glBegin GL_QUADS;
2083 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2297 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2084 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2298 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2085 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2299 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2086 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2300 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2087 glEnd; 2301 glEnd;
2088 } 2302 }
2089 2303
2090 glDisable GL_BLEND; 2304 glDisable GL_BLEND;
… …
2164 fg => [1, 1, 1], 2378 fg => [1, 1, 1],
2165 active_fg => [0, 0, 0], 2379 active_fg => [0, 0, 0],
2166 bg => [0, 0, 0, 0.2], 2380 bg => [0, 0, 0, 0.2],
2167 active_bg => [1, 1, 1, 0.5], 2381 active_bg => [1, 1, 1, 0.5],
2168 range => [0, 0, 100, 10, 0], 2382 range => [0, 0, 100, 10, 0],
2169 req_w => $::WIDTH / 80, 2383 min_w => $::WIDTH / 80,
2170 req_h => $::WIDTH / 80, 2384 min_h => $::WIDTH / 80,
2171 vertical => 0, 2385 vertical => 0,
2172 can_hover => 1, 2386 can_hover => 1,
2173 inner_pad => 0.02, 2387 inner_pad => 0.02,
2174 @_ 2388 @_
2175 ); 2389 );
… …
2178 $self->update; 2392 $self->update;
2179 2393
2180 $self 2394 $self
2181} 2395}
2182 2396
2183sub changed { }
2184
2185sub set_range { 2397sub set_range {
2186 my ($self, $range) = @_; 2398 my ($self, $range) = @_;
2187 2399
2188 ($range, $self->{range}) = ($self->{range}, $range); 2400 ($range, $self->{range}) = ($self->{range}, $range);
2189 2401
2190 $self->update
2191 if "@$range" ne "@{$self->{range}}"; 2402 if ("@$range" ne "@{$self->{range}}") {
2403 $self->update;
2404 $self->set_value ($self->{range}[0]);
2405 }
2192} 2406}
2193 2407
2194sub set_value { 2408sub set_value {
2195 my ($self, $value) = @_; 2409 my ($self, $value) = @_;
2196 2410
… …
2207 if $unit; 2421 if $unit;
2208 2422
2209 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2423 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2210 2424
2211 if ($value != $old_value) { 2425 if ($value != $old_value) {
2212 $self->_emit (changed => $value); 2426 $self->emit (changed => $value);
2213 $self->update; 2427 $self->update;
2214 } 2428 }
2215} 2429}
2216 2430
2217sub size_request { 2431sub size_request {
2218 my ($self) = @_; 2432 my ($self) = @_;
2219 2433
2220 my $w = $self->{req_w}; 2434 ($self->{req_w}, $self->{req_h})
2221 my $h = $self->{req_h};
2222
2223 $self->{vertical} ? ($h, $w) : ($w, $h)
2224} 2435}
2225 2436
2226sub button_down { 2437sub invoke_button_down {
2227 my ($self, $ev, $x, $y) = @_; 2438 my ($self, $ev, $x, $y) = @_;
2228 2439
2229 $self->SUPER::button_down ($ev, $x, $y); 2440 $self->SUPER::invoke_button_down ($ev, $x, $y);
2230 2441
2231 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2442 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2232 2443
2233 $self->mouse_motion ($ev, $x, $y); 2444 $self->invoke_mouse_motion ($ev, $x, $y)
2234} 2445}
2235 2446
2236sub mouse_motion { 2447sub invoke_mouse_motion {
2237 my ($self, $ev, $x, $y) = @_; 2448 my ($self, $ev, $x, $y) = @_;
2238 2449
2239 if ($GRAB == $self) { 2450 if ($GRAB == $self) {
2240 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2451 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2241 2452
2242 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2453 my (undef, $lo, $hi, $page) = @{$self->{range}};
2243 2454
2244 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2455 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2245 2456
2246 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2457 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2458 } else {
2459 return 0;
2460 }
2461
2247 } 2462 1
2248} 2463}
2249 2464
2250sub update { 2465sub update {
2251 my ($self) = @_; 2466 my ($self) = @_;
2252 2467
2253 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2468 delete $self->{knob_w};
2469 $self->SUPER::update;
2470}
2471
2472sub _draw {
2473 my ($self) = @_;
2474
2475 unless ($self->{knob_w}) {
2254 $self->set_value ($self->{range}[0]); 2476 $self->set_value ($self->{range}[0]);
2255 2477
2256 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2478 my ($value, $lo, $hi, $page) = @{$self->{range}};
2257 my $range = ($hi - $page - $lo) || 1e-100; 2479 my $range = ($hi - $page - $lo) || 1e-100;
2258 2480
… …
2264 $value = ($value - $lo) / $range; 2486 $value = ($value - $lo) / $range;
2265 $value = $value * $self->{scale} + $self->{offset}; 2487 $value = $value * $self->{scale} + $self->{offset};
2266 2488
2267 $self->{knob_x} = $value - $knob_w * 0.5; 2489 $self->{knob_x} = $value - $knob_w * 0.5;
2268 $self->{knob_w} = $knob_w; 2490 $self->{knob_w} = $knob_w;
2269 }); 2491 }
2270
2271 $self->SUPER::update;
2272}
2273
2274sub _draw {
2275 my ($self) = @_;
2276 2492
2277 $self->SUPER::_draw (); 2493 $self->SUPER::_draw ();
2278 2494
2279 glScale $self->{w}, $self->{h}; 2495 glScale $self->{w}, $self->{h};
2280 2496
… …
2341sub set_range { shift->{slider}->set_range (@_) } 2557sub set_range { shift->{slider}->set_range (@_) }
2342sub set_value { shift->{slider}->set_value (@_) } 2558sub set_value { shift->{slider}->set_value (@_) }
2343 2559
2344############################################################################# 2560#############################################################################
2345 2561
2346package CFClient::UI::TextView; 2562package CFClient::UI::TextScroller;
2347 2563
2348our @ISA = CFClient::UI::HBox::; 2564our @ISA = CFClient::UI::HBox::;
2349 2565
2350use CFClient::OpenGL; 2566use CFClient::OpenGL;
2351 2567
… …
2353 my $class = shift; 2569 my $class = shift;
2354 2570
2355 my $self = $class->SUPER::new ( 2571 my $self = $class->SUPER::new (
2356 fontsize => 1, 2572 fontsize => 1,
2357 can_events => 0, 2573 can_events => 0,
2574 indent => 0,
2358 #font => default_font 2575 #font => default_font
2359 @_, 2576 @_,
2360 2577
2361 layout => (new CFClient::Layout 1), 2578 layout => (new CFClient::Layout 1),
2362 par => [], 2579 par => [],
… …
2377 2594
2378 $self->{fontsize} = $fontsize; 2595 $self->{fontsize} = $fontsize;
2379 $self->reflow; 2596 $self->reflow;
2380} 2597}
2381 2598
2599sub size_request {
2600 my ($self) = @_;
2601
2602 my ($empty, $slider) = @{ $self->{children} };
2603
2604 local $self->{children} = [$empty, $slider];
2605 $self->SUPER::size_request
2606}
2607
2382sub size_allocate { 2608sub invoke_size_allocate {
2383 my ($self, $w, $h, $changed) = @_; 2609 my ($self, $w, $h) = @_;
2384 2610
2385 $self->SUPER::size_allocate ($w, $h, $changed); 2611 my ($empty, $slider, @other) = @{ $self->{children} };
2386 2612 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2387 return unless $changed;
2388 2613
2389 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2614 $self->{layout}->set_font ($self->{font}) if $self->{font};
2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2391 $self->{layout}->set_width ($self->{children}[0]{w}); 2616 $self->{layout}->set_width ($empty->{w});
2617 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2392 2618
2393 $self->reflow; 2619 $self->reflow;
2394}
2395 2620
2396sub text_size { 2621 local $self->{children} = [$empty, $slider];
2397 my ($self, $text, $indent) = @_; 2622 $self->SUPER::invoke_size_allocate ($w, $h)
2623}
2624
2625sub get_layout {
2626 my ($self, $para) = @_;
2398 2627
2399 my $layout = $self->{layout}; 2628 my $layout = $self->{layout};
2400 2629
2630 $layout->set_font ($self->{font}) if $self->{font};
2631 $layout->set_foreground (@{$para->{fg}});
2401 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2632 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2402 $layout->set_width ($self->{children}[0]{w} - $indent); 2633 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2634 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2403 $layout->set_markup ($text); 2635 $layout->set_markup ($para->{markup});
2636
2637 $layout->set_shapes (
2638 map
2639 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2640 @{$para->{widget}}
2404 2641 );
2642
2405 $layout->size 2643 $layout
2406} 2644}
2407 2645
2408sub reflow { 2646sub reflow {
2409 my ($self) = @_; 2647 my ($self) = @_;
2410 2648
… …
2419 $self->{children}[1]->set_value ($offset); 2657 $self->{children}[1]->set_value ($offset);
2420} 2658}
2421 2659
2422sub clear { 2660sub clear {
2423 my ($self) = @_; 2661 my ($self) = @_;
2662
2663 my (undef, undef, @other) = @{ $self->{children} };
2664 $self->remove ($_) for @other;
2424 2665
2425 $self->{par} = []; 2666 $self->{par} = [];
2426 $self->{height} = 0; 2667 $self->{height} = 0;
2427 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2668 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2428} 2669}
2429 2670
2430sub add_paragraph { 2671sub add_paragraph {
2431 my ($self, $color, $text, $indent) = @_; 2672 my ($self, $color, $para, $indent) = @_;
2432 2673
2433 for my $line (split /\n/, $text) { 2674 my ($text, @w) = ref $para ? @$para : $para;
2434 my ($w, $h) = $self->text_size ($line); 2675
2435 $self->{height} += $h; 2676 $para = {
2436 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2677 w => 1e10,
2678 wrapped => 1,
2679 fg => $color,
2680 indent => $indent,
2681 markup => $text,
2682 widget => \@w,
2437 } 2683 };
2438 2684
2439 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2685 $self->add (@w) if @w;
2686 push @{$self->{par}}, $para;
2687
2688 $self->{need_reflow}++;
2689 $self->update;
2690}
2691
2692sub scroll_to_bottom {
2693 my ($self) = @_;
2694
2695 $self->{scroll_to_bottom} = 1;
2696 $self->update;
2440} 2697}
2441 2698
2442sub update { 2699sub update {
2443 my ($self) = @_; 2700 my ($self) = @_;
2444 2701
… …
2446 2703
2447 return unless $self->{h} > 0; 2704 return unless $self->{h} > 0;
2448 2705
2449 delete $self->{texture}; 2706 delete $self->{texture};
2450 2707
2451 $ROOT->on_post_alloc ($self, sub { 2708 $ROOT->on_post_alloc ($self => sub {
2452 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2709 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2453 2710
2454 if (delete $self->{need_reflow}) { 2711 if (delete $self->{need_reflow}) {
2455 my $height = 0; 2712 my $height = 0;
2456 2713
2457 my $layout = $self->{layout};
2458
2459 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2460
2461 for (@{$self->{par}}) { 2714 for my $para (@{$self->{par}}) {
2462 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2715 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2463 $layout->set_width ($W - $_->[3]); 2716 my $layout = $self->get_layout ($para);
2464 $layout->set_markup ($_->[4]);
2465 my ($w, $h) = $layout->size; 2717 my ($w, $h) = $layout->size;
2466 $_->[0] = $w + $_->[3]; 2718
2467 $_->[1] = $h; 2719 $para->{w} = $w + $para->{indent};
2720 $para->{h} = $h;
2721 $para->{wrapped} = $layout->has_wrapped;
2468 } 2722 }
2469 2723
2470 $height += $_->[1]; 2724 $height += $para->{h};
2471 } 2725 }
2472 2726
2473 $self->{height} = $height; 2727 $self->{height} = $height;
2474 2728
2475 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2729 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2476 2730
2477 delete $self->{texture}; 2731 delete $self->{texture};
2478 } 2732 }
2479 2733
2734 if (delete $self->{scroll_to_bottom}) {
2735 $self->{children}[1]->set_value (1e10);
2736 }
2737
2480 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2738 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2481 glClearColor 0.5, 0.5, 0.5, 0; 2739 glClearColor 0, 0, 0, 0;
2482 glClear GL_COLOR_BUFFER_BIT; 2740 glClear GL_COLOR_BUFFER_BIT;
2483 2741
2484 my $top = int $self->{children}[1]{range}[0]; 2742 my $top = int $self->{children}[1]{range}[0];
2485 2743
2486 my $y0 = $top; 2744 my $y0 = $top;
2487 my $y1 = $top + $H; 2745 my $y1 = $top + $H;
2488 2746
2489 my $y = 0; 2747 my $y = 0;
2490
2491 my $layout = $self->{layout};
2492
2493 $layout->set_font ($self->{font}) if $self->{font};
2494 2748
2495 glEnable GL_BLEND; 2749 glEnable GL_BLEND;
2496 #TODO# not correct in windows where rgba is forced off 2750 #TODO# not correct in windows where rgba is forced off
2497 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2751 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2498 2752
2499 for my $par (@{$self->{par}}) { 2753 for my $para (@{$self->{par}}) {
2500 my $h = $par->[1]; 2754 my $h = $para->{h};
2501 2755
2502 if ($y0 < $y + $h && $y < $y1) { 2756 if ($y0 < $y + $h && $y < $y1) {
2503 $layout->set_foreground (@{ $par->[2] }); 2757
2504 $layout->set_width ($W - $par->[3]); 2758 my $layout = $self->get_layout ($para);
2505 $layout->set_markup ($par->[4]);
2506 2759
2507 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2760 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2508 2761
2509 glRasterPos $par->[3], $y - $y0; 2762 glRasterPos $para->{indent}, $y - $y0;
2510 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2763 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2764
2765 if (my @w = @{ $para->{widget} }) {
2766 my @s = $layout->get_shapes;
2767
2768 glDisable GL_BLEND;
2769 for (@w) {
2770 my ($dx, $dy) = splice @s, 0, 2, ();
2771
2772 $_->{x} = $dx + $para->{indent};
2773 $_->{y} = $dy + $y - $y0;
2774
2775 $_->draw;
2776 }
2777 glEnable GL_BLEND;
2778 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2779 }
2511 } 2780 }
2512 2781
2513 $y += $h; 2782 $y += $h;
2514 } 2783 }
2515 2784
2516 glDisable GL_BLEND; 2785 glDisable GL_BLEND;
2517 }; 2786 };
2518 }); 2787 });
2519} 2788}
2520 2789
2790sub reconfigure {
2791 my ($self) = @_;
2792
2793 $self->SUPER::reconfigure;
2794
2795 $_->{w} = 1e10 for @{ $self->{par} };
2796 $self->reflow;
2797}
2798
2521sub _draw { 2799sub _draw {
2522 my ($self) = @_; 2800 my ($self) = @_;
2523 2801
2524 glEnable GL_TEXTURE_2D; 2802 glEnable GL_TEXTURE_2D;
2525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2526 glColor 1, 1, 1, 1; 2804 glColor 0, 0, 0, 1;
2527 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2805 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2528 glDisable GL_TEXTURE_2D; 2806 glDisable GL_TEXTURE_2D;
2529 2807
2530 $self->{children}[1]->draw; 2808 $self->{children}[1]->draw;
2531
2532} 2809}
2533 2810
2534############################################################################# 2811#############################################################################
2535 2812
2536package CFClient::UI::Animator; 2813package CFClient::UI::Animator;
… …
2615} 2892}
2616 2893
2617sub set_tooltip_from { 2894sub set_tooltip_from {
2618 my ($self, $widget) = @_; 2895 my ($self, $widget) = @_;
2619 2896
2897 my $tooltip = $widget->{tooltip};
2898
2899 if ($ENV{CFPLUS_DEBUG} & 2) {
2900 $tooltip .= "\n\n" . (ref $widget) . "\n"
2901 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2902 . "req $widget->{req_w} $widget->{req_h}\n"
2903 . "visible $widget->{visible}";
2904 }
2905
2906 $tooltip =~ s/^\n+//;
2907 $tooltip =~ s/\n+$//;
2908
2620 $self->add (new CFClient::UI::Label 2909 $self->add (new CFClient::UI::Label
2621 markup => $widget->{tooltip}, 2910 markup => $tooltip,
2622 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2911 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2623 fontsize => 0.8, 2912 fontsize => 0.8,
2624 fg => [0, 0, 0, 1], 2913 fg => [0, 0, 0, 1],
2625 ellipsise => 0, 2914 ellipsise => 0,
2626 font => ($widget->{tooltip_font} || $::FONT_PROP), 2915 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2633 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2922 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2634 2923
2635 ($w + 4, $h + 4) 2924 ($w + 4, $h + 4)
2636} 2925}
2637 2926
2638sub size_allocate { 2927sub invoke_size_allocate {
2639 my ($self, $w, $h, $changed) = @_; 2928 my ($self, $w, $h) = @_;
2640 2929
2641 return unless $changed;
2642
2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2930 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2931}
2932
2933sub invoke_visibility_change {
2934 my ($self, $visible) = @_;
2935
2936 return unless $visible;
2937
2938 $self->{root}->on_post_alloc ("move_$self" => sub {
2939 my $widget = $self->{owner}
2940 or return;
2941
2942 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2943
2944 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2945 if $x + $self->{w} > $self->{root}{w};
2946
2947 $self->move_abs ($x, $y);
2948 });
2644} 2949}
2645 2950
2646sub _draw { 2951sub _draw {
2647 my ($self) = @_; 2952 my ($self) = @_;
2648 2953
… …
2734 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3039 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2735 3040
2736 if ($tex) { 3041 if ($tex) {
2737 glEnable GL_TEXTURE_2D; 3042 glEnable GL_TEXTURE_2D;
2738 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2739 glColor 1, 1, 1, 1; 3044 glColor 0, 0, 0, 1;
2740 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3045 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2741 glDisable GL_TEXTURE_2D; 3046 glDisable GL_TEXTURE_2D;
2742 } 3047 }
2743} 3048}
2744 3049
2745sub DESTROY { 3050sub destroy {
2746 my ($self) = @_; 3051 my ($self) = @_;
2747 3052
2748 $self->{timer}->cancel 3053 $self->{timer}->cancel
2749 if $self->{timer}; 3054 if $self->{timer};
2750 3055
2751 $self->SUPER::DESTROY; 3056 $self->SUPER::destroy;
2752} 3057}
2753 3058
2754############################################################################# 3059#############################################################################
2755 3060
2756package CFClient::UI::Inventory; 3061package CFClient::UI::Buttonbar;
2757 3062
2758our @ISA = CFClient::UI::ScrolledWindow::; 3063our @ISA = CFClient::UI::HBox::;
2759 3064
2760sub new { 3065# 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 3066
2796############################################################################# 3067#############################################################################
2797 3068
2798package CFClient::UI::Menu; 3069package CFClient::UI::Menu;
2799 3070
… …
2811 ); 3082 );
2812 3083
2813 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3084 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2814 3085
2815 for my $item (@{ $self->{items} }) { 3086 for my $item (@{ $self->{items} }) {
2816 my ($widget, $cb) = @$item; 3087 my ($widget, $cb, $tooltip) = @$item;
2817 3088
2818 # handle various types of items, only text for now 3089 # handle various types of items, only text for now
2819 if (!ref $widget) { 3090 if (!ref $widget) {
2820 $widget = new CFClient::UI::Label 3091 $widget = new CFClient::UI::Label
2821 can_hover => 1, 3092 can_hover => 1,
2822 can_events => 1, 3093 can_events => 1,
2823 text => $widget; 3094 markup => $widget,
3095 tooltip => $tooltip
2824 } 3096 }
2825 3097
2826 $self->{item}{$widget} = $item; 3098 $self->{item}{$widget} = $item;
2827 3099
2828 $self->{vbox}->add ($widget); 3100 $self->{vbox}->add ($widget);
… …
2833 3105
2834# popup given the event (must be a mouse button down event currently) 3106# popup given the event (must be a mouse button down event currently)
2835sub popup { 3107sub popup {
2836 my ($self, $ev) = @_; 3108 my ($self, $ev) = @_;
2837 3109
2838 $self->_emit ("popdown"); 3110 $self->emit ("popdown");
2839 3111
2840 # maybe save $GRAB? must be careful about events... 3112 # maybe save $GRAB? must be careful about events...
2841 $GRAB = $self; 3113 $GRAB = $self;
2842 $self->{button} = $ev->{button}; 3114 $self->{button} = $ev->{button};
2843 3115
2844 $self->show; 3116 $self->show;
2845 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3117 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2846} 3118}
2847 3119
2848sub mouse_motion { 3120sub invoke_mouse_motion {
2849 my ($self, $ev, $x, $y) = @_; 3121 my ($self, $ev, $x, $y) = @_;
2850 3122
2851 # TODO: should use vbox->find_widget or so 3123 # TODO: should use vbox->find_widget or so
2852 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3124 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2853 $self->{hover} = $self->{item}{$HOVER}; 3125 $self->{hover} = $self->{item}{$HOVER};
2854}
2855 3126
3127 0
3128}
3129
2856sub button_up { 3130sub invoke_button_up {
2857 my ($self, $ev, $x, $y) = @_; 3131 my ($self, $ev, $x, $y) = @_;
2858 3132
2859 if ($ev->{button} == $self->{button}) { 3133 if ($ev->{button} == $self->{button}) {
2860 undef $GRAB; 3134 undef $GRAB;
2861 $self->hide; 3135 $self->hide;
2862 3136
2863 $self->_emit ("popdown"); 3137 $self->emit ("popdown");
2864 $self->{hover}[1]->() if $self->{hover}; 3138 $self->{hover}[1]->() if $self->{hover};
3139 } else {
3140 return 0
3141 }
3142
2865 } 3143 1
2866} 3144}
2867 3145
2868############################################################################# 3146#############################################################################
2869 3147
2870package CFClient::UI::Statusbox; 3148package CFClient::UI::Multiplexer;
2871 3149
2872our @ISA = CFClient::UI::VBox::; 3150our @ISA = CFClient::UI::Container::;
2873 3151
2874sub new { 3152sub new {
2875 my $class = shift; 3153 my $class = shift;
2876 3154
2877 $class->SUPER::new ( 3155 my $self = $class->SUPER::new (
3156 @_,
3157 );
3158
3159 $self->{current} = $self->{children}[0]
3160 if @{ $self->{children} };
3161
3162 $self
3163}
3164
3165sub add {
3166 my ($self, @widgets) = @_;
3167
3168 $self->SUPER::add (@widgets);
3169
3170 $self->{current} = $self->{children}[0]
3171 if @{ $self->{children} };
3172}
3173
3174sub get_current_page {
3175 my ($self) = @_;
3176
3177 $self->{current}
3178}
3179
3180sub set_current_page {
3181 my ($self, $page_or_widget) = @_;
3182
3183 my $widget = ref $page_or_widget
3184 ? $page_or_widget
3185 : $self->{children}[$page_or_widget];
3186
3187 $self->{current} = $widget;
3188 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3189
3190 $self->emit (page_changed => $self->{current});
3191
3192 $self->realloc;
3193}
3194
3195sub visible_children {
3196 $_[0]{current}
3197}
3198
3199sub size_request {
3200 my ($self) = @_;
3201
3202 $self->{current}->size_request
3203}
3204
3205sub invoke_size_allocate {
3206 my ($self, $w, $h) = @_;
3207
3208 $self->{current}->configure (0, 0, $w, $h);
3209
3210 1
3211}
3212
3213sub _draw {
3214 my ($self) = @_;
3215
3216 $self->{current}->draw;
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::Notebook;
3222
3223our @ISA = CFClient::UI::VBox::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (
3229 buttonbar => (new CFClient::UI::Buttonbar),
3230 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3231 # filter => # will be put between multiplexer and $self
3232 @_,
3233 );
3234
3235 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3236 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3237
3238 $self
3239}
3240
3241sub add {
3242 my ($self, $title, $widget, $tooltip) = @_;
3243
3244 Scalar::Util::weaken $self;
3245
3246 $self->{buttonbar}->add (new CFClient::UI::Button
3247 markup => $title,
3248 tooltip => $tooltip,
3249 on_activate => sub { $self->set_current_page ($widget) },
3250 );
3251
3252 $self->{multiplexer}->add ($widget);
3253}
3254
3255sub get_current_page {
3256 my ($self) = @_;
3257
3258 $self->{multiplexer}->get_current_page
3259}
3260
3261sub set_current_page {
3262 my ($self, $page) = @_;
3263
3264 $self->{multiplexer}->set_current_page ($page);
3265 $self->emit (page_changed => $self->{multiplexer}{current});
3266}
3267
3268#############################################################################
3269
3270package CFClient::UI::Combobox;
3271
3272use utf8;
3273
3274our @ISA = CFClient::UI::Button::;
3275
3276sub new {
3277 my $class = shift;
3278
3279 my $self = $class->SUPER::new (
3280 options => [], # [value, title, longdesc], ...
3281 value => undef,
3282 @_,
3283 );
3284
3285 $self->_set_value ($self->{value});
3286
3287 $self
3288}
3289
3290sub invoke_button_down {
3291 my ($self, $ev) = @_;
3292
3293 my @menu_items;
3294
3295 for (@{ $self->{options} }) {
3296 my ($value, $title, $tooltip) = @$_;
3297
3298 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3299 }
3300
3301 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3302}
3303
3304sub _set_value {
3305 my ($self, $value) = @_;
3306
3307 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3308 or return;
3309
3310 $self->{value} = $item->[0];
3311 $self->set_markup ("$item->[1] ⇓");
3312 $self->set_tooltip ($item->[2]);
3313}
3314
3315sub set_value {
3316 my ($self, $value) = @_;
3317
3318 return unless $self->{value} ne $value;
3319
3320 $self->_set_value ($value);
3321 $self->emit (changed => $value);
3322}
3323
3324#############################################################################
3325
3326package CFClient::UI::Statusbox;
3327
3328our @ISA = CFClient::UI::VBox::;
3329
3330sub new {
3331 my $class = shift;
3332
3333 my $self = $class->SUPER::new (
2878 fontsize => 0.8, 3334 fontsize => 0.8,
2879 @_, 3335 @_,
2880 ) 3336 );
3337
3338 Scalar::Util::weaken (my $this = $self);
3339
3340 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3341
3342 $self
2881} 3343}
2882 3344
2883sub reorder { 3345sub reorder {
2884 my ($self) = @_; 3346 my ($self) = @_;
2885 my $NOW = time; 3347 my $NOW = Time::HiRes::time;
3348
3349 # freeze display when hovering over any label
3350 return if $CFClient::UI::TOOLTIP->{owner}
3351 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3352 values %{ $self->{item} };
2886 3353
2887 while (my ($k, $v) = each %{ $self->{item} }) { 3354 while (my ($k, $v) = each %{ $self->{item} }) {
2888 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3355 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2889 } 3356 }
2890 3357
… …
2893 my @items = sort { 3360 my @items = sort {
2894 $a->{pri} <=> $b->{pri} 3361 $a->{pri} <=> $b->{pri}
2895 or $b->{id} <=> $a->{id} 3362 or $b->{id} <=> $a->{id}
2896 } values %{ $self->{item} }; 3363 } values %{ $self->{item} };
2897 3364
3365 $self->{timer}->interval (1);
3366
2898 my $count = 10 + 1; 3367 my $count = 10 + 1;
2899 for my $item (@items) { 3368 for my $item (@items) {
2900 last unless --$count; 3369 last unless --$count;
2901 3370
2902 push @widgets, $item->{label} ||= do { 3371 my $label = $item->{label} ||= do {
2903 # TODO: doesn't handle markup well (read as: at all) 3372 # TODO: doesn't handle markup well (read as: at all)
2904 my $short = $item->{count} > 1 3373 my $short = $item->{count} > 1
2905 ? "<b>$item->{count} ×</b> $item->{text}" 3374 ? "<b>$item->{count} ×</b> $item->{text}"
2906 : $item->{text}; 3375 : $item->{text};
2907 3376
… …
2915 tooltip => $item->{tooltip}, 3384 tooltip => $item->{tooltip},
2916 tooltip_font => $::FONT_PROP, 3385 tooltip_font => $::FONT_PROP,
2917 tooltip_width => 0.67, 3386 tooltip_width => 0.67,
2918 fontsize => $item->{fontsize} || $self->{fontsize}, 3387 fontsize => $item->{fontsize} || $self->{fontsize},
2919 max_w => $::WIDTH * 0.44, 3388 max_w => $::WIDTH * 0.44,
2920 fg => $item->{fg}, 3389 fg => [@{ $item->{fg} }],
2921 can_events => 1, 3390 can_events => 1,
2922 can_hover => 1 3391 can_hover => 1
2923 }; 3392 };
3393
3394 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3395 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3396 $label->update;
3397 $label->set_max_size (undef, $label->{req_h} * $diff)
3398 if $diff < 1;
3399 $self->{timer}->interval (1/30);
3400 } else {
3401 $label->{fg}[3] = $item->{fg}[3] || 1;
3402 }
3403
3404 push @widgets, $label;
2924 } 3405 }
2925 3406
2926 $self->clear; 3407 $self->clear;
2927 $self->SUPER::add (reverse @widgets); 3408 $self->SUPER::add (reverse @widgets);
2928} 3409}
… …
2933 $text =~ s/^\s+//; 3414 $text =~ s/^\s+//;
2934 $text =~ s/\s+$//; 3415 $text =~ s/\s+$//;
2935 3416
2936 return unless $text; 3417 return unless $text;
2937 3418
2938 my $timeout = time + ((delete $arg{timeout}) || 60); 3419 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2939 3420
2940 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3421 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2941 3422
2942 if (my $item = $self->{item}{$group}) { 3423 if (my $item = $self->{item}{$group}) {
2943 if ($item->{text} eq $text) { 3424 if ($item->{text} eq $text) {
2944 $item->{count}++; 3425 $item->{count}++;
2945 } else { 3426 } else {
2946 $item->{count} = 1; 3427 $item->{count} = 1;
2947 $item->{text} = $item->{tooltip} = $text; 3428 $item->{text} = $item->{tooltip} = $text;
2948 } 3429 }
2949 $item->{id} = ++$self->{id}; 3430 $item->{id} += 0.2;#d#
2950 $item->{timeout} = $timeout; 3431 $item->{timeout} = $timeout;
2951 delete $item->{label}; 3432 delete $item->{label};
2952 } else { 3433 } else {
2953 $self->{item}{$group} = { 3434 $self->{item}{$group} = {
2954 id => ++$self->{id}, 3435 id => ++$self->{id},
… …
2960 count => 1, 3441 count => 1,
2961 %arg, 3442 %arg,
2962 }; 3443 };
2963 } 3444 }
2964 3445
3446 $ROOT->on_refresh (reorder => sub {
2965 $self->reorder; 3447 $self->reorder;
3448 });
2966} 3449}
2967 3450
2968sub reconfigure { 3451sub reconfigure {
2969 my ($self) = @_; 3452 my ($self) = @_;
2970 3453
… …
2973 3456
2974 $self->reorder; 3457 $self->reorder;
2975 $self->SUPER::reconfigure; 3458 $self->SUPER::reconfigure;
2976} 3459}
2977 3460
3461sub destroy {
3462 my ($self) = @_;
3463
3464 $self->{timer}->cancel;
3465
3466 $self->SUPER::destroy;
3467}
3468
2978############################################################################# 3469#############################################################################
2979 3470
3471package CFClient::UI::Inventory;
3472
3473our @ISA = CFClient::UI::Table::;
3474
3475sub new {
3476 my $class = shift;
3477
3478 my $self = $class->SUPER::new (
3479 col_expand => [0, 1, 0],
3480 @_,
3481 );
3482
3483 $self
3484}
3485
3486sub set_items {
3487 my ($self, $items) = @_;
3488
3489 $self->clear;
3490 return unless $items;
3491
3492 my @items = sort {
3493 ($a->{type} <=> $b->{type})
3494 or ($a->{name} cmp $b->{name})
3495 } values %$items;
3496
3497 $self->{real_items} = \@items;
3498
3499 my $row = 0;
3500 for my $item (@items) {
3501 CFClient::Item::update_widgets $item;
3502
3503 $self->add (0, $row, $item->{face_widget});
3504 $self->add (1, $row, $item->{desc_widget});
3505 $self->add (2, $row, $item->{weight_widget});
3506
3507 $row++;
3508 }
3509}
3510
3511#############################################################################
3512
3513package CFClient::UI::SpellList;
3514
3515our @ISA = CFClient::UI::Table::;
3516
3517sub new {
3518 my $class = shift;
3519
3520 my $self = $class->SUPER::new (
3521 binding => [],
3522 commands => [],
3523 @_,
3524 )
3525}
3526
3527my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3528
3529my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3531my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3532 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3533my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3534 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3535my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3537my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3539
3540sub rebuild_spell_list {
3541 my ($self) = @_;
3542
3543 $CFClient::UI::ROOT->on_refresh ($self => sub {
3544 $self->clear;
3545
3546 return unless $::CONN;
3547
3548 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3549 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3550 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3551 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3552 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3553
3554 my $row = 0;
3555
3556 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3557 my $spell = $self->{spell}{$_};
3558
3559 $row++;
3560
3561 my $spell_cb = sub {
3562 my ($widget, $ev) = @_;
3563
3564 if ($ev->{button} == 1) {
3565 $::CONN->user_send ("cast $spell->{name}");
3566 } elsif ($ev->{button} == 2) {
3567 $::CONN->user_send ("invoke $spell->{name}");
3568 } elsif ($ev->{button} == 3) {
3569 (new CFClient::UI::Menu
3570 items => [
3571 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3572 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3573 ],
3574 )->popup ($ev);
3575 } else {
3576 return 0;
3577 }
3578
3579 1
3580 };
3581
3582 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3583
3584 #TODO: add path info to tooltip
3585 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3586
3587 $self->add (0, $row, new CFClient::UI::Face
3588 face => $spell->{face},
3589 can_hover => 1,
3590 can_events => 1,
3591 tooltip => $tooltip,
3592 on_button_down => $spell_cb,
3593 );
3594
3595 $self->add (1, $row, new CFClient::UI::Label
3596 expand => 1,
3597 text => $spell->{name},
3598 can_hover => 1,
3599 can_events => 1,
3600 tooltip => $tooltip,
3601 on_button_down => $spell_cb,
3602 );
3603
3604 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3605 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3606 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3607 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3608 }
3609 });
3610}
3611
3612sub add_spell {
3613 my ($self, $spell) = @_;
3614
3615 $self->{spell}->{$spell->{name}} = $spell;
3616 $self->rebuild_spell_list;
3617}
3618
3619sub remove_spell {
3620 my ($self, $spell) = @_;
3621
3622 delete $self->{spell}->{$spell->{name}};
3623 $self->rebuild_spell_list;
3624}
3625
3626sub clear_spells {
3627 my ($self) = @_;
3628
3629 $self->{spell} = {};
3630 $self->rebuild_spell_list;
3631}
3632
3633#############################################################################
3634
2980package CFClient::UI::Root; 3635package CFClient::UI::Root;
2981 3636
2982our @ISA = CFClient::UI::Container::; 3637our @ISA = CFClient::UI::Container::;
3638
3639use List::Util qw(min max);
2983 3640
2984use CFClient::OpenGL; 3641use CFClient::OpenGL;
2985 3642
2986sub new { 3643sub new {
2987 my $class = shift; 3644 my $class = shift;
… …
2994 Scalar::Util::weaken ($self->{root} = $self); 3651 Scalar::Util::weaken ($self->{root} = $self);
2995 3652
2996 $self 3653 $self
2997} 3654}
2998 3655
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 { 3656sub size_request {
3016 my ($self) = @_; 3657 my ($self) = @_;
3017 3658
3018 ($self->{w}, $self->{h}) 3659 ($self->{w}, $self->{h})
3019} 3660}
3020 3661
3662sub _to_pixel {
3663 my ($coord, $size, $max) = @_;
3664
3665 $coord =
3666 $coord eq "center" ? ($max - $size) * 0.5
3667 : $coord eq "max" ? $max
3668 : $coord;
3669
3670 $coord = 0 if $coord < 0;
3671 $coord = $max - $size if $coord > $max - $size;
3672
3673 int $coord + 0.5
3674}
3675
3021sub size_allocate { 3676sub invoke_size_allocate {
3022 my ($self, $w, $h, $changed) = @_; 3677 my ($self, $w, $h) = @_;
3023 3678
3024 for my $child ($self->children) { 3679 for my $child ($self->children) {
3025 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3680 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3026 3681
3027 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3682 $X = $child->{force_x} if exists $child->{force_x};
3028 if exists $child->{req_x}; 3683 $Y = $child->{force_y} if exists $child->{force_y};
3029 3684
3030 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3685 $X = _to_pixel $X, $W, $self->{w};
3031 if exists $child->{req_y}; 3686 $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 3687
3038 $child->configure ($X, $Y, $W, $H); 3688 $child->configure ($X, $Y, $W, $H);
3039 } 3689 }
3690
3691 1
3040} 3692}
3041 3693
3042sub coord2local { 3694sub coord2local {
3043 my ($self, $x, $y) = @_; 3695 my ($self, $x, $y) = @_;
3044 3696
… …
3058} 3710}
3059 3711
3060sub add { 3712sub add {
3061 my ($self, @children) = @_; 3713 my ($self, @children) = @_;
3062 3714
3063 for my $child (@children) {
3064 $child->{is_toplevel} = 1; 3715 $_->{is_toplevel} = 1
3065 3716 for @children;
3066 # integerise window positions
3067 $child->{x} = int $child->{x};
3068 $child->{y} = int $child->{y};
3069 }
3070 3717
3071 $self->SUPER::add (@children); 3718 $self->SUPER::add (@children);
3072} 3719}
3073 3720
3074sub remove { 3721sub remove {
3075 my ($self, @children) = @_; 3722 my ($self, @children) = @_;
3076 3723
3077 $self->SUPER::remove (@children); 3724 $self->SUPER::remove (@children);
3725
3726 delete $self->{is_toplevel}
3727 for @children;
3078 3728
3079 while (@children) { 3729 while (@children) {
3080 my $w = pop @children; 3730 my $w = pop @children;
3081 push @children, $w->children; 3731 push @children, $w->children;
3082 $w->set_invisible; 3732 $w->set_invisible;
… …
3102 $_->() 3752 $_->()
3103 for values %{delete $self->{refresh_hook}}; 3753 for values %{delete $self->{refresh_hook}};
3104 } 3754 }
3105 3755
3106 if ($self->{realloc}) { 3756 if ($self->{realloc}) {
3757 my %queue;
3107 my @queue; 3758 my @queue;
3759 my $widget;
3108 3760
3761 outer:
3109 while () { 3762 while () {
3110 if ($self->{realloc}) { 3763 if (my $realloc = delete $self->{realloc}) {
3111 #TODO use array-of-depth approach 3764 for $widget (values %$realloc) {
3765 $widget->{visible} or next; # do not resize invisible widgets
3112 3766
3113 @queue = sort { $a->{visible} <=> $b->{visible} } 3767 $queue{$widget+0}++ and next; # duplicates are common
3114 @queue, values %{delete $self->{realloc}}; 3768
3769 push @{ $queue[$widget->{visible}] }, $widget;
3770 }
3115 } 3771 }
3116 3772
3773 while () {
3774 @queue or last outer;
3775
3776 $widget = pop @{ $queue[-1] || [] }
3777 and last;
3778
3779 pop @queue;
3780 }
3781
3782 delete $queue{$widget+0};
3783
3784 my ($w, $h) = $widget->size_request;
3785
3786 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3787 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3788
3789 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3790 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3791
3792 $w = $widget->{force_w} if exists $widget->{force_w};
3793 $h = $widget->{force_h} if exists $widget->{force_h};
3794
3795 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3796 || delete $widget->{force_realloc}) {
3797 $widget->{req_w} = $w;
3798 $widget->{req_h} = $h;
3799
3800 $self->{size_alloc}{$widget+0} = $widget;
3801
3802 if (my $parent = $widget->{parent}) {
3803 $self->{realloc}{$parent+0} = $parent
3804 unless $queue{$parent+0};
3805
3806 $parent->{force_size_alloc} = 1;
3807 $self->{size_alloc}{$parent+0} = $parent;
3808 }
3809 }
3810
3811 delete $self->{realloc}{$widget+0};
3812 }
3813 }
3814
3815 while (my $size_alloc = delete $self->{size_alloc}) {
3816 my @queue = sort { $b->{visible} <=> $a->{visible} }
3817 values %$size_alloc;
3818
3819 while () {
3117 my $widget = pop @queue || last; 3820 my $widget = pop @queue || last;
3118 3821
3119 $widget->{visible} or last; # do not resize invisible widgets 3822 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 3823
3144 $w = 0 if $w < 0; 3824 $w = 0 if $w < 0;
3145 $h = 0 if $h < 0; 3825 $h = 0 if $h < 0;
3146 3826
3147 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3827 $w = int $w + 0.5;
3828 $h = int $h + 0.5;
3148 3829
3830 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3831 $widget->{old_w} = $widget->{w};
3832 $widget->{old_h} = $widget->{h};
3833
3149 $widget->{w} = $w; 3834 $widget->{w} = $w;
3150 $widget->{h} = $h; 3835 $widget->{h} = $h;
3151 3836
3152 $widget->emit (size_allocate => $w, $h, $changed); 3837 $widget->emit (size_allocate => $w, $h);
3838 }
3153 } 3839 }
3154 } 3840 }
3155 3841
3156 while ($self->{post_alloc_hook}) { 3842 while ($self->{post_alloc_hook}) {
3157 $_->() 3843 $_->()
3158 for values %{delete $self->{post_alloc_hook}}; 3844 for values %{delete $self->{post_alloc_hook}};
3159 } 3845 }
3846
3160 3847
3161 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3848 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3162 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3849 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3163 glClear GL_COLOR_BUFFER_BIT; 3850 glClear GL_COLOR_BUFFER_BIT;
3164 3851
… …
3166 glLoadIdentity; 3853 glLoadIdentity;
3167 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3854 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3168 glMatrixMode GL_MODELVIEW; 3855 glMatrixMode GL_MODELVIEW;
3169 glLoadIdentity; 3856 glLoadIdentity;
3170 3857
3858 {
3859 package CFClient::UI::Base;
3860
3861 ($draw_x, $draw_y, $draw_w, $draw_h) =
3862 (0, 0, $self->{w}, $self->{h});
3863 }
3864
3171 $self->_draw; 3865 $self->_draw;
3172} 3866}
3173 3867
3174############################################################################# 3868#############################################################################
3175 3869

Diff Legend

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