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

Diff Legend

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