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.256 by root, Tue May 30 01:42:16 2006 UTC vs.
Revision 1.330 by root, Sun Jul 23 04:37:51 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
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
26 55
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/; 56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/; 57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w}; 58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h}; 59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
31 } 62 }
32 63
33 $layout 64 $layout
34} 65}
35 66
36sub set_layout { 67sub set_layout {
37 my ($layout) = @_; 68 my ($layout) = @_;
69
38 $LAYOUT = $layout; 70 $LAYOUT = $layout;
39}
40
41sub check_tooltip {
42 if (!$GRAB) {
43 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
44 if (length $widget->{tooltip}) {
45
46 if ($TOOLTIP->{owner} != $widget) {
47 $TOOLTIP->hide;
48
49 $TOOLTIP->{owner} = $widget;
50
51 my $tip = $widget->{tooltip};
52
53 $tip = $tip->($widget) if CODE:: eq ref $tip;
54
55 $TOOLTIP->set_tooltip_from ($widget);
56 $TOOLTIP->show;
57 }
58
59 return;
60 }
61 }
62 }
63
64 $TOOLTIP->hide;
65 delete $TOOLTIP->{owner};
66} 71}
67 72
68# class methods for events 73# class methods for events
69sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
70 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
74sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
75 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
76 if $FOCUS; 81 if $FOCUS;
77} 82}
78 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
79sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
80 my ($ev) = @_; 98 my ($ev) = @_;
81 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
82 100
83 if (!$BUTTON_STATE) { 101 unless ($BUTTON_STATE) {
84 my $widget = $ROOT->find_widget ($x, $y); 102 my $widget = $ROOT->find_widget ($x, $y);
85 103
86 $GRAB = $widget; 104 $GRAB = $widget;
87 $GRAB->update if $GRAB; 105 $GRAB->update if $GRAB;
88 106
89 check_tooltip; 107 $TOOLTIP_WATCHER->cb->();
90 } 108 }
91 109
92 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
93 111
94 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 112 if ($GRAB) {
95 if $GRAB; 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
96} 122}
97 123
98sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
99 my ($ev) = @_; 125 my ($ev) = @_;
100 my ($x, $y) = ($ev->{x}, $ev->{y});
101 126
102 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
103 128
104 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
105 130
106 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
107 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
108 133
109 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
110 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
111 $grab->update if $grab; 136 $grab->update if $grab;
112 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
113 138
114 check_tooltip; 139 check_hover $widget;
140 $TOOLTIP_WATCHER->cb->();
115 } 141 }
116} 142}
117 143
118sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
119 my ($ev) = @_; 145 my ($ev) = @_;
120 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
121 147
122 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
123 149
124 if ($widget != $HOVER) { 150 check_hover $widget;
125 my $hover = $HOVER; $HOVER = $widget;
126 151
127 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
128 $HOVER->update if $HOVER && $HOVER->{can_hover};
129
130 check_tooltip;
131 }
132
133 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
134 if $HOVER; 153 if $HOVER;
135} 154}
136 155
137# convert position array to integers 156# convert position array to integers
138sub harmonize { 157sub harmonize {
… …
167sub rescale_widgets { 186sub rescale_widgets {
168 my ($sx, $sy) = @_; 187 my ($sx, $sy) = @_;
169 188
170 for my $widget (values %WIDGET) { 189 for my $widget (values %WIDGET) {
171 if ($widget->{is_toplevel}) { 190 if ($widget->{is_toplevel}) {
172 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 191 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
173 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 192 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
174 193
175 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 194 $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}; 195 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
177 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 196 $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 $widget->{y} =~ /^[0-9.]+$/; 197 $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}; 198 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
180 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 199 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
181 200
182 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 201 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
183 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 202 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
184 203
185 } 204 }
186 } 205 }
187 206
188 reconfigure_widgets; 207 reconfigure_widgets;
208}
209
210#############################################################################
211
212package CFClient::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
189} 216}
190 217
191############################################################################# 218#############################################################################
192 219
193package CFClient::UI::Base; 220package CFClient::UI::Base;
… …
207 h => undef, 234 h => undef,
208 can_events => 1, 235 can_events => 1,
209 @_ 236 @_
210 }, $class; 237 }, $class;
211 238
212 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
213 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
214 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
215 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
216 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
217
218 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
219 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
220 }
221
222 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 239 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
223 240
224 for (keys %$self) { 241 for (keys %$self) {
225 if (/^on_(.*)$/) { 242 if (/^on_(.*)$/) {
226 $self->connect ($1 => delete $self->{$_}); 243 $self->connect ($1 => delete $self->{$_});
227 } 244 }
228 } 245 }
229 246
247 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
248 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
249 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
250 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
251 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
252
253 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255
256 $self->show if $layout->{show};
257 }
258
230 $self 259 $self
231} 260}
232 261
233sub destroy { 262sub destroy {
234 my ($self) = @_; 263 my ($self) = @_;
… …
265 294
266 return unless $self->{visible}; 295 return unless $self->{visible};
267 296
268 $_->set_invisible for $self->children; 297 $_->set_invisible for $self->children;
269 298
299 delete $self->{visible};
270 delete $self->{root}; 300 delete $self->{root};
271 delete $self->{visible};
272 301
273 undef $GRAB if $GRAB == $self; 302 undef $GRAB if $GRAB == $self;
274 undef $HOVER if $HOVER == $self; 303 undef $HOVER if $HOVER == $self;
275 304
276 CFClient::UI::check_tooltip 305 $CFClient::UI::TOOLTIP_WATCHER->cb->()
277 if $TOOLTIP->{owner} == $self; 306 if $TOOLTIP->{owner} == $self;
278 307
279 $self->focus_out; 308 $self->emit ("focus_out");
280
281 $self->emit (visibility_change => 0); 309 $self->emit (visibility_change => 0);
282} 310}
283 311
284sub set_visibility { 312sub set_visibility {
285 my ($self, $visible) = @_; 313 my ($self, $visible) = @_;
… …
308} 336}
309 337
310sub move_abs { 338sub move_abs {
311 my ($self, $x, $y, $z) = @_; 339 my ($self, $x, $y, $z) = @_;
312 340
313 $self->{x} = List::Util::max 0, int $x; 341 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
314 $self->{y} = List::Util::max 0, int $y; 342 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
315 $self->{z} = $z if defined $z; 343 $self->{z} = $z if defined $z;
316 344
317 $self->update; 345 $self->update;
318} 346}
319 347
… …
327} 355}
328 356
329sub size_request { 357sub size_request {
330 require Carp; 358 require Carp;
331 Carp::confess "size_request is abstract"; 359 Carp::confess "size_request is abstract";
360}
361
362sub baseline_shift {
363 0
332} 364}
333 365
334sub configure { 366sub configure {
335 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
336 368
… …
350 $self->{x} = $x; 382 $self->{x} = $x;
351 $self->{y} = $y; 383 $self->{y} = $y;
352 $self->update; 384 $self->update;
353 } 385 }
354 386
355 if ($self->{w} != $w || $self->{h} != $h) { 387 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
356 return unless $self->{visible}; 388 return unless $self->{visible};
357 389
390 $self->{alloc_w} = $w;
391 $self->{alloc_h} = $h;
392
358 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 393 $self->{root}{size_alloc}{$self+0} = $self;
359 } 394 }
360}
361
362sub size_allocate {
363 # nothing to be done
364} 395}
365 396
366sub children { 397sub children {
398 # nop
399}
400
401sub visible_children {
402 $_[0]->children
367} 403}
368 404
369sub set_max_size { 405sub set_max_size {
370 my ($self, $w, $h) = @_; 406 my ($self, $w, $h) = @_;
371 407
372 delete $self->{max_w}; $self->{max_w} = $w if $w; 408 $self->{max_w} = int $w if defined $w;
373 delete $self->{max_h}; $self->{max_h} = $h if $h; 409 $self->{max_h} = int $h if defined $h;
410
411 $self->realloc;
374} 412}
375 413
376sub set_tooltip { 414sub set_tooltip {
377 my ($self, $tooltip) = @_; 415 my ($self, $tooltip) = @_;
378 416
… …
383 421
384 $self->{tooltip} = $tooltip; 422 $self->{tooltip} = $tooltip;
385 423
386 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 424 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
387 delete $CFClient::UI::TOOLTIP->{owner}; 425 delete $CFClient::UI::TOOLTIP->{owner};
388 CFClient::UI::check_tooltip; 426 $CFClient::UI::TOOLTIP_WATCHER->cb->();
389 } 427 }
390} 428}
391 429
392# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
393sub coord2local { 431sub coord2local {
… …
401 my ($self, $x, $y) = @_; 439 my ($self, $x, $y) = @_;
402 440
403 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 441 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
404} 442}
405 443
406sub focus_in { 444sub invoke_focus_in {
407 my ($self) = @_; 445 my ($self) = @_;
408 446
409 return if $FOCUS == $self; 447 return if $FOCUS == $self;
410 return unless $self->{can_focus}; 448 return unless $self->{can_focus};
411 449
412 my $focus = $FOCUS; $FOCUS = $self; 450 $FOCUS = $self;
413 451
414 $self->_emit (focus_in => $focus); 452 $self->update;
415 453
416 $focus->update if $focus; 454 0
417 $FOCUS->update;
418} 455}
419 456
420sub focus_out { 457sub invoke_focus_out {
421 my ($self) = @_; 458 my ($self) = @_;
422 459
423 return unless $FOCUS == $self; 460 return unless $FOCUS == $self;
424 461
425 my $focus = $FOCUS; undef $FOCUS; 462 undef $FOCUS;
426 463
427 $self->_emit (focus_out => $focus); 464 $self->update;
428 465
429 $focus->update if $focus; #?
430
431 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 466 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
432 unless $FOCUS; 467 unless $FOCUS;
433}
434 468
469 0
470}
471
472sub grab_focus {
473 my ($self) = @_;
474
475 $FOCUS->emit ("focus_out") if $FOCUS;
476 $self->emit ("focus_in");
477}
478
435sub mouse_motion { } 479sub invoke_mouse_motion { 0 }
436sub button_up { } 480sub invoke_button_up { 0 }
437sub key_down { } 481sub invoke_key_down { 0 }
438sub key_up { } 482sub invoke_key_up { 0 }
483sub invoke_mouse_wheel { 0 }
439 484
440sub button_down { 485sub invoke_button_down {
441 my ($self, $ev, $x, $y) = @_; 486 my ($self, $ev, $x, $y) = @_;
442 487
443 $self->focus_in; 488 $self->grab_focus;
444}
445 489
446sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 490 0
447sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 491}
448sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 492
449sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 493sub connect {
450sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 494 my ($self, $signal, $cb) = @_;
495
496 push @{ $self->{signal_cb}{$signal} }, $cb;
497}
498
499sub emit {
500 my ($self, $signal, @args) = @_;
501
502 my @append
503 = ref $args[0] && $args[0]->isa ("CFClient::UI::Event")
504 ? $args[0]->xy ($self)
505 : ();
506
507 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
508
509 #d##TODO# stop propagating at first true, do not use sum
510 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
511 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
512 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
513}
451 514
452sub find_widget { 515sub find_widget {
453 my ($self, $x, $y) = @_; 516 my ($self, $x, $y) = @_;
454 517
455 return () unless $self->{can_events}; 518 return () unless $self->{can_events};
… …
463 526
464sub set_parent { 527sub set_parent {
465 my ($self, $parent) = @_; 528 my ($self, $parent) = @_;
466 529
467 Scalar::Util::weaken ($self->{parent} = $parent); 530 Scalar::Util::weaken ($self->{parent} = $parent);
468
469 $self->set_visible if $parent->{visible}; 531 $self->set_visible if $parent->{visible};
470} 532}
471 533
472sub connect {
473 my ($self, $signal, $cb) = @_;
474
475 push @{ $self->{signal_cb}{$signal} }, $cb;
476}
477
478sub _emit {
479 my ($self, $signal, @args) = @_;
480
481 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
482}
483
484sub emit {
485 my ($self, $signal, @args) = @_;
486
487 $self->_emit ($signal, @args)
488 || $self->$signal (@args);
489}
490
491sub visibility_change {
492 #my ($self, $visible) = @_;
493}
494
495sub realloc { 534sub realloc {
496 my ($self) = @_; 535 my ($self) = @_;
497 536
498 if ($self->{visible}) { 537 if ($self->{visible}) {
499 return if $self->{root}{realloc}{$self}; 538 return if $self->{root}{realloc}{$self+0};
500 539
501 $self->{root}{realloc}{$self} = $self; 540 $self->{root}{realloc}{$self+0} = $self;
502 $self->{root}->update; 541 $self->{root}->update;
503 } else { 542 } else {
504 delete $self->{req_w}; 543 delete $self->{req_w};
544 delete $self->{req_h};
505 } 545 }
506} 546}
507 547
508sub update { 548sub update {
509 my ($self) = @_; 549 my ($self) = @_;
… …
517 557
518 $self->realloc; 558 $self->realloc;
519 $self->update; 559 $self->update;
520} 560}
521 561
562# using global variables seems a bit hacky, but passing through all drawing
563# functions seems pointless.
564our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
565
522sub draw { 566sub draw {
523 my ($self) = @_; 567 my ($self) = @_;
524 568
525 return unless $self->{h} && $self->{w}; 569 return unless $self->{h} && $self->{w};
570
571 # update screen rectangle
572 local $draw_x = $draw_x + $self->{x};
573 local $draw_y = $draw_y + $self->{y};
574
575 # skip widgets that are entirely outside the drawing area
576 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
577 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
526 578
527 glPushMatrix; 579 glPushMatrix;
528 glTranslate $self->{x}, $self->{y}, 0; 580 glTranslate $self->{x}, $self->{y}, 0;
529 $self->_draw;
530 glPopMatrix;
531 581
532 if ($self == $HOVER && $self->{can_hover}) { 582 if ($self == $HOVER && $self->{can_hover}) {
533 my ($x, $y) = @$self{qw(x y)};
534
535 glColor 1, 0.8, 0.5, 0.2; 583 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
536 glEnable GL_BLEND; 584 glEnable GL_BLEND;
537 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 585 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
538 glBegin GL_QUADS; 586 glBegin GL_QUADS;
539 glVertex $x , $y; 587 glVertex 0 , 0;
540 glVertex $x + $self->{w}, $y; 588 glVertex $self->{w}, 0;
541 glVertex $x + $self->{w}, $y + $self->{h}; 589 glVertex $self->{w}, $self->{h};
542 glVertex $x , $y + $self->{h}; 590 glVertex 0 , $self->{h};
543 glEnd; 591 glEnd;
544 glDisable GL_BLEND; 592 glDisable GL_BLEND;
545 } 593 }
546 594
547 if ($ENV{CFPLUS_DEBUG}) { 595 if ($ENV{CFPLUS_DEBUG} & 1) {
548 glPushMatrix; 596 glPushMatrix;
549 glColor 1, 1, 0, 1; 597 glColor 1, 1, 0, 1;
550 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 598 glTranslate 0.375, 0.375;
551 glBegin GL_LINE_LOOP; 599 glBegin GL_LINE_LOOP;
552 glVertex 0 , 0; 600 glVertex 0 , 0;
553 glVertex $self->{w} - 1, 0; 601 glVertex $self->{w} - 1, 0;
554 glVertex $self->{w} - 1, $self->{h} - 1; 602 glVertex $self->{w} - 1, $self->{h} - 1;
555 glVertex 0 , $self->{h} - 1; 603 glVertex 0 , $self->{h} - 1;
556 glEnd; 604 glEnd;
557 glPopMatrix; 605 glPopMatrix;
558 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 606 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
559 } 607 }
608
609 $self->_draw;
610 glPopMatrix;
560} 611}
561 612
562sub _draw { 613sub _draw {
563 my ($self) = @_; 614 my ($self) = @_;
564 615
… …
566} 617}
567 618
568sub DESTROY { 619sub DESTROY {
569 my ($self) = @_; 620 my ($self) = @_;
570 621
622 return if CFClient::in_destruct;
623
571 delete $WIDGET{$self+0}; 624 delete $WIDGET{$self+0};
572 #$self->deactivate; 625
626 eval { $self->destroy };
627 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
573} 628}
574 629
575############################################################################# 630#############################################################################
576 631
577package CFClient::UI::DrawBG; 632package CFClient::UI::DrawBG;
… …
602 657
603 if ($color && (@$color < 4 || $color->[3])) { 658 if ($color && (@$color < 4 || $color->[3])) {
604 my ($w, $h) = @$self{qw(w h)}; 659 my ($w, $h) = @$self{qw(w h)};
605 660
606 glEnable GL_BLEND; 661 glEnable GL_BLEND;
607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 662 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
608 glColor @$color; 663 glColor_premultiply @$color;
609 664
610 glBegin GL_QUADS; 665 glBegin GL_QUADS;
611 glVertex 0 , 0; 666 glVertex 0 , 0;
612 glVertex 0 , $h; 667 glVertex 0 , $h;
613 glVertex $w, $h; 668 glVertex $w, $h;
… …
644our @ISA = CFClient::UI::Base::; 699our @ISA = CFClient::UI::Base::;
645 700
646sub new { 701sub new {
647 my ($class, %arg) = @_; 702 my ($class, %arg) = @_;
648 703
649 my $children = delete $arg{children} || []; 704 my $children = delete $arg{children};
650 705
651 my $self = $class->SUPER::new ( 706 my $self = $class->SUPER::new (
652 children => [], 707 children => [],
653 can_events => 0, 708 can_events => 0,
654 %arg, 709 %arg,
655 ); 710 );
711
656 $self->add ($_) for @$children; 712 $self->add (@$children)
713 if $children;
657 714
658 $self 715 $self
659} 716}
660 717
661sub add { 718sub add {
… …
709 $x -= $self->{x}; 766 $x -= $self->{x};
710 $y -= $self->{y}; 767 $y -= $self->{y};
711 768
712 my $res; 769 my $res;
713 770
714 for (reverse @{ $self->{children} }) { 771 for (reverse $self->visible_children) {
715 $res = $_->find_widget ($x, $y) 772 $res = $_->find_widget ($x, $y)
716 and return $res; 773 and return $res;
717 } 774 }
718 775
719 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 776 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
740} 797}
741 798
742sub add { 799sub add {
743 my ($self, $child) = @_; 800 my ($self, $child) = @_;
744 801
745 $self->{children} = []; 802 $self->SUPER::remove ($_) for @{ $self->{children} };
746
747 $self->SUPER::add ($child); 803 $self->SUPER::add ($child);
748} 804}
749 805
750sub remove { 806sub remove {
751 my ($self, $widget) = @_; 807 my ($self, $widget) = @_;
… …
760 816
761sub size_request { 817sub size_request {
762 $_[0]{children}[0]->size_request 818 $_[0]{children}[0]->size_request
763} 819}
764 820
765sub size_allocate { 821sub invoke_size_allocate {
766 my ($self, $w, $h, $changed) = @_; 822 my ($self, $w, $h) = @_;
767 823
768 $self->{children}[0]->configure (0, 0, $w, $h); 824 $self->{children}[0]->configure (0, 0, $w, $h);
825
826 1
769} 827}
770 828
771############################################################################# 829#############################################################################
830
831# back-buffered drawing area
772 832
773package CFClient::UI::Window; 833package CFClient::UI::Window;
774 834
775our @ISA = CFClient::UI::Bin::; 835our @ISA = CFClient::UI::Bin::;
776 836
… …
787 847
788 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 848 $ROOT->on_post_alloc ($self => sub { $self->render_child });
789 $self->SUPER::update; 849 $self->SUPER::update;
790} 850}
791 851
792sub size_allocate { 852sub invoke_size_allocate {
793 my ($self, $w, $h, $changed) = @_; 853 my ($self, $w, $h) = @_;
794 854
795 $self->SUPER::size_allocate ($w, $h, $changed);
796 $self->update 855 $self->update;
797 if $changed; 856
857 $self->SUPER::invoke_size_allocate ($w, $h)
798} 858}
799 859
800sub _render { 860sub _render {
861 my ($self) = @_;
862
801 $_[0]{children}[0]->draw; 863 $self->{children}[0]->draw;
802} 864}
803 865
804sub render_child { 866sub render_child {
805 my ($self) = @_; 867 my ($self) = @_;
806 868
807 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 869 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
808 glClearColor 0, 0, 0, 0; 870 glClearColor 0, 0, 0, 0;
809 glClear GL_COLOR_BUFFER_BIT; 871 glClear GL_COLOR_BUFFER_BIT;
810 872
873 {
874 package CFClient::UI::Base;
875
876 ($draw_x, $draw_y, $draw_w, $draw_h) =
877 (0, 0, $self->{w}, $self->{h});
878 }
879
811 $self->_render; 880 $self->_render;
812 }; 881 };
813} 882}
814 883
815sub _draw { 884sub _draw {
816 my ($self) = @_; 885 my ($self) = @_;
817 886
818 my ($w, $h) = ($self->w, $self->h); 887 my ($w, $h) = @$self{qw(w h)};
819 888
820 my $tex = $self->{texture} 889 my $tex = $self->{texture}
821 or return; 890 or return;
822 891
823 glEnable GL_TEXTURE_2D; 892 glEnable GL_TEXTURE_2D;
824 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
825 glColor 1, 1, 1, 1; 894 glColor 0, 0, 0, 1;
826 895
827 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 896 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
828 897
829 glDisable GL_TEXTURE_2D; 898 glDisable GL_TEXTURE_2D;
830} 899}
… …
846} 915}
847 916
848sub size_request { 917sub size_request {
849 my ($self) = @_; 918 my ($self) = @_;
850 919
851 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 920 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
852 921
853 $w = 10 if $self->{scroll_x}; 922 $w = 10 if $self->{scroll_x};
854 $h = 10 if $self->{scroll_y}; 923 $h = 10 if $self->{scroll_y};
855 924
856 ($w, $h) 925 ($w, $h)
857} 926}
858 927
859sub size_allocate { 928sub invoke_size_allocate {
860 my ($self, $w, $h, $changed) = @_; 929 my ($self, $w, $h) = @_;
861 930
931 my $child = $self->child;
932
862 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 933 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
863 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 934 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
864 935
865 $self->child->configure (0, 0, $w, $h); 936 $self->child->configure (0, 0, $w, $h);
866 $self->update; 937 $self->update;
938
939 1
867} 940}
868 941
869sub set_offset { 942sub set_offset {
870 my ($self, $x, $y) = @_; 943 my ($self, $x, $y) = @_;
871 944
… …
904} 977}
905 978
906sub _render { 979sub _render {
907 my ($self) = @_; 980 my ($self) = @_;
908 981
982 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
983 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
984
909 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 985 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
910 986
911 $self->SUPER::_render; 987 $self->SUPER::_render;
912} 988}
913 989
… …
916package CFClient::UI::ScrolledWindow; 992package CFClient::UI::ScrolledWindow;
917 993
918our @ISA = CFClient::UI::HBox::; 994our @ISA = CFClient::UI::HBox::;
919 995
920sub new { 996sub new {
921 my $class = shift; 997 my ($class, %arg) = @_;
998
999 my $child = delete $arg{child};
922 1000
923 my $self; 1001 my $self;
924 1002
925 my $slider = new CFClient::UI::Slider 1003 my $slider = new CFClient::UI::Slider
926 vertical => 1, 1004 vertical => 1,
… …
929 $self->{vp}->set_offset (0, $_[1]); 1007 $self->{vp}->set_offset (0, $_[1]);
930 }, 1008 },
931 ; 1009 ;
932 1010
933 $self = $class->SUPER::new ( 1011 $self = $class->SUPER::new (
934 vp => (new CFClient::UI::ViewPort expand => 1), 1012 vp => (new CFClient::UI::ViewPort expand => 1),
1013 can_events => 1,
935 slider => $slider, 1014 slider => $slider,
936 @_, 1015 %arg,
937 ); 1016 );
938 1017
939 $self->{vp}->add ($self->{scrolled});
940 $self->add ($self->{vp});
941 $self->add ($self->{slider}); 1018 $self->SUPER::add ($self->{vp}, $self->{slider});
1019 $self->add ($child) if $child;
942 1020
943 $self 1021 $self
944} 1022}
945 1023
1024#TODO# update range on size_allocate depending on child
1025
1026sub add {
1027 my ($self, $widget) = @_;
1028
1029 $self->{vp}->add ($self->{child} = $widget);
1030}
1031
1032sub invoke_mouse_wheel {
1033 my ($self, $ev) = @_;
1034
1035 return 0 unless $ev->{dy}; # only vertical movements
1036
1037 $self->{slider}->emit (mouse_wheel => $ev);
1038
1039 1
1040}
1041
1042sub update_slider {
1043 my ($self) = @_;
1044
1045 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1046}
1047
946sub update { 1048sub update {
947 my ($self) = @_; 1049 my ($self) = @_;
948 1050
949 $self->SUPER::update; 1051 $self->SUPER::update;
950 1052
951 # todo: overwrite size_allocate of child 1053 $self->update_slider;
952 my $child = $self->{vp}->child;
953 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
954} 1054}
955 1055
956sub size_allocate { 1056sub invoke_size_allocate {
957 my ($self, $w, $h, $changed) = @_; 1057 my ($self, $w, $h) = @_;
958 1058
1059 $self->update_slider;
1060
959 $self->SUPER::size_allocate ($w, $h, $changed); 1061 $self->SUPER::invoke_size_allocate ($w, $h)
960
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963} 1062}
964
965#TODO# update range on size_allocate depending on child
966# update viewport offset on scroll
967 1063
968############################################################################# 1064#############################################################################
969 1065
970package CFClient::UI::Frame; 1066package CFClient::UI::Frame;
971 1067
… …
987 1083
988 if ($self->{bg}) { 1084 if ($self->{bg}) {
989 my ($w, $h) = @$self{qw(w h)}; 1085 my ($w, $h) = @$self{qw(w h)};
990 1086
991 glEnable GL_BLEND; 1087 glEnable GL_BLEND;
992 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1088 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
993 glColor @{ $self->{bg} }; 1089 glColor_premultiply @{ $self->{bg} };
994 1090
995 glBegin GL_QUADS; 1091 glBegin GL_QUADS;
996 glVertex 0 , 0; 1092 glVertex 0 , 0;
997 glVertex 0 , $h; 1093 glVertex 0 , $h;
998 glVertex $w, $h; 1094 glVertex $w, $h;
… …
1020my @border = 1116my @border =
1021 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1117 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1022 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1118 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1023 1119
1024sub new { 1120sub new {
1025 my $class = shift; 1121 my ($class, %arg) = @_;
1026 1122
1027 my $self = $class->SUPER::new ( 1123 my $self = $class->SUPER::new (
1028 bg => [1, 1, 1, 1], 1124 bg => [1, 1, 1, 1],
1029 border_bg => [1, 1, 1, 1], 1125 border_bg => [1, 1, 1, 1],
1030 border => 0.6, 1126 border => 0.6,
1031 is_toplevel => 1,
1032 can_events => 1, 1127 can_events => 1,
1033 @_ 1128 min_w => 64,
1129 min_h => 32,
1130 %arg,
1034 ); 1131 );
1035 1132
1036 $self->{title} &&= new CFClient::UI::Label 1133 $self->{title_widget} = new CFClient::UI::Label
1037 align => 0, 1134 align => 0,
1038 valign => 1, 1135 valign => 1,
1039 text => $self->{title}, 1136 text => $self->{title},
1040 fontsize => $self->{border}; 1137 fontsize => $self->{border},
1138 if exists $self->{title};
1139
1140 if ($self->{has_close_button}) {
1141 $self->{close_button} =
1142 new CFClient::UI::ImageButton
1143 path => 'x1_close.png',
1144 on_activate => sub { $self->emit ("delete") };
1145
1146 $self->CFClient::UI::Container::add ($self->{close_button});
1147 }
1041 1148
1042 $self 1149 $self
1150}
1151
1152sub add {
1153 my ($self, @widgets) = @_;
1154
1155 $self->SUPER::add (@widgets);
1156 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1157 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1043} 1158}
1044 1159
1045sub border { 1160sub border {
1046 int $_[0]{border} * $::FONTSIZE 1161 int $_[0]{border} * $::FONTSIZE
1047} 1162}
1048 1163
1049sub size_request { 1164sub size_request {
1050 my ($self) = @_; 1165 my ($self) = @_;
1166
1167 $self->{title_widget}->size_request
1168 if $self->{title_widget};
1169
1170 $self->{close_button}->size_request
1171 if $self->{close_button};
1051 1172
1052 my ($w, $h) = $self->SUPER::size_request; 1173 my ($w, $h) = $self->SUPER::size_request;
1053 1174
1054 ( 1175 (
1055 $w + $self->border * 2, 1176 $w + $self->border * 2,
1056 $h + $self->border * 2, 1177 $h + $self->border * 2,
1057 ) 1178 )
1058} 1179}
1059 1180
1060sub size_allocate { 1181sub invoke_size_allocate {
1061 my ($self, $w, $h, $changed) = @_; 1182 my ($self, $w, $h) = @_;
1062 1183
1063 return unless $changed; 1184 if ($self->{title_widget}) {
1185 $self->{title_widget}{w} = $w;
1186 $self->{title_widget}{h} = $h;
1187 $self->{title_widget}->invoke_size_allocate ($w, $h);
1188 }
1064 1189
1190 my $border = $self->border;
1191
1065 $h -= List::Util::max 0, $self->border * 2; 1192 $h -= List::Util::max 0, $border * 2;
1066 $w -= List::Util::max 0, $self->border * 2; 1193 $w -= List::Util::max 0, $border * 2;
1067 1194
1068 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1069 if $self->{title};
1070
1071 $self->child->configure ($self->border, $self->border, $w, $h); 1195 $self->child->configure ($border, $border, $w, $h);
1072}
1073 1196
1197 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1198 if $self->{close_button};
1199
1200 1
1201}
1202
1203sub invoke_delete {
1204 my ($self) = @_;
1205
1206 $self->hide;
1207
1208 1
1209}
1210
1074sub button_down { 1211sub invoke_button_down {
1075 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1076 1213
1077 my ($w, $h) = @$self{qw(w h)}; 1214 my ($w, $h) = @$self{qw(w h)};
1078 my $border = $self->border; 1215 my $border = $self->border;
1079 1216
… …
1095 my $dy = $ev->{y} - $oy; 1232 my $dy = $ev->{y} - $oy;
1096 1233
1097 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1234 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1098 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1235 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1099 1236
1237 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1100 $self->realloc; 1238 $self->realloc;
1101 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1102 }; 1239 };
1103 1240
1104 } elsif ($lr ^ $td) { 1241 } elsif ($lr ^ $td) {
1105 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1242 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1106 my ($bx, $by) = ($self->{x}, $self->{y}); 1243 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1109 my ($ev, $x, $y) = @_; 1246 my ($ev, $x, $y) = @_;
1110 1247
1111 ($x, $y) = ($ev->{x}, $ev->{y}); 1248 ($x, $y) = ($ev->{x}, $ev->{y});
1112 1249
1113 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1250 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1251 # HACK: the next line is required to enforce placement
1252 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1114 }; 1253 };
1254 } else {
1255 return 0;
1256 }
1257
1115 } 1258 1
1116} 1259}
1117 1260
1118sub button_up { 1261sub invoke_button_up {
1119 my ($self, $ev, $x, $y) = @_; 1262 my ($self, $ev, $x, $y) = @_;
1120 1263
1121 delete $self->{motion}; 1264 ! ! delete $self->{motion}
1122} 1265}
1123 1266
1124sub mouse_motion { 1267sub invoke_mouse_motion {
1125 my ($self, $ev, $x, $y) = @_; 1268 my ($self, $ev, $x, $y) = @_;
1126 1269
1127 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1270 $self->{motion}->($ev, $x, $y) if $self->{motion};
1271
1272 ! ! $self->{motion}
1128} 1273}
1129 1274
1130sub _draw { 1275sub _draw {
1131 my ($self) = @_; 1276 my ($self) = @_;
1132 1277
1278 my $child = $self->{children}[0];
1279
1133 my ($w, $h ) = ($self->{w}, $self->{h}); 1280 my ($w, $h ) = ($self->{w}, $self->{h});
1134 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1281 my ($cw, $ch) = ($child->{w}, $child->{h});
1135 1282
1136 glEnable GL_TEXTURE_2D; 1283 glEnable GL_TEXTURE_2D;
1137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1138 1285
1139 my $border = $self->border; 1286 my $border = $self->border;
… …
1154 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1301 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1155 } 1302 }
1156 1303
1157 glDisable GL_TEXTURE_2D; 1304 glDisable GL_TEXTURE_2D;
1158 1305
1159 $self->{title}->draw if $self->{title};
1160
1161 $self->child->draw; 1306 $child->draw;
1307
1308 if ($self->{title_widget}) {
1309 glTranslate 0, $border - $self->{h};
1310 $self->{title_widget}->_draw;
1311
1312 glTranslate 0, - ($border - $self->{h});
1313 }
1314
1315 $self->{close_button}->draw
1316 if $self->{close_button};
1162} 1317}
1163 1318
1164############################################################################# 1319#############################################################################
1165 1320
1166package CFClient::UI::Table; 1321package CFClient::UI::Table;
… …
1189 1344
1190 $child->set_parent ($self); 1345 $child->set_parent ($self);
1191 $self->{children}[$y][$x] = $child; 1346 $self->{children}[$y][$x] = $child;
1192 1347
1193 $self->realloc; 1348 $self->realloc;
1349}
1350
1351sub remove {
1352 my ($self, $child) = @_;
1353
1354 # TODO: not yet implemented
1194} 1355}
1195 1356
1196# TODO: move to container class maybe? send children a signal on removal? 1357# TODO: move to container class maybe? send children a signal on removal?
1197sub clear { 1358sub clear {
1198 my ($self) = @_; 1359 my ($self) = @_;
… …
1239 (sum @$ws), 1400 (sum @$ws),
1240 (sum @$hs), 1401 (sum @$hs),
1241 ) 1402 )
1242} 1403}
1243 1404
1244sub size_allocate { 1405sub invoke_size_allocate {
1245 my ($self, $w, $h, $changed) = @_; 1406 my ($self, $w, $h) = @_;
1246 1407
1247 my ($ws, $hs) = $self->get_wh; 1408 my ($ws, $hs) = $self->get_wh;
1248 1409
1249 my $req_w = (sum @$ws) || 1; 1410 my $req_w = (sum @$ws) || 1;
1250 my $req_h = (sum @$hs) || 1; 1411 my $req_h = (sum @$hs) || 1;
… …
1281 } 1442 }
1282 1443
1283 $y += $row_h; 1444 $y += $row_h;
1284 } 1445 }
1285 1446
1447 1
1286} 1448}
1287 1449
1288sub find_widget { 1450sub find_widget {
1289 my ($self, $x, $y) = @_; 1451 my ($self, $x, $y) = @_;
1290 1452
… …
1327 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1489 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1490 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 ) 1491 )
1330} 1492}
1331 1493
1332sub size_allocate { 1494sub invoke_size_allocate {
1333 my ($self, $w, $h, $changed) = @_; 1495 my ($self, $w, $h) = @_;
1334 1496
1335 my $space = $self->{vertical} ? $h : $w; 1497 my $space = $self->{vertical} ? $h : $w;
1336 my $children = $self->{children}; 1498 my @children = $self->visible_children;
1337 1499
1338 my @req; 1500 my @req;
1339 1501
1340 if ($self->{homogeneous}) { 1502 if ($self->{homogeneous}) {
1341 @req = ($space / (@$children || 1)) x @$children; 1503 @req = ($space / (@children || 1)) x @children;
1342 } else { 1504 } else {
1343 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1505 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1344 my $req = List::Util::sum @req; 1506 my $req = List::Util::sum @req;
1345 1507
1346 if ($req > $space) { 1508 if ($req > $space) {
1347 # ah well, not enough space 1509 # ah well, not enough space
1348 $_ *= $space / $req for @req; 1510 $_ *= $space / $req for @req;
1349 } else { 1511 } else {
1350 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1512 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1351 1513
1352 $space = ($space - $req) / $expand; # remaining space to give away 1514 $space = ($space - $req) / $expand; # remaining space to give away
1353 1515
1354 $req[$_] += $space * $children->[$_]{expand} 1516 $req[$_] += $space * $children[$_]{expand}
1355 for 0 .. $#$children; 1517 for 0 .. $#children;
1356 } 1518 }
1357 } 1519 }
1358 1520
1359 CFClient::UI::harmonize \@req; 1521 CFClient::UI::harmonize \@req;
1360 1522
1361 my $pos = 0; 1523 my $pos = 0;
1362 for (0 .. $#$children) { 1524 for (0 .. $#children) {
1363 my $alloc = $req[$_]; 1525 my $alloc = $req[$_];
1364 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1526 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1365 1527
1366 $pos += $alloc; 1528 $pos += $alloc;
1367 } 1529 }
1368 1530
1369 1 1531 1
… …
1421 ellipsise => 3, # end 1583 ellipsise => 3, # end
1422 layout => (new CFClient::Layout), 1584 layout => (new CFClient::Layout),
1423 fontsize => 1, 1585 fontsize => 1,
1424 align => -1, 1586 align => -1,
1425 valign => -1, 1587 valign => -1,
1426 padding => 2, 1588 padding_x => 2,
1589 padding_y => 2,
1427 can_events => 0, 1590 can_events => 0,
1428 %arg 1591 %arg
1429 ); 1592 );
1430 1593
1431 if (exists $self->{template}) { 1594 if (exists $self->{template}) {
… …
1458 1621
1459 delete $self->{texture}; 1622 delete $self->{texture};
1460 $self->SUPER::update; 1623 $self->SUPER::update;
1461} 1624}
1462 1625
1626sub realloc {
1627 my ($self) = @_;
1628
1629 delete $self->{ox};
1630 $self->SUPER::realloc;
1631}
1632
1463sub set_text { 1633sub set_text {
1464 my ($self, $text) = @_; 1634 my ($self, $text) = @_;
1465 1635
1466 return if $self->{text} eq "T$text"; 1636 return if $self->{text} eq "T$text";
1467 $self->{text} = "T$text"; 1637 $self->{text} = "T$text";
1468 1638
1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1470 $self->{layout}->set_text ($text); 1639 $self->{layout}->set_text ($text);
1471 1640
1641 delete $self->{size_req};
1472 $self->realloc; 1642 $self->realloc;
1473 $self->update; 1643 $self->update;
1474} 1644}
1475 1645
1476sub set_markup { 1646sub set_markup {
… …
1479 return if $self->{text} eq "M$markup"; 1649 return if $self->{text} eq "M$markup";
1480 $self->{text} = "M$markup"; 1650 $self->{text} = "M$markup";
1481 1651
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1652 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1653
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485 $self->{layout}->set_markup ($markup); 1654 $self->{layout}->set_markup ($markup);
1486 1655
1656 delete $self->{size_req};
1487 $self->realloc; 1657 $self->realloc;
1488 $self->update; 1658 $self->update;
1489} 1659}
1490 1660
1491sub size_request { 1661sub size_request {
1492 my ($self) = @_; 1662 my ($self) = @_;
1493 1663
1664 $self->{size_req} ||= do {
1494 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1665 $self->{layout}->set_font ($self->{font}) if $self->{font};
1495 $self->{layout}->set_width ($self->{max_w} || -1); 1666 $self->{layout}->set_width ($self->{max_w} || -1);
1496 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1667 $self->{layout}->set_ellipsise ($self->{ellipsise});
1497 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1668 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1498 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1669 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1499 1670
1500 my ($w, $h) = $self->{layout}->size; 1671 my ($w, $h) = $self->{layout}->size;
1501 1672
1502 if (exists $self->{template}) { 1673 if (exists $self->{template}) {
1503 $self->{template}->set_font ($self->{font}) if $self->{font}; 1674 $self->{template}->set_font ($self->{font}) if $self->{font};
1675 $self->{template}->set_width ($self->{max_w} || -1);
1504 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1676 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1505 1677
1506 my ($w2, $h2) = $self->{template}->size; 1678 my ($w2, $h2) = $self->{template}->size;
1507 1679
1508 $w = List::Util::max $w, $w2; 1680 $w = List::Util::max $w, $w2;
1509 $h = List::Util::max $h, $h2; 1681 $h = List::Util::max $h, $h2;
1682 }
1683
1684 [$w, $h]
1510 } 1685 };
1511 1686
1512 ( 1687 @{ $self->{size_req} }
1513 $w + $self->{padding} * 2,
1514 $h + $self->{padding} * 2,
1515 )
1516} 1688}
1517 1689
1690sub baseline_shift {
1691 $_[0]{layout}->descent
1692}
1693
1518sub size_allocate { 1694sub invoke_size_allocate {
1519 my ($self, $w, $h, $changed) = @_; 1695 my ($self, $w, $h) = @_;
1696
1697 delete $self->{ox};
1520 1698
1521 delete $self->{texture} 1699 delete $self->{texture}
1522 if $changed; 1700 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1701
1702 1
1523} 1703}
1524 1704
1525sub set_fontsize { 1705sub set_fontsize {
1526 my ($self, $fontsize) = @_; 1706 my ($self, $fontsize) = @_;
1527 1707
1528 $self->{fontsize} = $fontsize; 1708 $self->{fontsize} = $fontsize;
1709 delete $self->{size_req};
1529 delete $self->{texture}; 1710 delete $self->{texture};
1530 1711
1531 $self->realloc; 1712 $self->realloc;
1532} 1713}
1533 1714
1715sub reconfigure {
1716 my ($self) = @_;
1717
1718 delete $self->{size_req};
1719 delete $self->{texture};
1720
1721 $self->SUPER::reconfigure;
1722}
1723
1534sub _draw { 1724sub _draw {
1535 my ($self) = @_; 1725 my ($self) = @_;
1536 1726
1537 $self->SUPER::_draw; # draw background, if applicable 1727 $self->SUPER::_draw; # draw background, if applicable
1538 1728
1539 my $tex = $self->{texture} ||= do { 1729 my $size = $self->{texture} ||= do {
1540 $self->{layout}->set_foreground (@{$self->{fg}}); 1730 $self->{layout}->set_foreground (@{$self->{fg}});
1541 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1731 $self->{layout}->set_font ($self->{font}) if $self->{font};
1542 $self->{layout}->set_width ($self->{w}); 1732 $self->{layout}->set_width ($self->{w});
1543 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1733 $self->{layout}->set_ellipsise ($self->{ellipsise});
1544 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1734 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1735 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546 1736
1547 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1737 [$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 }; 1738 };
1559 1739
1560 glEnable GL_TEXTURE_2D; 1740 unless (exists $self->{ox}) {
1561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1741 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1742 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1743 : ($self->{w} - $size->[0]) * 0.5);
1562 1744
1563 if ($tex->{format} == GL_ALPHA) { 1745 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1564 glColor @{$self->{fg}}; 1746 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1565 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1747 : ($self->{h} - $size->[1]) * 0.5);
1566 } else {
1567 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1568 } 1748 };
1569 1749
1570 glDisable GL_TEXTURE_2D; 1750 my $w = List::Util::min $self->{w} + 4, $size->[0];
1751 my $h = List::Util::min $self->{h} + 2, $size->[1];
1752
1753 $self->{layout}->render ($self->{ox}, $self->{oy});
1571} 1754}
1572 1755
1573############################################################################# 1756#############################################################################
1574 1757
1575package CFClient::UI::EntryBase; 1758package CFClient::UI::EntryBase;
… …
1589 can_hover => 1, 1772 can_hover => 1,
1590 can_focus => 1, 1773 can_focus => 1,
1591 valign => 0, 1774 valign => 0,
1592 can_events => 1, 1775 can_events => 1,
1593 #text => ... 1776 #text => ...
1777 #hidden => "*",
1594 @_ 1778 @_
1595 ) 1779 )
1596} 1780}
1597 1781
1598sub _set_text { 1782sub _set_text {
… …
1600 1784
1601 delete $self->{cur_h}; 1785 delete $self->{cur_h};
1602 1786
1603 return if $self->{text} eq $text; 1787 return if $self->{text} eq $text;
1604 1788
1605 delete $self->{texture};
1606
1607 $self->{last_activity} = $::NOW; 1789 $self->{last_activity} = $::NOW;
1608 $self->{text} = $text; 1790 $self->{text} = $text;
1609 1791
1610 $text =~ s/./*/g if $self->{hidden}; 1792 $text =~ s/./*/g if $self->{hidden};
1611 $self->{layout}->set_text ("$text "); 1793 $self->{layout}->set_text ("$text ");
1794 delete $self->{size_req};
1612 1795
1613 $self->_emit (changed => $self->{text}); 1796 $self->emit (changed => $self->{text});
1797
1798 $self->realloc;
1799 $self->update;
1614} 1800}
1615 1801
1616sub set_text { 1802sub set_text {
1617 my ($self, $text) = @_; 1803 my ($self, $text) = @_;
1618 1804
1619 $self->{cursor} = length $text; 1805 $self->{cursor} = length $text;
1620 $self->_set_text ($text); 1806 $self->_set_text ($text);
1621
1622 $self->realloc;
1623} 1807}
1624 1808
1625sub get_text { 1809sub get_text {
1626 $_[0]{text} 1810 $_[0]{text}
1627} 1811}
… …
1632 my ($w, $h) = $self->SUPER::size_request; 1816 my ($w, $h) = $self->SUPER::size_request;
1633 1817
1634 ($w + 1, $h) # add 1 for cursor 1818 ($w + 1, $h) # add 1 for cursor
1635} 1819}
1636 1820
1637sub key_down { 1821sub invoke_key_down {
1638 my ($self, $ev) = @_; 1822 my ($self, $ev) = @_;
1639 1823
1640 my $mod = $ev->{mod}; 1824 my $mod = $ev->{mod};
1641 my $sym = $ev->{sym}; 1825 my $sym = $ev->{sym};
1642 my $uni = $ev->{unicode}; 1826 my $uni = $ev->{unicode};
… …
1654 } elsif ($sym == CFClient::SDLK_HOME) { 1838 } elsif ($sym == CFClient::SDLK_HOME) {
1655 $self->{cursor} = 0; 1839 $self->{cursor} = 0;
1656 } elsif ($sym == CFClient::SDLK_END) { 1840 } elsif ($sym == CFClient::SDLK_END) {
1657 $self->{cursor} = length $text; 1841 $self->{cursor} = length $text;
1658 } elsif ($uni == 27) { 1842 } elsif ($uni == 27) {
1659 $self->_emit ('escape'); 1843 $self->emit ('escape');
1660 } elsif ($uni) { 1844 } elsif ($uni) {
1661 substr $text, $self->{cursor}++, 0, chr $uni; 1845 substr $text, $self->{cursor}++, 0, chr $uni;
1846 } else {
1847 return 0;
1662 } 1848 }
1663 1849
1664 $self->_set_text ($text); 1850 $self->_set_text ($text);
1665 1851
1666 $self->realloc; 1852 $self->realloc;
1667}
1668 1853
1854 1
1855}
1856
1669sub focus_in { 1857sub invoke_focus_in {
1670 my ($self) = @_; 1858 my ($self) = @_;
1671 1859
1672 $self->{last_activity} = $::NOW; 1860 $self->{last_activity} = $::NOW;
1673 1861
1674 $self->SUPER::focus_in; 1862 $self->SUPER::invoke_focus_in
1675} 1863}
1676 1864
1677sub button_down { 1865sub invoke_button_down {
1678 my ($self, $ev, $x, $y) = @_; 1866 my ($self, $ev, $x, $y) = @_;
1679 1867
1680 $self->SUPER::button_down ($ev, $x, $y); 1868 $self->SUPER::invoke_button_down ($ev, $x, $y);
1681 1869
1682 my $idx = $self->{layout}->xy_to_index ($x, $y); 1870 my $idx = $self->{layout}->xy_to_index ($x, $y);
1683 1871
1684 # byte-index to char-index 1872 # byte-index to char-index
1685 my $text = $self->{text}; 1873 my $text = $self->{text};
1686 utf8::encode $text; 1874 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1687 $self->{cursor} = length substr $text, 0, $idx; 1875 $self->{cursor} = length $text;
1688 1876
1689 $self->_set_text ($self->{text}); 1877 $self->_set_text ($self->{text});
1690 $self->update; 1878 $self->update;
1879
1880 1
1691} 1881}
1692 1882
1693sub mouse_motion { 1883sub invoke_mouse_motion {
1694 my ($self, $ev, $x, $y) = @_; 1884 my ($self, $ev, $x, $y) = @_;
1695# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1885# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1886
1887 1
1696} 1888}
1697 1889
1698sub _draw { 1890sub _draw {
1699 my ($self) = @_; 1891 my ($self) = @_;
1700 1892
1701 local $self->{fg} = $self->{fg}; 1893 local $self->{fg} = $self->{fg};
1702 1894
1703 if ($FOCUS == $self) { 1895 if ($FOCUS == $self) {
1704 glColor @{$self->{active_bg}}; 1896 glColor_premultiply @{$self->{active_bg}};
1705 $self->{fg} = $self->{active_fg}; 1897 $self->{fg} = $self->{active_fg};
1706 } else { 1898 } else {
1707 glColor @{$self->{bg}}; 1899 glColor_premultiply @{$self->{bg}};
1708 } 1900 }
1709 1901
1710 glEnable GL_BLEND; 1902 glEnable GL_BLEND;
1711 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1903 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1712 glBegin GL_QUADS; 1904 glBegin GL_QUADS;
1713 glVertex 0 , 0; 1905 glVertex 0 , 0;
1714 glVertex 0 , $self->{h}; 1906 glVertex 0 , $self->{h};
1715 glVertex $self->{w}, $self->{h}; 1907 glVertex $self->{w}, $self->{h};
1716 glVertex $self->{w}, 0; 1908 glVertex $self->{w}, 0;
… …
1741 1933
1742our @ISA = CFClient::UI::EntryBase::; 1934our @ISA = CFClient::UI::EntryBase::;
1743 1935
1744use CFClient::OpenGL; 1936use CFClient::OpenGL;
1745 1937
1746sub key_down { 1938sub invoke_key_down {
1747 my ($self, $ev) = @_; 1939 my ($self, $ev) = @_;
1748 1940
1749 my $sym = $ev->{sym}; 1941 my $sym = $ev->{sym};
1750 1942
1751 if ($sym == 13) { 1943 if ($sym == 13) {
1752 unshift @{$self->{history}}, 1944 unshift @{$self->{history}},
1753 my $txt = $self->get_text; 1945 my $txt = $self->get_text;
1946
1754 $self->{history_pointer} = -1; 1947 $self->{history_pointer} = -1;
1755 $self->{history_saveback} = ''; 1948 $self->{history_saveback} = '';
1756 $self->_emit (activate => $txt); 1949 $self->emit (activate => $txt);
1757 $self->update; 1950 $self->update;
1758 1951
1759 } elsif ($sym == CFClient::SDLK_UP) { 1952 } elsif ($sym == CFClient::SDLK_UP) {
1760 if ($self->{history_pointer} < 0) { 1953 if ($self->{history_pointer} < 0) {
1761 $self->{history_saveback} = $self->get_text; 1954 $self->{history_saveback} = $self->get_text;
… …
1777 } else { 1970 } else {
1778 $self->set_text ($self->{history_saveback}); 1971 $self->set_text ($self->{history_saveback});
1779 } 1972 }
1780 1973
1781 } else { 1974 } else {
1782 $self->SUPER::key_down ($ev); 1975 return $self->SUPER::invoke_key_down ($ev)
1976 }
1977
1783 } 1978 1
1784
1785} 1979}
1786 1980
1787############################################################################# 1981#############################################################################
1788 1982
1789package CFClient::UI::Button; 1983package CFClient::UI::Button;
… …
1798 1992
1799sub new { 1993sub new {
1800 my $class = shift; 1994 my $class = shift;
1801 1995
1802 $class->SUPER::new ( 1996 $class->SUPER::new (
1803 padding => 4, 1997 padding_x => 4,
1998 padding_y => 4,
1804 fg => [1, 1, 1], 1999 fg => [1, 1, 1],
1805 active_fg => [0, 0, 1], 2000 active_fg => [0, 0, 1],
1806 can_hover => 1, 2001 can_hover => 1,
1807 align => 0, 2002 align => 0,
1808 valign => 0, 2003 valign => 0,
1809 can_events => 1, 2004 can_events => 1,
1810 @_ 2005 @_
1811 ) 2006 )
1812} 2007}
1813 2008
1814sub activate { }
1815
1816sub button_up { 2009sub invoke_button_up {
1817 my ($self, $ev, $x, $y) = @_; 2010 my ($self, $ev, $x, $y) = @_;
1818 2011
1819 $self->emit ("activate") 2012 $self->emit ("activate")
1820 if $x >= 0 && $x < $self->{w} 2013 if $x >= 0 && $x < $self->{w}
1821 && $y >= 0 && $y < $self->{h}; 2014 && $y >= 0 && $y < $self->{h};
2015
2016 1
1822} 2017}
1823 2018
1824sub _draw { 2019sub _draw {
1825 my ($self) = @_; 2020 my ($self) = @_;
1826 2021
1827 local $self->{fg} = $self->{fg}; 2022 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1828
1829 if ($GRAB == $self) {
1830 $self->{fg} = $self->{active_fg};
1831 }
1832 2023
1833 glEnable GL_TEXTURE_2D; 2024 glEnable GL_TEXTURE_2D;
1834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1835 glColor 0, 0, 0, 1; 2026 glColor 0, 0, 0, 1;
1836 2027
… …
1841 $self->SUPER::_draw; 2032 $self->SUPER::_draw;
1842} 2033}
1843 2034
1844############################################################################# 2035#############################################################################
1845 2036
2037package CFClient::UI::ImageButton;
2038
2039our @ISA = CFClient::UI::Image::;
2040
2041use CFClient::OpenGL;
2042
2043my %textures;
2044
2045sub new {
2046 my $class = shift;
2047
2048 my $self = $class->SUPER::new (
2049 padding_x => 4,
2050 padding_y => 4,
2051 fg => [1, 1, 1],
2052 active_fg => [0, 0, 1],
2053 can_hover => 1,
2054 align => 0,
2055 valign => 0,
2056 can_events => 1,
2057 @_
2058 );
2059}
2060
2061sub invoke_button_up {
2062 my ($self, $ev, $x, $y) = @_;
2063
2064 $self->emit ("activate")
2065 if $x >= 0 && $x < $self->{w}
2066 && $y >= 0 && $y < $self->{h};
2067
2068 1
2069}
2070
2071#############################################################################
2072
1846package CFClient::UI::CheckBox; 2073package CFClient::UI::CheckBox;
1847 2074
1848our @ISA = CFClient::UI::DrawBG::; 2075our @ISA = CFClient::UI::DrawBG::;
1849 2076
1850my @tex = 2077my @tex =
… …
1855 2082
1856sub new { 2083sub new {
1857 my $class = shift; 2084 my $class = shift;
1858 2085
1859 $class->SUPER::new ( 2086 $class->SUPER::new (
1860 padding => 2, 2087 padding_x => 2,
2088 padding_y => 2,
1861 fg => [1, 1, 1], 2089 fg => [1, 1, 1],
1862 active_fg => [1, 1, 0], 2090 active_fg => [1, 1, 0],
1863 bg => [0, 0, 0, 0.2], 2091 bg => [0, 0, 0, 0.2],
1864 active_bg => [1, 1, 1, 0.5], 2092 active_bg => [1, 1, 1, 0.5],
1865 state => 0, 2093 state => 0,
… …
1869} 2097}
1870 2098
1871sub size_request { 2099sub size_request {
1872 my ($self) = @_; 2100 my ($self) = @_;
1873 2101
1874 ($self->{padding} * 2 + 6) x 2 2102 (6) x 2
1875} 2103}
1876 2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
1877sub button_down { 2113sub invoke_button_down {
1878 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
1879 2115
1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882 $self->{state} = !$self->{state}; 2118 $self->toggle;
1883 $self->_emit (changed => $self->{state}); 2119 } else {
2120 return 0
2121 }
2122
1884 } 2123 1
1885} 2124}
1886 2125
1887sub _draw { 2126sub _draw {
1888 my ($self) = @_; 2127 my ($self) = @_;
1889 2128
1890 $self->SUPER::_draw; 2129 $self->SUPER::_draw;
1891 2130
1892 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2131 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893 2132
1894 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2133 my ($w, $h) = @$self{qw(w h)};
2134
2135 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1895 2136
1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2137 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897 2138
1898 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2139 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899 2140
… …
1907package CFClient::UI::Image; 2148package CFClient::UI::Image;
1908 2149
1909our @ISA = CFClient::UI::Base::; 2150our @ISA = CFClient::UI::Base::;
1910 2151
1911use CFClient::OpenGL; 2152use CFClient::OpenGL;
1912use Carp qw/confess/;
1913 2153
1914our %loaded_images; 2154our %texture_cache;
1915 2155
1916sub new { 2156sub new {
1917 my $class = shift; 2157 my $class = shift;
1918 2158
1919 my $self = $class->SUPER::new (can_events => 0, @_); 2159 my $self = $class->SUPER::new (
2160 can_events => 0,
2161 @_,
2162 );
1920 2163
1921 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2164 $self->{path} || $self->{tex}
2165 or Carp::croak "'path' or 'tex' attributes required";
1922 2166
1923 $loaded_images{$self->{image}} ||= 2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1924 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2168 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1925 2169
1926 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2170 Scalar::Util::weaken $texture_cache{$self->{path}};
1927 2171
1928 Scalar::Util::weaken $loaded_images{$self->{image}}; 2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1929
1930 $self->{aspect} = $tex->{w} / $tex->{h};
1931 2173
1932 $self 2174 $self
1933} 2175}
1934 2176
1935sub size_request { 2177sub size_request {
1936 my ($self) = @_; 2178 my ($self) = @_;
1937 2179
1938 ($self->{tex}->{w}, $self->{tex}->{h}) 2180 ($self->{tex}{w}, $self->{tex}{h})
1939} 2181}
1940 2182
1941sub _draw { 2183sub _draw {
1942 my ($self) = @_; 2184 my ($self) = @_;
1943 2185
… …
2052 my $ycut1 = max 0, min 1, $ycut; 2294 my $ycut1 = max 0, min 1, $ycut;
2053 my $ycut2 = max 0, min 1, $ycut - 1; 2295 my $ycut2 = max 0, min 1, $ycut - 1;
2054 2296
2055 my $h1 = $self->{h} * (1 - $ycut1); 2297 my $h1 = $self->{h} * (1 - $ycut1);
2056 my $h2 = $self->{h} * (1 - $ycut2); 2298 my $h2 = $self->{h} * (1 - $ycut2);
2299 my $h3 = $self->{h};
2300
2301 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2057 2302
2058 glEnable GL_BLEND; 2303 glEnable GL_BLEND;
2059 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2304 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2305 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2060 glEnable GL_TEXTURE_2D; 2306 glEnable GL_TEXTURE_2D;
2061 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2307 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062 2308
2063 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2309 glBindTexture GL_TEXTURE_2D, $t1->{name};
2064 glBegin GL_QUADS; 2310 glBegin GL_QUADS;
… …
2079 2325
2080 if ($t3) { 2326 if ($t3) {
2081 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2327 glBindTexture GL_TEXTURE_2D, $t3->{name};
2082 glBegin GL_QUADS; 2328 glBegin GL_QUADS;
2083 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2329 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2084 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2330 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2085 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2331 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2086 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2332 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2087 glEnd; 2333 glEnd;
2088 } 2334 }
2089 2335
2090 glDisable GL_BLEND; 2336 glDisable GL_BLEND;
… …
2164 fg => [1, 1, 1], 2410 fg => [1, 1, 1],
2165 active_fg => [0, 0, 0], 2411 active_fg => [0, 0, 0],
2166 bg => [0, 0, 0, 0.2], 2412 bg => [0, 0, 0, 0.2],
2167 active_bg => [1, 1, 1, 0.5], 2413 active_bg => [1, 1, 1, 0.5],
2168 range => [0, 0, 100, 10, 0], 2414 range => [0, 0, 100, 10, 0],
2169 req_w => $::WIDTH / 80, 2415 min_w => $::WIDTH / 80,
2170 req_h => $::WIDTH / 80, 2416 min_h => $::WIDTH / 80,
2171 vertical => 0, 2417 vertical => 0,
2172 can_hover => 1, 2418 can_hover => 1,
2173 inner_pad => 0.02, 2419 inner_pad => 0.02,
2174 @_ 2420 @_
2175 ); 2421 );
… …
2178 $self->update; 2424 $self->update;
2179 2425
2180 $self 2426 $self
2181} 2427}
2182 2428
2183sub changed { }
2184
2185sub set_range { 2429sub set_range {
2186 my ($self, $range) = @_; 2430 my ($self, $range) = @_;
2187 2431
2188 ($range, $self->{range}) = ($self->{range}, $range); 2432 ($range, $self->{range}) = ($self->{range}, $range);
2189 2433
2190 $self->update
2191 if "@$range" ne "@{$self->{range}}"; 2434 if ("@$range" ne "@{$self->{range}}") {
2435 $self->update;
2436 $self->set_value ($self->{range}[0]);
2437 }
2192} 2438}
2193 2439
2194sub set_value { 2440sub set_value {
2195 my ($self, $value) = @_; 2441 my ($self, $value) = @_;
2196 2442
… …
2207 if $unit; 2453 if $unit;
2208 2454
2209 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2455 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2210 2456
2211 if ($value != $old_value) { 2457 if ($value != $old_value) {
2212 $self->_emit (changed => $value); 2458 $self->emit (changed => $value);
2213 $self->update; 2459 $self->update;
2214 } 2460 }
2215} 2461}
2216 2462
2217sub size_request { 2463sub size_request {
2218 my ($self) = @_; 2464 my ($self) = @_;
2219 2465
2220 my $w = $self->{req_w}; 2466 ($self->{req_w}, $self->{req_h})
2221 my $h = $self->{req_h};
2222
2223 $self->{vertical} ? ($h, $w) : ($w, $h)
2224} 2467}
2225 2468
2226sub button_down { 2469sub invoke_button_down {
2227 my ($self, $ev, $x, $y) = @_; 2470 my ($self, $ev, $x, $y) = @_;
2228 2471
2229 $self->SUPER::button_down ($ev, $x, $y); 2472 $self->SUPER::invoke_button_down ($ev, $x, $y);
2230 2473
2231 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2474 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2232 2475
2233 $self->mouse_motion ($ev, $x, $y); 2476 $self->invoke_mouse_motion ($ev, $x, $y)
2234} 2477}
2235 2478
2236sub mouse_motion { 2479sub invoke_mouse_motion {
2237 my ($self, $ev, $x, $y) = @_; 2480 my ($self, $ev, $x, $y) = @_;
2238 2481
2239 if ($GRAB == $self) { 2482 if ($GRAB == $self) {
2240 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2483 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2241 2484
2242 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2485 my (undef, $lo, $hi, $page) = @{$self->{range}};
2243 2486
2244 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2487 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2245 2488
2246 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2489 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2490 } else {
2491 return 0;
2492 }
2493
2247 } 2494 1
2495}
2496
2497sub invoke_mouse_wheel {
2498 my ($self, $ev) = @_;
2499
2500 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501
2502 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
2503
2504 ! ! $delta
2248} 2505}
2249 2506
2250sub update { 2507sub update {
2251 my ($self) = @_; 2508 my ($self) = @_;
2252 2509
2253 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2510 delete $self->{knob_w};
2511 $self->SUPER::update;
2512}
2513
2514sub _draw {
2515 my ($self) = @_;
2516
2517 unless ($self->{knob_w}) {
2254 $self->set_value ($self->{range}[0]); 2518 $self->set_value ($self->{range}[0]);
2255 2519
2256 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2520 my ($value, $lo, $hi, $page) = @{$self->{range}};
2257 my $range = ($hi - $page - $lo) || 1e-100; 2521 my $range = ($hi - $page - $lo) || 1e-100;
2258 2522
… …
2264 $value = ($value - $lo) / $range; 2528 $value = ($value - $lo) / $range;
2265 $value = $value * $self->{scale} + $self->{offset}; 2529 $value = $value * $self->{scale} + $self->{offset};
2266 2530
2267 $self->{knob_x} = $value - $knob_w * 0.5; 2531 $self->{knob_x} = $value - $knob_w * 0.5;
2268 $self->{knob_w} = $knob_w; 2532 $self->{knob_w} = $knob_w;
2269 }); 2533 }
2270
2271 $self->SUPER::update;
2272}
2273
2274sub _draw {
2275 my ($self) = @_;
2276 2534
2277 $self->SUPER::_draw (); 2535 $self->SUPER::_draw ();
2278 2536
2279 glScale $self->{w}, $self->{h}; 2537 glScale $self->{w}, $self->{h};
2280 2538
… …
2341sub set_range { shift->{slider}->set_range (@_) } 2599sub set_range { shift->{slider}->set_range (@_) }
2342sub set_value { shift->{slider}->set_value (@_) } 2600sub set_value { shift->{slider}->set_value (@_) }
2343 2601
2344############################################################################# 2602#############################################################################
2345 2603
2346package CFClient::UI::TextView; 2604package CFClient::UI::TextScroller;
2347 2605
2348our @ISA = CFClient::UI::HBox::; 2606our @ISA = CFClient::UI::HBox::;
2349 2607
2350use CFClient::OpenGL; 2608use CFClient::OpenGL;
2351 2609
2352sub new { 2610sub new {
2353 my $class = shift; 2611 my $class = shift;
2354 2612
2355 my $self = $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2356 fontsize => 1, 2614 fontsize => 1,
2357 can_events => 0, 2615 can_events => 1,
2616 indent => 0,
2358 #font => default_font 2617 #font => default_font
2359 @_, 2618 @_,
2360 2619
2361 layout => (new CFClient::Layout 1), 2620 layout => (new CFClient::Layout),
2362 par => [], 2621 par => [],
2363 height => 0, 2622 height => 0,
2364 children => [ 2623 children => [
2365 (new CFClient::UI::Empty expand => 1), 2624 (new CFClient::UI::Empty expand => 1),
2366 (new CFClient::UI::Slider vertical => 1), 2625 (new CFClient::UI::Slider vertical => 1),
… …
2377 2636
2378 $self->{fontsize} = $fontsize; 2637 $self->{fontsize} = $fontsize;
2379 $self->reflow; 2638 $self->reflow;
2380} 2639}
2381 2640
2641sub size_request {
2642 my ($self) = @_;
2643
2644 my ($empty, $slider) = @{ $self->{children} };
2645
2646 local $self->{children} = [$empty, $slider];
2647 $self->SUPER::size_request
2648}
2649
2382sub size_allocate { 2650sub invoke_size_allocate {
2383 my ($self, $w, $h, $changed) = @_; 2651 my ($self, $w, $h) = @_;
2384 2652
2385 $self->SUPER::size_allocate ($w, $h, $changed); 2653 my ($empty, $slider, @other) = @{ $self->{children} };
2386 2654 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2387 return unless $changed;
2388 2655
2389 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2656 $self->{layout}->set_font ($self->{font}) if $self->{font};
2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2657 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2391 $self->{layout}->set_width ($self->{children}[0]{w}); 2658 $self->{layout}->set_width ($empty->{w});
2659 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2392 2660
2393 $self->reflow; 2661 $self->reflow;
2394}
2395 2662
2396sub text_size { 2663 local $self->{children} = [$empty, $slider];
2664 $self->SUPER::invoke_size_allocate ($w, $h)
2665}
2666
2667sub invoke_mouse_wheel {
2397 my ($self, $text, $indent) = @_; 2668 my ($self, $ev) = @_;
2669
2670 return 0 unless $ev->{dy}; # only vertical movements
2671
2672 $self->{children}[1]->emit (mouse_wheel => $ev);
2673
2674 1
2675}
2676
2677sub get_layout {
2678 my ($self, $para) = @_;
2398 2679
2399 my $layout = $self->{layout}; 2680 my $layout = $self->{layout};
2400 2681
2682 $layout->set_font ($self->{font}) if $self->{font};
2683 $layout->set_foreground (@{$para->{fg}});
2401 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2684 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2402 $layout->set_width ($self->{children}[0]{w} - $indent); 2685 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2686 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2403 $layout->set_markup ($text); 2687 $layout->set_markup ($para->{markup});
2688
2689 $layout->set_shapes (
2690 map
2691 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2692 @{$para->{widget}}
2404 2693 );
2694
2405 $layout->size 2695 $layout
2406} 2696}
2407 2697
2408sub reflow { 2698sub reflow {
2409 my ($self) = @_; 2699 my ($self) = @_;
2410 2700
… …
2419 $self->{children}[1]->set_value ($offset); 2709 $self->{children}[1]->set_value ($offset);
2420} 2710}
2421 2711
2422sub clear { 2712sub clear {
2423 my ($self) = @_; 2713 my ($self) = @_;
2714
2715 my (undef, undef, @other) = @{ $self->{children} };
2716 $self->remove ($_) for @other;
2424 2717
2425 $self->{par} = []; 2718 $self->{par} = [];
2426 $self->{height} = 0; 2719 $self->{height} = 0;
2427 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2720 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2428} 2721}
2429 2722
2430sub add_paragraph { 2723sub add_paragraph {
2431 my ($self, $color, $text, $indent) = @_; 2724 my ($self, $color, $para, $indent) = @_;
2432 2725
2433 for my $line (split /\n/, $text) { 2726 my ($text, @w) = ref $para ? @$para : $para;
2434 my ($w, $h) = $self->text_size ($line); 2727
2435 $self->{height} += $h; 2728 $para = {
2436 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2729 w => 1e10,
2730 wrapped => 1,
2731 fg => $color,
2732 indent => $indent,
2733 markup => $text,
2734 widget => \@w,
2437 } 2735 };
2438 2736
2439 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2737 $self->add (@w) if @w;
2738 push @{$self->{par}}, $para;
2739
2740 $self->{need_reflow}++;
2741 $self->update;
2742}
2743
2744sub scroll_to_bottom {
2745 my ($self) = @_;
2746
2747 $self->{scroll_to_bottom} = 1;
2748 $self->update;
2440} 2749}
2441 2750
2442sub update { 2751sub update {
2443 my ($self) = @_; 2752 my ($self) = @_;
2444 2753
… …
2446 2755
2447 return unless $self->{h} > 0; 2756 return unless $self->{h} > 0;
2448 2757
2449 delete $self->{texture}; 2758 delete $self->{texture};
2450 2759
2451 $ROOT->on_post_alloc ($self, sub { 2760 $ROOT->on_post_alloc ($self => sub {
2452 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2761 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2453 2762
2454 if (delete $self->{need_reflow}) { 2763 if (delete $self->{need_reflow}) {
2455 my $height = 0; 2764 my $height = 0;
2456 2765
2457 my $layout = $self->{layout};
2458
2459 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2460
2461 for (@{$self->{par}}) { 2766 for my $para (@{$self->{par}}) {
2462 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2767 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2463 $layout->set_width ($W - $_->[3]); 2768 my $layout = $self->get_layout ($para);
2464 $layout->set_markup ($_->[4]);
2465 my ($w, $h) = $layout->size; 2769 my ($w, $h) = $layout->size;
2466 $_->[0] = $w + $_->[3]; 2770
2467 $_->[1] = $h; 2771 $para->{w} = $w + $para->{indent};
2772 $para->{h} = $h;
2773 $para->{wrapped} = $layout->has_wrapped;
2468 } 2774 }
2469 2775
2470 $height += $_->[1]; 2776 $height += $para->{h};
2471 } 2777 }
2472 2778
2473 $self->{height} = $height; 2779 $self->{height} = $height;
2474 2780
2475 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2781 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2476 2782
2477 delete $self->{texture}; 2783 delete $self->{texture};
2478 } 2784 }
2479 2785
2786 if (delete $self->{scroll_to_bottom}) {
2787 $self->{children}[1]->set_value (1e10);
2788 }
2789
2480 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2790 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2481 glClearColor 0.5, 0.5, 0.5, 0; 2791 glClearColor 0, 0, 0, 0;
2482 glClear GL_COLOR_BUFFER_BIT; 2792 glClear GL_COLOR_BUFFER_BIT;
2483 2793
2484 my $top = int $self->{children}[1]{range}[0]; 2794 my $top = int $self->{children}[1]{range}[0];
2485 2795
2486 my $y0 = $top; 2796 my $y0 = $top;
2487 my $y1 = $top + $H; 2797 my $y1 = $top + $H;
2488 2798
2489 my $y = 0; 2799 my $y = 0;
2490 2800
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}}) { 2801 for my $para (@{$self->{par}}) {
2500 my $h = $par->[1]; 2802 my $h = $para->{h};
2501 2803
2502 if ($y0 < $y + $h && $y < $y1) { 2804 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 2805
2507 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2806 my $layout = $self->get_layout ($para);
2508 2807
2509 glRasterPos $par->[3], $y - $y0; 2808 $layout->render ($para->{indent}, $y - $y0);
2510 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2809
2810 if (my @w = @{ $para->{widget} }) {
2811 my @s = $layout->get_shapes;
2812
2813 for (@w) {
2814 my ($dx, $dy) = splice @s, 0, 2, ();
2815
2816 $_->{x} = $dx + $para->{indent};
2817 $_->{y} = $dy + $y - $y0;
2818
2819 $_->draw;
2820 }
2821 }
2511 } 2822 }
2512 2823
2513 $y += $h; 2824 $y += $h;
2514 } 2825 }
2515
2516 glDisable GL_BLEND;
2517 }; 2826 };
2518 }); 2827 });
2519} 2828}
2520 2829
2830sub reconfigure {
2831 my ($self) = @_;
2832
2833 $self->SUPER::reconfigure;
2834
2835 $_->{w} = 1e10 for @{ $self->{par} };
2836 $self->reflow;
2837}
2838
2521sub _draw { 2839sub _draw {
2522 my ($self) = @_; 2840 my ($self) = @_;
2523 2841
2524 glEnable GL_TEXTURE_2D; 2842 glEnable GL_TEXTURE_2D;
2525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2843 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2526 glColor 1, 1, 1, 1; 2844 glColor 0, 0, 0, 1;
2527 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2845 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2528 glDisable GL_TEXTURE_2D; 2846 glDisable GL_TEXTURE_2D;
2529 2847
2530 $self->{children}[1]->draw; 2848 $self->{children}[1]->draw;
2531
2532} 2849}
2533 2850
2534############################################################################# 2851#############################################################################
2535 2852
2536package CFClient::UI::Animator; 2853package CFClient::UI::Animator;
… …
2615} 2932}
2616 2933
2617sub set_tooltip_from { 2934sub set_tooltip_from {
2618 my ($self, $widget) = @_; 2935 my ($self, $widget) = @_;
2619 2936
2937 my $tooltip = $widget->{tooltip};
2938
2939 if ($ENV{CFPLUS_DEBUG} & 2) {
2940 $tooltip .= "\n\n" . (ref $widget) . "\n"
2941 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2942 . "req $widget->{req_w} $widget->{req_h}\n"
2943 . "visible $widget->{visible}";
2944 }
2945
2946 $tooltip =~ s/^\n+//;
2947 $tooltip =~ s/\n+$//;
2948
2620 $self->add (new CFClient::UI::Label 2949 $self->add (new CFClient::UI::Label
2621 markup => $widget->{tooltip}, 2950 markup => $tooltip,
2622 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2951 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2623 fontsize => 0.8, 2952 fontsize => 0.8,
2624 fg => [0, 0, 0, 1], 2953 fg => [0, 0, 0, 1],
2625 ellipsise => 0, 2954 ellipsise => 0,
2626 font => ($widget->{tooltip_font} || $::FONT_PROP), 2955 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2633 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2634 2963
2635 ($w + 4, $h + 4) 2964 ($w + 4, $h + 4)
2636} 2965}
2637 2966
2638sub size_allocate { 2967sub invoke_size_allocate {
2639 my ($self, $w, $h, $changed) = @_; 2968 my ($self, $w, $h) = @_;
2640 2969
2641 return unless $changed;
2642
2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2970 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2644} 2971}
2645 2972
2646sub visibility_change { 2973sub invoke_visibility_change {
2647 my ($self, $visible) = @_; 2974 my ($self, $visible) = @_;
2648 2975
2649 return unless $visible; 2976 return unless $visible;
2650 2977
2651 $self->{root}->on_post_alloc ("move_$self" => sub { 2978 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2653 or return; 2980 or return;
2654 2981
2655 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2982 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2656 2983
2657 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2984 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2658 if $x + $self->{w} > $::WIDTH; 2985 if $x + $self->{w} > $self->{root}{w};
2659 2986
2660 $self->move_abs ($x, $y); 2987 $self->move_abs ($x, $y);
2661 }); 2988 });
2662} 2989}
2663 2990
… …
2752 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3079 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2753 3080
2754 if ($tex) { 3081 if ($tex) {
2755 glEnable GL_TEXTURE_2D; 3082 glEnable GL_TEXTURE_2D;
2756 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3083 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2757 glColor 1, 1, 1, 1; 3084 glColor 0, 0, 0, 1;
2758 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3085 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2759 glDisable GL_TEXTURE_2D; 3086 glDisable GL_TEXTURE_2D;
2760 } 3087 }
2761} 3088}
2762 3089
2763sub DESTROY { 3090sub destroy {
2764 my ($self) = @_; 3091 my ($self) = @_;
2765 3092
2766 $self->{timer}->cancel 3093 $self->{timer}->cancel
2767 if $self->{timer}; 3094 if $self->{timer};
2768 3095
2769 $self->SUPER::DESTROY; 3096 $self->SUPER::destroy;
2770} 3097}
2771 3098
2772############################################################################# 3099#############################################################################
2773 3100
2774package CFClient::UI::Inventory; 3101package CFClient::UI::Buttonbar;
2775 3102
2776our @ISA = CFClient::UI::ScrolledWindow::; 3103our @ISA = CFClient::UI::HBox::;
2777 3104
2778sub new { 3105# TODO: should actualyl wrap buttons and other goodies.
2779 my $class = shift;
2780
2781 my $self = $class->SUPER::new (
2782 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2783 @_,
2784 );
2785
2786 $self
2787}
2788
2789sub set_items {
2790 my ($self, $items) = @_;
2791
2792 $self->{scrolled}->clear;
2793 return unless $items;
2794
2795 my @items = sort {
2796 ($a->{type} <=> $b->{type})
2797 or ($a->{name} cmp $b->{name})
2798 } @$items;
2799
2800 $self->{real_items} = \@items;
2801
2802 my $row = 0;
2803 for my $item (@items) {
2804 CFClient::Item::update_widgets $item;
2805
2806 $self->{scrolled}->add (0, $row, $item->{face_widget});
2807 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2808 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2809
2810 $row++;
2811 }
2812}
2813 3106
2814############################################################################# 3107#############################################################################
2815 3108
2816package CFClient::UI::Menu; 3109package CFClient::UI::Menu;
2817 3110
… …
2829 ); 3122 );
2830 3123
2831 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3124 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2832 3125
2833 for my $item (@{ $self->{items} }) { 3126 for my $item (@{ $self->{items} }) {
2834 my ($widget, $cb) = @$item; 3127 my ($widget, $cb, $tooltip) = @$item;
2835 3128
2836 # handle various types of items, only text for now 3129 # handle various types of items, only text for now
2837 if (!ref $widget) { 3130 if (!ref $widget) {
3131 if ($widget =~ /\t/) {
3132 my ($left, $right) = split /\t/, $widget, 2;
3133
3134 $widget = new CFClient::UI::HBox
3135 can_hover => 1,
3136 can_events => 1,
3137 tooltip => $tooltip,
3138 children => [
3139 (new CFClient::UI::Label markup => $left, expand => 1),
3140 (new CFClient::UI::Label markup => $right, align => +1),
3141 ],
3142 ;
3143
3144 } else {
2838 $widget = new CFClient::UI::Label 3145 $widget = new CFClient::UI::Label
2839 can_hover => 1, 3146 can_hover => 1,
2840 can_events => 1, 3147 can_events => 1,
2841 text => $widget; 3148 markup => $widget,
3149 tooltip => $tooltip;
3150 }
2842 } 3151 }
2843 3152
2844 $self->{item}{$widget} = $item; 3153 $self->{item}{$widget} = $item;
2845 3154
2846 $self->{vbox}->add ($widget); 3155 $self->{vbox}->add ($widget);
… …
2851 3160
2852# popup given the event (must be a mouse button down event currently) 3161# popup given the event (must be a mouse button down event currently)
2853sub popup { 3162sub popup {
2854 my ($self, $ev) = @_; 3163 my ($self, $ev) = @_;
2855 3164
2856 $self->_emit ("popdown"); 3165 $self->emit ("popdown");
2857 3166
2858 # maybe save $GRAB? must be careful about events... 3167 # maybe save $GRAB? must be careful about events...
2859 $GRAB = $self; 3168 $GRAB = $self;
2860 $self->{button} = $ev->{button}; 3169 $self->{button} = $ev->{button};
2861 3170
2862 $self->show; 3171 $self->show;
2863 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3172 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2864} 3173}
2865 3174
2866sub mouse_motion { 3175sub invoke_mouse_motion {
2867 my ($self, $ev, $x, $y) = @_; 3176 my ($self, $ev, $x, $y) = @_;
2868 3177
2869 # TODO: should use vbox->find_widget or so 3178 # TODO: should use vbox->find_widget or so
2870 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3179 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2871 $self->{hover} = $self->{item}{$HOVER}; 3180 $self->{hover} = $self->{item}{$HOVER};
2872}
2873 3181
3182 0
3183}
3184
2874sub button_up { 3185sub invoke_button_up {
2875 my ($self, $ev, $x, $y) = @_; 3186 my ($self, $ev, $x, $y) = @_;
2876 3187
2877 if ($ev->{button} == $self->{button}) { 3188 if ($ev->{button} == $self->{button}) {
2878 undef $GRAB; 3189 undef $GRAB;
2879 $self->hide; 3190 $self->hide;
2880 3191
2881 $self->_emit ("popdown"); 3192 $self->emit ("popdown");
2882 $self->{hover}[1]->() if $self->{hover}; 3193 $self->{hover}[1]->() if $self->{hover};
3194 } else {
3195 return 0
3196 }
3197
2883 } 3198 1
2884} 3199}
2885 3200
2886############################################################################# 3201#############################################################################
2887 3202
2888package CFClient::UI::Statusbox; 3203package CFClient::UI::Multiplexer;
2889 3204
2890our @ISA = CFClient::UI::VBox::; 3205our @ISA = CFClient::UI::Container::;
2891 3206
2892sub new { 3207sub new {
2893 my $class = shift; 3208 my $class = shift;
2894 3209
2895 $class->SUPER::new ( 3210 my $self = $class->SUPER::new (
3211 @_,
3212 );
3213
3214 $self->{current} = $self->{children}[0]
3215 if @{ $self->{children} };
3216
3217 $self
3218}
3219
3220sub add {
3221 my ($self, @widgets) = @_;
3222
3223 $self->SUPER::add (@widgets);
3224
3225 $self->{current} = $self->{children}[0]
3226 if @{ $self->{children} };
3227}
3228
3229sub get_current_page {
3230 my ($self) = @_;
3231
3232 $self->{current}
3233}
3234
3235sub set_current_page {
3236 my ($self, $page_or_widget) = @_;
3237
3238 my $widget = ref $page_or_widget
3239 ? $page_or_widget
3240 : $self->{children}[$page_or_widget];
3241
3242 $self->{current} = $widget;
3243 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3244
3245 $self->emit (page_changed => $self->{current});
3246
3247 $self->realloc;
3248}
3249
3250sub visible_children {
3251 $_[0]{current}
3252}
3253
3254sub size_request {
3255 my ($self) = @_;
3256
3257 $self->{current}->size_request
3258}
3259
3260sub invoke_size_allocate {
3261 my ($self, $w, $h) = @_;
3262
3263 $self->{current}->configure (0, 0, $w, $h);
3264
3265 1
3266}
3267
3268sub _draw {
3269 my ($self) = @_;
3270
3271 $self->{current}->draw;
3272}
3273
3274#############################################################################
3275
3276package CFClient::UI::Notebook;
3277
3278our @ISA = CFClient::UI::VBox::;
3279
3280sub new {
3281 my $class = shift;
3282
3283 my $self = $class->SUPER::new (
3284 buttonbar => (new CFClient::UI::Buttonbar),
3285 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3286 # filter => # will be put between multiplexer and $self
3287 @_,
3288 );
3289
3290 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3291 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3292
3293 $self
3294}
3295
3296sub add {
3297 my ($self, $title, $widget, $tooltip) = @_;
3298
3299 Scalar::Util::weaken $self;
3300
3301 $self->{buttonbar}->add (new CFClient::UI::Button
3302 markup => $title,
3303 tooltip => $tooltip,
3304 on_activate => sub { $self->set_current_page ($widget) },
3305 );
3306
3307 $self->{multiplexer}->add ($widget);
3308}
3309
3310sub get_current_page {
3311 my ($self) = @_;
3312
3313 $self->{multiplexer}->get_current_page
3314}
3315
3316sub set_current_page {
3317 my ($self, $page) = @_;
3318
3319 $self->{multiplexer}->set_current_page ($page);
3320 $self->emit (page_changed => $self->{multiplexer}{current});
3321}
3322
3323#############################################################################
3324
3325package CFClient::UI::Combobox;
3326
3327use utf8;
3328
3329our @ISA = CFClient::UI::Button::;
3330
3331sub new {
3332 my $class = shift;
3333
3334 my $self = $class->SUPER::new (
3335 options => [], # [value, title, longdesc], ...
3336 value => undef,
3337 @_,
3338 );
3339
3340 $self->_set_value ($self->{value});
3341
3342 $self
3343}
3344
3345sub invoke_button_down {
3346 my ($self, $ev) = @_;
3347
3348 my @menu_items;
3349
3350 for (@{ $self->{options} }) {
3351 my ($value, $title, $tooltip) = @$_;
3352
3353 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3354 }
3355
3356 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3357}
3358
3359sub _set_value {
3360 my ($self, $value) = @_;
3361
3362 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3363 or return;
3364
3365 $self->{value} = $item->[0];
3366 $self->set_markup ("$item->[1] ⇓");
3367 $self->set_tooltip ($item->[2]);
3368}
3369
3370sub set_value {
3371 my ($self, $value) = @_;
3372
3373 return unless $self->{value} ne $value;
3374
3375 $self->_set_value ($value);
3376 $self->emit (changed => $value);
3377}
3378
3379#############################################################################
3380
3381package CFClient::UI::Statusbox;
3382
3383our @ISA = CFClient::UI::VBox::;
3384
3385sub new {
3386 my $class = shift;
3387
3388 my $self = $class->SUPER::new (
2896 fontsize => 0.8, 3389 fontsize => 0.8,
2897 @_, 3390 @_,
2898 ) 3391 );
3392
3393 Scalar::Util::weaken (my $this = $self);
3394
3395 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3396
3397 $self
2899} 3398}
2900 3399
2901sub reorder { 3400sub reorder {
2902 my ($self) = @_; 3401 my ($self) = @_;
2903 my $NOW = time; 3402 my $NOW = Time::HiRes::time;
3403
3404 # freeze display when hovering over any label
3405 return if $CFClient::UI::TOOLTIP->{owner}
3406 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3407 values %{ $self->{item} };
2904 3408
2905 while (my ($k, $v) = each %{ $self->{item} }) { 3409 while (my ($k, $v) = each %{ $self->{item} }) {
2906 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3410 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2907 } 3411 }
2908 3412
… …
2911 my @items = sort { 3415 my @items = sort {
2912 $a->{pri} <=> $b->{pri} 3416 $a->{pri} <=> $b->{pri}
2913 or $b->{id} <=> $a->{id} 3417 or $b->{id} <=> $a->{id}
2914 } values %{ $self->{item} }; 3418 } values %{ $self->{item} };
2915 3419
3420 $self->{timer}->interval (1);
3421
2916 my $count = 10 + 1; 3422 my $count = 10 + 1;
2917 for my $item (@items) { 3423 for my $item (@items) {
2918 last unless --$count; 3424 last unless --$count;
2919 3425
2920 push @widgets, $item->{label} ||= do { 3426 my $label = $item->{label} ||= do {
2921 # TODO: doesn't handle markup well (read as: at all) 3427 # TODO: doesn't handle markup well (read as: at all)
2922 my $short = $item->{count} > 1 3428 my $short = $item->{count} > 1
2923 ? "<b>$item->{count} ×</b> $item->{text}" 3429 ? "<b>$item->{count} ×</b> $item->{text}"
2924 : $item->{text}; 3430 : $item->{text};
2925 3431
… …
2933 tooltip => $item->{tooltip}, 3439 tooltip => $item->{tooltip},
2934 tooltip_font => $::FONT_PROP, 3440 tooltip_font => $::FONT_PROP,
2935 tooltip_width => 0.67, 3441 tooltip_width => 0.67,
2936 fontsize => $item->{fontsize} || $self->{fontsize}, 3442 fontsize => $item->{fontsize} || $self->{fontsize},
2937 max_w => $::WIDTH * 0.44, 3443 max_w => $::WIDTH * 0.44,
2938 fg => $item->{fg}, 3444 fg => [@{ $item->{fg} }],
2939 can_events => 1, 3445 can_events => 1,
2940 can_hover => 1 3446 can_hover => 1
2941 }; 3447 };
3448
3449 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3450 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3451 $label->update;
3452 $label->set_max_size (undef, $label->{req_h} * $diff)
3453 if $diff < 1;
3454 $self->{timer}->interval (1/30);
3455 } else {
3456 $label->{fg}[3] = $item->{fg}[3] || 1;
3457 }
3458
3459 push @widgets, $label;
2942 } 3460 }
2943 3461
2944 $self->clear; 3462 $self->clear;
2945 $self->SUPER::add (reverse @widgets); 3463 $self->SUPER::add (reverse @widgets);
2946} 3464}
… …
2951 $text =~ s/^\s+//; 3469 $text =~ s/^\s+//;
2952 $text =~ s/\s+$//; 3470 $text =~ s/\s+$//;
2953 3471
2954 return unless $text; 3472 return unless $text;
2955 3473
2956 my $timeout = time + ((delete $arg{timeout}) || 60); 3474 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2957 3475
2958 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3476 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2959 3477
2960 if (my $item = $self->{item}{$group}) { 3478 if (my $item = $self->{item}{$group}) {
2961 if ($item->{text} eq $text) { 3479 if ($item->{text} eq $text) {
2962 $item->{count}++; 3480 $item->{count}++;
2963 } else { 3481 } else {
2964 $item->{count} = 1; 3482 $item->{count} = 1;
2965 $item->{text} = $item->{tooltip} = $text; 3483 $item->{text} = $item->{tooltip} = $text;
2966 } 3484 }
2967 $item->{id} = ++$self->{id}; 3485 $item->{id} += 0.2;#d#
2968 $item->{timeout} = $timeout; 3486 $item->{timeout} = $timeout;
2969 delete $item->{label}; 3487 delete $item->{label};
2970 } else { 3488 } else {
2971 $self->{item}{$group} = { 3489 $self->{item}{$group} = {
2972 id => ++$self->{id}, 3490 id => ++$self->{id},
… …
2978 count => 1, 3496 count => 1,
2979 %arg, 3497 %arg,
2980 }; 3498 };
2981 } 3499 }
2982 3500
3501 $ROOT->on_refresh (reorder => sub {
2983 $self->reorder; 3502 $self->reorder;
3503 });
2984} 3504}
2985 3505
2986sub reconfigure { 3506sub reconfigure {
2987 my ($self) = @_; 3507 my ($self) = @_;
2988 3508
… …
2991 3511
2992 $self->reorder; 3512 $self->reorder;
2993 $self->SUPER::reconfigure; 3513 $self->SUPER::reconfigure;
2994} 3514}
2995 3515
3516sub destroy {
3517 my ($self) = @_;
3518
3519 $self->{timer}->cancel;
3520
3521 $self->SUPER::destroy;
3522}
3523
2996############################################################################# 3524#############################################################################
2997 3525
3526package CFClient::UI::Inventory;
3527
3528our @ISA = CFClient::UI::Table::;
3529
3530sub new {
3531 my $class = shift;
3532
3533 my $self = $class->SUPER::new (
3534 col_expand => [0, 1, 0],
3535 @_,
3536 );
3537
3538 $self
3539}
3540
3541sub set_items {
3542 my ($self, $items) = @_;
3543
3544 $self->clear;
3545 return unless $items;
3546
3547 my @items = sort {
3548 ($a->{type} <=> $b->{type})
3549 or ($a->{name} cmp $b->{name})
3550 } values %$items;
3551
3552 $self->{real_items} = \@items;
3553
3554 my $row = 0;
3555 for my $item (@items) {
3556 CFClient::Item::update_widgets $item;
3557
3558 $self->add (0, $row, $item->{face_widget});
3559 $self->add (1, $row, $item->{desc_widget});
3560 $self->add (2, $row, $item->{weight_widget});
3561
3562 $row++;
3563 }
3564}
3565
3566#############################################################################
3567
3568package CFClient::UI::SpellList;
3569
3570our @ISA = CFClient::UI::Table::;
3571
3572sub new {
3573 my $class = shift;
3574
3575 my $self = $class->SUPER::new (
3576 binding => [],
3577 commands => [],
3578 @_,
3579 )
3580}
3581
3582my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3583
3584my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3585 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3586my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3587 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3588my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3589 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3590my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3591 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3592my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3593 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3594
3595sub rebuild_spell_list {
3596 my ($self) = @_;
3597
3598 $CFClient::UI::ROOT->on_refresh ($self => sub {
3599 $self->clear;
3600
3601 return unless $::CONN;
3602
3603 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3604 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3605 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3606 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3607 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3608
3609 my $row = 0;
3610
3611 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3612 my $spell = $self->{spell}{$_};
3613
3614 $row++;
3615
3616 my $spell_cb = sub {
3617 my ($widget, $ev) = @_;
3618
3619 if ($ev->{button} == 1) {
3620 $::CONN->user_send ("cast $spell->{name}");
3621 } elsif ($ev->{button} == 2) {
3622 $::CONN->user_send ("invoke $spell->{name}");
3623 } elsif ($ev->{button} == 3) {
3624 (new CFClient::UI::Menu
3625 items => [
3626 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3627 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3628 ],
3629 )->popup ($ev);
3630 } else {
3631 return 0;
3632 }
3633
3634 1
3635 };
3636
3637 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3638
3639 #TODO: add path info to tooltip
3640 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3641
3642 $self->add (0, $row, new CFClient::UI::Face
3643 face => $spell->{face},
3644 can_hover => 1,
3645 can_events => 1,
3646 tooltip => $tooltip,
3647 on_button_down => $spell_cb,
3648 );
3649
3650 $self->add (1, $row, new CFClient::UI::Label
3651 expand => 1,
3652 text => $spell->{name},
3653 can_hover => 1,
3654 can_events => 1,
3655 tooltip => $tooltip,
3656 on_button_down => $spell_cb,
3657 );
3658
3659 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3660 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3661 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3662 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3663 }
3664 });
3665}
3666
3667sub add_spell {
3668 my ($self, $spell) = @_;
3669
3670 $self->{spell}->{$spell->{name}} = $spell;
3671 $self->rebuild_spell_list;
3672}
3673
3674sub remove_spell {
3675 my ($self, $spell) = @_;
3676
3677 delete $self->{spell}->{$spell->{name}};
3678 $self->rebuild_spell_list;
3679}
3680
3681sub clear_spells {
3682 my ($self) = @_;
3683
3684 $self->{spell} = {};
3685 $self->rebuild_spell_list;
3686}
3687
3688#############################################################################
3689
2998package CFClient::UI::Root; 3690package CFClient::UI::Root;
2999 3691
3000our @ISA = CFClient::UI::Container::; 3692our @ISA = CFClient::UI::Container::;
3693
3694use List::Util qw(min max);
3001 3695
3002use CFClient::OpenGL; 3696use CFClient::OpenGL;
3003 3697
3004sub new { 3698sub new {
3005 my $class = shift; 3699 my $class = shift;
… …
3012 Scalar::Util::weaken ($self->{root} = $self); 3706 Scalar::Util::weaken ($self->{root} = $self);
3013 3707
3014 $self 3708 $self
3015} 3709}
3016 3710
3017sub configure {
3018 my ($self, $x, $y, $w, $h) = @_;
3019
3020 $self->{w} = $w;
3021 $self->{h} = $h;
3022}
3023
3024sub reconfigure {
3025 my ($self) = @_;
3026
3027 $self->SUPER::reconfigure;
3028
3029 $self->size_allocate ($self->{w}, $self->{h}, 1)
3030 if $self->{w};
3031}
3032
3033sub size_request { 3711sub size_request {
3034 my ($self) = @_; 3712 my ($self) = @_;
3035 3713
3036 ($self->{w}, $self->{h}) 3714 ($self->{w}, $self->{h})
3037} 3715}
… …
3048 $coord = $max - $size if $coord > $max - $size; 3726 $coord = $max - $size if $coord > $max - $size;
3049 3727
3050 int $coord + 0.5 3728 int $coord + 0.5
3051} 3729}
3052 3730
3053sub size_allocate { 3731sub invoke_size_allocate {
3054 my ($self, $w, $h, $changed) = @_; 3732 my ($self, $w, $h) = @_;
3055 3733
3056 for my $child ($self->children) { 3734 for my $child ($self->children) {
3057 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3735 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3058 3736
3059 $X = $child->{force_x} if exists $child->{force_x}; 3737 $X = $child->{force_x} if exists $child->{force_x};
… …
3062 $X = _to_pixel $X, $W, $self->{w}; 3740 $X = _to_pixel $X, $W, $self->{w};
3063 $Y = _to_pixel $Y, $H, $self->{h}; 3741 $Y = _to_pixel $Y, $H, $self->{h};
3064 3742
3065 $child->configure ($X, $Y, $W, $H); 3743 $child->configure ($X, $Y, $W, $H);
3066 } 3744 }
3745
3746 1
3067} 3747}
3068 3748
3069sub coord2local { 3749sub coord2local {
3070 my ($self, $x, $y) = @_; 3750 my ($self, $x, $y) = @_;
3071 3751
… …
3127 $_->() 3807 $_->()
3128 for values %{delete $self->{refresh_hook}}; 3808 for values %{delete $self->{refresh_hook}};
3129 } 3809 }
3130 3810
3131 if ($self->{realloc}) { 3811 if ($self->{realloc}) {
3812 my %queue;
3132 my @queue; 3813 my @queue;
3814 my $widget;
3133 3815
3816 outer:
3134 while () { 3817 while () {
3135 if ($self->{realloc}) { 3818 if (my $realloc = delete $self->{realloc}) {
3136 #TODO use array-of-depth approach 3819 for $widget (values %$realloc) {
3820 $widget->{visible} or next; # do not resize invisible widgets
3137 3821
3138 @queue = sort { $a->{visible} <=> $b->{visible} } 3822 $queue{$widget+0}++ and next; # duplicates are common
3139 @queue, values %{delete $self->{realloc}}; 3823
3824 push @{ $queue[$widget->{visible}] }, $widget;
3825 }
3140 } 3826 }
3141 3827
3828 while () {
3829 @queue or last outer;
3830
3831 $widget = pop @{ $queue[-1] || [] }
3832 and last;
3833
3834 pop @queue;
3835 }
3836
3837 delete $queue{$widget+0};
3838
3839 my ($w, $h) = $widget->size_request;
3840
3841 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3842 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3843
3844 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3845 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3846
3847 $w = $widget->{force_w} if exists $widget->{force_w};
3848 $h = $widget->{force_h} if exists $widget->{force_h};
3849
3850 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3851 || delete $widget->{force_realloc}) {
3852 $widget->{req_w} = $w;
3853 $widget->{req_h} = $h;
3854
3855 $self->{size_alloc}{$widget+0} = $widget;
3856
3857 if (my $parent = $widget->{parent}) {
3858 $self->{realloc}{$parent+0} = $parent
3859 unless $queue{$parent+0};
3860
3861 $parent->{force_size_alloc} = 1;
3862 $self->{size_alloc}{$parent+0} = $parent;
3863 }
3864 }
3865
3866 delete $self->{realloc}{$widget+0};
3867 }
3868 }
3869
3870 while (my $size_alloc = delete $self->{size_alloc}) {
3871 my @queue = sort { $b->{visible} <=> $a->{visible} }
3872 values %$size_alloc;
3873
3874 while () {
3142 my $widget = pop @queue || last; 3875 my $widget = pop @queue || last;
3143 3876
3144 $widget->{visible} or last; # do not resize invisible widgets 3877 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3145
3146 my ($w, $h) = exists $widget->{force_w} && exists $widget->{force_h}
3147 ? @$widget{qw(force_w force_h)}
3148 : $widget->size_request;
3149
3150 my $min_size = $widget->{is_toplevel} ? 16 : 0;
3151
3152 $w = $min_size if $w < $min_size;
3153 $h = $min_size if $h < $min_size;
3154
3155 $widget->{req_w} = $w;
3156 $widget->{req_h} = $h;
3157
3158 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3159
3160 push @queue, $widget->{parent}
3161 if $widget->{parent};
3162 }
3163 }
3164
3165 while (my $size_alloc = delete $self->{size_alloc}) {
3166 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3167 values %$size_alloc;
3168
3169 while () {
3170 my ($widget, $w, $h) = @{ pop @queue or last };
3171
3172 $w = $widget->{w} || $widget->{req_w} unless defined $w;
3173 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3174 3878
3175 $w = 0 if $w < 0; 3879 $w = 0 if $w < 0;
3176 $h = 0 if $h < 0; 3880 $h = 0 if $h < 0;
3177 3881
3882 $w = max $widget->{min_w}, $w;
3883 $h = max $widget->{min_h}, $h;
3884
3885 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887
3178 $w = int $w + 0.5; 3888 $w = int $w + 0.5;
3179 $h = int $h + 0.5; 3889 $h = int $h + 0.5;
3180 3890
3181 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3891 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3892 $widget->{old_w} = $widget->{w};
3893 $widget->{old_h} = $widget->{h};
3182 3894
3183 $widget->{w} = $w; 3895 $widget->{w} = $w;
3184 $widget->{h} = $h; 3896 $widget->{h} = $h;
3185 3897
3186 $widget->emit (size_allocate => $w, $h, $changed); 3898 $widget->emit (size_allocate => $w, $h);
3899 }
3187 } 3900 }
3188 } 3901 }
3189 3902
3190 while ($self->{post_alloc_hook}) { 3903 while ($self->{post_alloc_hook}) {
3191 $_->() 3904 $_->()
3192 for values %{delete $self->{post_alloc_hook}}; 3905 for values %{delete $self->{post_alloc_hook}};
3193 } 3906 }
3907
3194 3908
3195 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3909 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3196 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3910 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3197 glClear GL_COLOR_BUFFER_BIT; 3911 glClear GL_COLOR_BUFFER_BIT;
3198 3912
… …
3200 glLoadIdentity; 3914 glLoadIdentity;
3201 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3915 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3202 glMatrixMode GL_MODELVIEW; 3916 glMatrixMode GL_MODELVIEW;
3203 glLoadIdentity; 3917 glLoadIdentity;
3204 3918
3919 {
3920 package CFClient::UI::Base;
3921
3922 ($draw_x, $draw_y, $draw_w, $draw_h) =
3923 (0, 0, $self->{w}, $self->{h});
3924 }
3925
3205 $self->_draw; 3926 $self->_draw;
3206} 3927}
3207 3928
3208############################################################################# 3929#############################################################################
3209 3930

Diff Legend

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