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.257 by root, Tue May 30 02:22:02 2006 UTC vs.
Revision 1.332 by root, Sun Jul 23 08:58:44 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 {
394 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
395 433
434 Carp::confess unless $self->{parent};#d#
435
396 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
397} 437}
398 438
399# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
400sub coord2global { 440sub coord2global {
401 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
402 442
443 Carp::confess unless $self->{parent};#d#
444
403 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
404} 446}
405 447
406sub focus_in { 448sub invoke_focus_in {
407 my ($self) = @_; 449 my ($self) = @_;
408 450
409 return if $FOCUS == $self; 451 return if $FOCUS == $self;
410 return unless $self->{can_focus}; 452 return unless $self->{can_focus};
411 453
412 my $focus = $FOCUS; $FOCUS = $self; 454 $FOCUS = $self;
413 455
414 $self->_emit (focus_in => $focus); 456 $self->update;
415 457
416 $focus->update if $focus; 458 0
417 $FOCUS->update;
418} 459}
419 460
420sub focus_out { 461sub invoke_focus_out {
421 my ($self) = @_; 462 my ($self) = @_;
422 463
423 return unless $FOCUS == $self; 464 return unless $FOCUS == $self;
424 465
425 my $focus = $FOCUS; undef $FOCUS; 466 undef $FOCUS;
426 467
427 $self->_emit (focus_out => $focus); 468 $self->update;
428 469
429 $focus->update if $focus; #?
430
431 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 470 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
432 unless $FOCUS; 471 unless $FOCUS;
433}
434 472
473 0
474}
475
476sub grab_focus {
477 my ($self) = @_;
478
479 $FOCUS->emit ("focus_out") if $FOCUS;
480 $self->emit ("focus_in");
481}
482
435sub mouse_motion { } 483sub invoke_mouse_motion { 0 }
436sub button_up { } 484sub invoke_button_up { 0 }
437sub key_down { } 485sub invoke_key_down { 0 }
438sub key_up { } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
439 488
440sub button_down { 489sub invoke_button_down {
441 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
442 491
443 $self->focus_in; 492 $self->grab_focus;
444}
445 493
446sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 494 0
447sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 495}
448sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 496
449sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 497sub connect {
450sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 498 my ($self, $signal, $cb) = @_;
499
500 push @{ $self->{signal_cb}{$signal} }, $cb;
501
502 defined wantarray and CFClient::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} };
505 }
506}
507
508my %has_coords = (
509 button_down => 1,
510 button_up => 1,
511 mouse_motion => 1,
512 mouse_wheel => 1,
513);
514
515sub emit {
516 my ($self, $signal, @args) = @_;
517
518 # I do not really like this solution, but I dislike duplication
519 # and needlessly verbose code, too.
520 my @append
521 = $has_coords{$signal}
522 ? $args[0]->xy ($self)
523 : ();
524
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526
527 #d##TODO# stop propagating at first true, do not use sum
528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
531}
451 532
452sub find_widget { 533sub find_widget {
453 my ($self, $x, $y) = @_; 534 my ($self, $x, $y) = @_;
454 535
455 return () unless $self->{can_events}; 536 return () unless $self->{can_events};
… …
463 544
464sub set_parent { 545sub set_parent {
465 my ($self, $parent) = @_; 546 my ($self, $parent) = @_;
466 547
467 Scalar::Util::weaken ($self->{parent} = $parent); 548 Scalar::Util::weaken ($self->{parent} = $parent);
468
469 $self->set_visible if $parent->{visible}; 549 $self->set_visible if $parent->{visible};
470} 550}
471 551
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 { 552sub realloc {
496 my ($self) = @_; 553 my ($self) = @_;
497 554
498 if ($self->{visible}) { 555 if ($self->{visible}) {
499 return if $self->{root}{realloc}{$self}; 556 return if $self->{root}{realloc}{$self+0};
500 557
501 $self->{root}{realloc}{$self} = $self; 558 $self->{root}{realloc}{$self+0} = $self;
502 $self->{root}->update; 559 $self->{root}->update;
503 } else { 560 } else {
504 delete $self->{req_w}; 561 delete $self->{req_w};
562 delete $self->{req_h};
505 } 563 }
506} 564}
507 565
508sub update { 566sub update {
509 my ($self) = @_; 567 my ($self) = @_;
… …
517 575
518 $self->realloc; 576 $self->realloc;
519 $self->update; 577 $self->update;
520} 578}
521 579
580# using global variables seems a bit hacky, but passing through all drawing
581# functions seems pointless.
582our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
583
522sub draw { 584sub draw {
523 my ($self) = @_; 585 my ($self) = @_;
524 586
525 return unless $self->{h} && $self->{w}; 587 return unless $self->{h} && $self->{w};
588
589 # update screen rectangle
590 local $draw_x = $draw_x + $self->{x};
591 local $draw_y = $draw_y + $self->{y};
592
593 # skip widgets that are entirely outside the drawing area
594 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
595 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
526 596
527 glPushMatrix; 597 glPushMatrix;
528 glTranslate $self->{x}, $self->{y}, 0; 598 glTranslate $self->{x}, $self->{y}, 0;
529 $self->_draw;
530 glPopMatrix;
531 599
532 if ($self == $HOVER && $self->{can_hover}) { 600 if ($self == $HOVER && $self->{can_hover}) {
533 my ($x, $y) = @$self{qw(x y)};
534
535 glColor 1, 0.8, 0.5, 0.2; 601 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
536 glEnable GL_BLEND; 602 glEnable GL_BLEND;
537 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
538 glBegin GL_QUADS; 604 glBegin GL_QUADS;
539 glVertex $x , $y; 605 glVertex 0 , 0;
540 glVertex $x + $self->{w}, $y; 606 glVertex $self->{w}, 0;
541 glVertex $x + $self->{w}, $y + $self->{h}; 607 glVertex $self->{w}, $self->{h};
542 glVertex $x , $y + $self->{h}; 608 glVertex 0 , $self->{h};
543 glEnd; 609 glEnd;
544 glDisable GL_BLEND; 610 glDisable GL_BLEND;
545 } 611 }
546 612
547 if ($ENV{CFPLUS_DEBUG}) { 613 if ($ENV{CFPLUS_DEBUG} & 1) {
548 glPushMatrix; 614 glPushMatrix;
549 glColor 1, 1, 0, 1; 615 glColor 1, 1, 0, 1;
550 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 616 glTranslate 0.375, 0.375;
551 glBegin GL_LINE_LOOP; 617 glBegin GL_LINE_LOOP;
552 glVertex 0 , 0; 618 glVertex 0 , 0;
553 glVertex $self->{w} - 1, 0; 619 glVertex $self->{w} - 1, 0;
554 glVertex $self->{w} - 1, $self->{h} - 1; 620 glVertex $self->{w} - 1, $self->{h} - 1;
555 glVertex 0 , $self->{h} - 1; 621 glVertex 0 , $self->{h} - 1;
556 glEnd; 622 glEnd;
557 glPopMatrix; 623 glPopMatrix;
558 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 624 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
559 } 625 }
626
627 $self->_draw;
628 glPopMatrix;
560} 629}
561 630
562sub _draw { 631sub _draw {
563 my ($self) = @_; 632 my ($self) = @_;
564 633
… …
566} 635}
567 636
568sub DESTROY { 637sub DESTROY {
569 my ($self) = @_; 638 my ($self) = @_;
570 639
640 return if CFClient::in_destruct;
641
571 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
572 #$self->deactivate; 643
644 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
573} 646}
574 647
575############################################################################# 648#############################################################################
576 649
577package CFClient::UI::DrawBG; 650package CFClient::UI::DrawBG;
… …
602 675
603 if ($color && (@$color < 4 || $color->[3])) { 676 if ($color && (@$color < 4 || $color->[3])) {
604 my ($w, $h) = @$self{qw(w h)}; 677 my ($w, $h) = @$self{qw(w h)};
605 678
606 glEnable GL_BLEND; 679 glEnable GL_BLEND;
607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 680 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
608 glColor @$color; 681 glColor_premultiply @$color;
609 682
610 glBegin GL_QUADS; 683 glBegin GL_QUADS;
611 glVertex 0 , 0; 684 glVertex 0 , 0;
612 glVertex 0 , $h; 685 glVertex 0 , $h;
613 glVertex $w, $h; 686 glVertex $w, $h;
… …
644our @ISA = CFClient::UI::Base::; 717our @ISA = CFClient::UI::Base::;
645 718
646sub new { 719sub new {
647 my ($class, %arg) = @_; 720 my ($class, %arg) = @_;
648 721
649 my $children = delete $arg{children} || []; 722 my $children = delete $arg{children};
650 723
651 my $self = $class->SUPER::new ( 724 my $self = $class->SUPER::new (
652 children => [], 725 children => [],
653 can_events => 0, 726 can_events => 0,
654 %arg, 727 %arg,
655 ); 728 );
729
656 $self->add ($_) for @$children; 730 $self->add (@$children)
731 if $children;
657 732
658 $self 733 $self
734}
735
736sub realloc {
737 my ($self) = @_;
738
739 $self->{force_realloc} = 1;
740 $self->{force_size_alloc} = 1;
741 $self->SUPER::realloc;
659} 742}
660 743
661sub add { 744sub add {
662 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
663 746
… …
709 $x -= $self->{x}; 792 $x -= $self->{x};
710 $y -= $self->{y}; 793 $y -= $self->{y};
711 794
712 my $res; 795 my $res;
713 796
714 for (reverse @{ $self->{children} }) { 797 for (reverse $self->visible_children) {
715 $res = $_->find_widget ($x, $y) 798 $res = $_->find_widget ($x, $y)
716 and return $res; 799 and return $res;
717 } 800 }
718 801
719 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 802 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
740} 823}
741 824
742sub add { 825sub add {
743 my ($self, $child) = @_; 826 my ($self, $child) = @_;
744 827
745 $self->{children} = []; 828 $self->SUPER::remove ($_) for @{ $self->{children} };
746
747 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
748} 830}
749 831
750sub remove { 832sub remove {
751 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
… …
760 842
761sub size_request { 843sub size_request {
762 $_[0]{children}[0]->size_request 844 $_[0]{children}[0]->size_request
763} 845}
764 846
765sub size_allocate { 847sub invoke_size_allocate {
766 my ($self, $w, $h, $changed) = @_; 848 my ($self, $w, $h) = @_;
767 849
768 $self->{children}[0]->configure (0, 0, $w, $h); 850 $self->{children}[0]->configure (0, 0, $w, $h);
851
852 1
769} 853}
770 854
771############################################################################# 855#############################################################################
856
857# back-buffered drawing area
772 858
773package CFClient::UI::Window; 859package CFClient::UI::Window;
774 860
775our @ISA = CFClient::UI::Bin::; 861our @ISA = CFClient::UI::Bin::;
776 862
… …
787 873
788 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 874 $ROOT->on_post_alloc ($self => sub { $self->render_child });
789 $self->SUPER::update; 875 $self->SUPER::update;
790} 876}
791 877
792sub size_allocate { 878sub invoke_size_allocate {
793 my ($self, $w, $h, $changed) = @_; 879 my ($self, $w, $h) = @_;
794 880
795 $self->SUPER::size_allocate ($w, $h, $changed);
796 $self->update 881 $self->update;
797 if $changed; 882
883 $self->SUPER::invoke_size_allocate ($w, $h)
798} 884}
799 885
800sub _render { 886sub _render {
887 my ($self) = @_;
888
801 $_[0]{children}[0]->draw; 889 $self->{children}[0]->draw;
802} 890}
803 891
804sub render_child { 892sub render_child {
805 my ($self) = @_; 893 my ($self) = @_;
806 894
807 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 895 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
808 glClearColor 0, 0, 0, 0; 896 glClearColor 0, 0, 0, 0;
809 glClear GL_COLOR_BUFFER_BIT; 897 glClear GL_COLOR_BUFFER_BIT;
810 898
899 {
900 package CFClient::UI::Base;
901
902 ($draw_x, $draw_y, $draw_w, $draw_h) =
903 (0, 0, $self->{w}, $self->{h});
904 }
905
811 $self->_render; 906 $self->_render;
812 }; 907 };
813} 908}
814 909
815sub _draw { 910sub _draw {
816 my ($self) = @_; 911 my ($self) = @_;
817 912
818 my ($w, $h) = ($self->w, $self->h); 913 my ($w, $h) = @$self{qw(w h)};
819 914
820 my $tex = $self->{texture} 915 my $tex = $self->{texture}
821 or return; 916 or return;
822 917
823 glEnable GL_TEXTURE_2D; 918 glEnable GL_TEXTURE_2D;
824 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
825 glColor 1, 1, 1, 1; 920 glColor 0, 0, 0, 1;
826 921
827 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
828 923
829 glDisable GL_TEXTURE_2D; 924 glDisable GL_TEXTURE_2D;
830} 925}
… …
846} 941}
847 942
848sub size_request { 943sub size_request {
849 my ($self) = @_; 944 my ($self) = @_;
850 945
851 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 946 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
852 947
853 $w = 10 if $self->{scroll_x}; 948 $w = 10 if $self->{scroll_x};
854 $h = 10 if $self->{scroll_y}; 949 $h = 10 if $self->{scroll_y};
855 950
856 ($w, $h) 951 ($w, $h)
857} 952}
858 953
859sub size_allocate { 954sub invoke_size_allocate {
860 my ($self, $w, $h, $changed) = @_; 955 my ($self, $w, $h) = @_;
861 956
957 my $child = $self->child;
958
862 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 959 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
863 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 960 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
864 961
865 $self->child->configure (0, 0, $w, $h); 962 $self->child->configure (0, 0, $w, $h);
866 $self->update; 963 $self->update;
964
965 1
867} 966}
868 967
869sub set_offset { 968sub set_offset {
870 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
871 970
… …
904} 1003}
905 1004
906sub _render { 1005sub _render {
907 my ($self) = @_; 1006 my ($self) = @_;
908 1007
1008 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
1009 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
1010
909 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1011 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
910 1012
911 $self->SUPER::_render; 1013 $self->SUPER::_render;
912} 1014}
913 1015
… …
916package CFClient::UI::ScrolledWindow; 1018package CFClient::UI::ScrolledWindow;
917 1019
918our @ISA = CFClient::UI::HBox::; 1020our @ISA = CFClient::UI::HBox::;
919 1021
920sub new { 1022sub new {
921 my $class = shift; 1023 my ($class, %arg) = @_;
1024
1025 my $child = delete $arg{child};
922 1026
923 my $self; 1027 my $self;
924 1028
925 my $slider = new CFClient::UI::Slider 1029 my $slider = new CFClient::UI::Slider
926 vertical => 1, 1030 vertical => 1,
… …
929 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
930 }, 1034 },
931 ; 1035 ;
932 1036
933 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
934 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
935 slider => $slider, 1040 slider => $slider,
936 @_, 1041 %arg,
937 ); 1042 );
938 1043
939 $self->{vp}->add ($self->{scrolled});
940 $self->add ($self->{vp});
941 $self->add ($self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
1045 $self->add ($child) if $child;
942 1046
943 $self 1047 $self
944} 1048}
945 1049
1050#TODO# update range on size_allocate depending on child
1051
1052sub add {
1053 my ($self, $widget) = @_;
1054
1055 $self->{vp}->add ($self->{child} = $widget);
1056}
1057
1058sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_;
1060
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev);
1064
1065 1
1066}
1067
1068sub update_slider {
1069 my ($self) = @_;
1070
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1072}
1073
946sub update { 1074sub update {
947 my ($self) = @_; 1075 my ($self) = @_;
948 1076
949 $self->SUPER::update; 1077 $self->SUPER::update;
950 1078
951 # todo: overwrite size_allocate of child 1079 $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} 1080}
955 1081
956sub size_allocate { 1082sub invoke_size_allocate {
957 my ($self, $w, $h, $changed) = @_; 1083 my ($self, $w, $h) = @_;
958 1084
1085 $self->update_slider;
1086
959 $self->SUPER::size_allocate ($w, $h, $changed); 1087 $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} 1088}
964
965#TODO# update range on size_allocate depending on child
966# update viewport offset on scroll
967 1089
968############################################################################# 1090#############################################################################
969 1091
970package CFClient::UI::Frame; 1092package CFClient::UI::Frame;
971 1093
… …
987 1109
988 if ($self->{bg}) { 1110 if ($self->{bg}) {
989 my ($w, $h) = @$self{qw(w h)}; 1111 my ($w, $h) = @$self{qw(w h)};
990 1112
991 glEnable GL_BLEND; 1113 glEnable GL_BLEND;
992 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1114 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
993 glColor @{ $self->{bg} }; 1115 glColor_premultiply @{ $self->{bg} };
994 1116
995 glBegin GL_QUADS; 1117 glBegin GL_QUADS;
996 glVertex 0 , 0; 1118 glVertex 0 , 0;
997 glVertex 0 , $h; 1119 glVertex 0 , $h;
998 glVertex $w, $h; 1120 glVertex $w, $h;
… …
1020my @border = 1142my @border =
1021 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1143 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); 1144 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1023 1145
1024sub new { 1146sub new {
1025 my $class = shift; 1147 my ($class, %arg) = @_;
1026 1148
1027 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1028 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1029 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1030 border => 0.6, 1152 border => 0.6,
1031 can_events => 1, 1153 can_events => 1,
1032 @_ 1154 min_w => 64,
1155 min_h => 32,
1156 %arg,
1033 ); 1157 );
1034 1158
1035 $self->{title} &&= new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
1036 align => 0, 1160 align => 0,
1037 valign => 1, 1161 valign => 1,
1038 text => $self->{title}, 1162 text => $self->{title},
1039 fontsize => $self->{border}; 1163 fontsize => $self->{border},
1164 if exists $self->{title};
1165
1166 if ($self->{has_close_button}) {
1167 $self->{close_button} =
1168 new CFClient::UI::ImageButton
1169 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") };
1171
1172 $self->CFClient::UI::Container::add ($self->{close_button});
1173 }
1040 1174
1041 $self 1175 $self
1176}
1177
1178sub add {
1179 my ($self, @widgets) = @_;
1180
1181 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1183 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1042} 1184}
1043 1185
1044sub border { 1186sub border {
1045 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
1046} 1188}
1047 1189
1048sub size_request { 1190sub size_request {
1049 my ($self) = @_; 1191 my ($self) = @_;
1192
1193 $self->{title_widget}->size_request
1194 if $self->{title_widget};
1195
1196 $self->{close_button}->size_request
1197 if $self->{close_button};
1050 1198
1051 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
1052 1200
1053 ( 1201 (
1054 $w + $self->border * 2, 1202 $w + $self->border * 2,
1055 $h + $self->border * 2, 1203 $h + $self->border * 2,
1056 ) 1204 )
1057} 1205}
1058 1206
1059sub size_allocate { 1207sub invoke_size_allocate {
1060 my ($self, $w, $h, $changed) = @_; 1208 my ($self, $w, $h) = @_;
1061 1209
1062 return unless $changed; 1210 if ($self->{title_widget}) {
1211 $self->{title_widget}{w} = $w;
1212 $self->{title_widget}{h} = $h;
1213 $self->{title_widget}->invoke_size_allocate ($w, $h);
1214 }
1063 1215
1216 my $border = $self->border;
1217
1064 $h -= List::Util::max 0, $self->border * 2; 1218 $h -= List::Util::max 0, $border * 2;
1065 $w -= List::Util::max 0, $self->border * 2; 1219 $w -= List::Util::max 0, $border * 2;
1066 1220
1067 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1068 if $self->{title};
1069
1070 $self->child->configure ($self->border, $self->border, $w, $h); 1221 $self->child->configure ($border, $border, $w, $h);
1071}
1072 1222
1223 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1224 if $self->{close_button};
1225
1226 1
1227}
1228
1229sub invoke_delete {
1230 my ($self) = @_;
1231
1232 $self->hide;
1233
1234 1
1235}
1236
1073sub button_down { 1237sub invoke_button_down {
1074 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
1075 1239
1076 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1077 my $border = $self->border; 1241 my $border = $self->border;
1078 1242
… …
1094 my $dy = $ev->{y} - $oy; 1258 my $dy = $ev->{y} - $oy;
1095 1259
1096 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1260 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1097 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1261 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1098 1262
1263 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1099 $self->realloc; 1264 $self->realloc;
1100 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1101 }; 1265 };
1102 1266
1103 } elsif ($lr ^ $td) { 1267 } elsif ($lr ^ $td) {
1104 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1268 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1105 my ($bx, $by) = ($self->{x}, $self->{y}); 1269 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1108 my ($ev, $x, $y) = @_; 1272 my ($ev, $x, $y) = @_;
1109 1273
1110 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
1111 1275
1112 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1276 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1277 # HACK: the next line is required to enforce placement
1278 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1113 }; 1279 };
1280 } else {
1281 return 0;
1282 }
1283
1114 } 1284 1
1115} 1285}
1116 1286
1117sub button_up { 1287sub invoke_button_up {
1118 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
1119 1289
1120 delete $self->{motion}; 1290 ! ! delete $self->{motion}
1121} 1291}
1122 1292
1123sub mouse_motion { 1293sub invoke_mouse_motion {
1124 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
1125 1295
1126 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1297
1298 ! ! $self->{motion}
1127} 1299}
1128 1300
1129sub _draw { 1301sub _draw {
1130 my ($self) = @_; 1302 my ($self) = @_;
1131 1303
1304 my $child = $self->{children}[0];
1305
1132 my ($w, $h ) = ($self->{w}, $self->{h}); 1306 my ($w, $h ) = ($self->{w}, $self->{h});
1133 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1307 my ($cw, $ch) = ($child->{w}, $child->{h});
1134 1308
1135 glEnable GL_TEXTURE_2D; 1309 glEnable GL_TEXTURE_2D;
1136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1310 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1137 1311
1138 my $border = $self->border; 1312 my $border = $self->border;
… …
1153 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1327 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154 } 1328 }
1155 1329
1156 glDisable GL_TEXTURE_2D; 1330 glDisable GL_TEXTURE_2D;
1157 1331
1158 $self->{title}->draw if $self->{title};
1159
1160 $self->child->draw; 1332 $child->draw;
1333
1334 if ($self->{title_widget}) {
1335 glTranslate 0, $border - $self->{h};
1336 $self->{title_widget}->_draw;
1337
1338 glTranslate 0, - ($border - $self->{h});
1339 }
1340
1341 $self->{close_button}->draw
1342 if $self->{close_button};
1161} 1343}
1162 1344
1163############################################################################# 1345#############################################################################
1164 1346
1165package CFClient::UI::Table; 1347package CFClient::UI::Table;
… …
1182sub children { 1364sub children {
1183 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1184} 1366}
1185 1367
1186sub add { 1368sub add {
1187 my ($self, $x, $y, $child) = @_; 1369 my ($self) = shift;
1188 1370
1371 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, ();
1189 $child->set_parent ($self); 1373 $child->set_parent ($self);
1190 $self->{children}[$y][$x] = $child; 1374 $self->{children}[$y][$x] = $child;
1375 }
1191 1376
1377 $self->{force_realloc} = 1;
1378 $self->{force_size_alloc} = 1;
1192 $self->realloc; 1379 $self->realloc;
1380}
1381
1382sub remove {
1383 my ($self, $child) = @_;
1384
1385 # TODO: not yet implemented
1193} 1386}
1194 1387
1195# TODO: move to container class maybe? send children a signal on removal? 1388# TODO: move to container class maybe? send children a signal on removal?
1196sub clear { 1389sub clear {
1197 my ($self) = @_; 1390 my ($self) = @_;
… …
1238 (sum @$ws), 1431 (sum @$ws),
1239 (sum @$hs), 1432 (sum @$hs),
1240 ) 1433 )
1241} 1434}
1242 1435
1243sub size_allocate { 1436sub invoke_size_allocate {
1244 my ($self, $w, $h, $changed) = @_; 1437 my ($self, $w, $h) = @_;
1245 1438
1246 my ($ws, $hs) = $self->get_wh; 1439 my ($ws, $hs) = $self->get_wh;
1247 1440
1248 my $req_w = (sum @$ws) || 1; 1441 my $req_w = (sum @$ws) || 1;
1249 my $req_h = (sum @$hs) || 1; 1442 my $req_h = (sum @$hs) || 1;
… …
1280 } 1473 }
1281 1474
1282 $y += $row_h; 1475 $y += $row_h;
1283 } 1476 }
1284 1477
1478 1
1285} 1479}
1286 1480
1287sub find_widget { 1481sub find_widget {
1288 my ($self, $x, $y) = @_; 1482 my ($self, $x, $y) = @_;
1289 1483
… …
1326 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1520 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1327 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1521 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1328 ) 1522 )
1329} 1523}
1330 1524
1331sub size_allocate { 1525sub invoke_size_allocate {
1332 my ($self, $w, $h, $changed) = @_; 1526 my ($self, $w, $h) = @_;
1333 1527
1334 my $space = $self->{vertical} ? $h : $w; 1528 my $space = $self->{vertical} ? $h : $w;
1335 my $children = $self->{children}; 1529 my @children = $self->visible_children;
1336 1530
1337 my @req; 1531 my @req;
1338 1532
1339 if ($self->{homogeneous}) { 1533 if ($self->{homogeneous}) {
1340 @req = ($space / (@$children || 1)) x @$children; 1534 @req = ($space / (@children || 1)) x @children;
1341 } else { 1535 } else {
1342 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1536 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1343 my $req = List::Util::sum @req; 1537 my $req = List::Util::sum @req;
1344 1538
1345 if ($req > $space) { 1539 if ($req > $space) {
1346 # ah well, not enough space 1540 # ah well, not enough space
1347 $_ *= $space / $req for @req; 1541 $_ *= $space / $req for @req;
1348 } else { 1542 } else {
1349 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1543 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1350 1544
1351 $space = ($space - $req) / $expand; # remaining space to give away 1545 $space = ($space - $req) / $expand; # remaining space to give away
1352 1546
1353 $req[$_] += $space * $children->[$_]{expand} 1547 $req[$_] += $space * $children[$_]{expand}
1354 for 0 .. $#$children; 1548 for 0 .. $#children;
1355 } 1549 }
1356 } 1550 }
1357 1551
1358 CFClient::UI::harmonize \@req; 1552 CFClient::UI::harmonize \@req;
1359 1553
1360 my $pos = 0; 1554 my $pos = 0;
1361 for (0 .. $#$children) { 1555 for (0 .. $#children) {
1362 my $alloc = $req[$_]; 1556 my $alloc = $req[$_];
1363 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1557 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1364 1558
1365 $pos += $alloc; 1559 $pos += $alloc;
1366 } 1560 }
1367 1561
1368 1 1562 1
… …
1420 ellipsise => 3, # end 1614 ellipsise => 3, # end
1421 layout => (new CFClient::Layout), 1615 layout => (new CFClient::Layout),
1422 fontsize => 1, 1616 fontsize => 1,
1423 align => -1, 1617 align => -1,
1424 valign => -1, 1618 valign => -1,
1425 padding => 2, 1619 padding_x => 2,
1620 padding_y => 2,
1426 can_events => 0, 1621 can_events => 0,
1427 %arg 1622 %arg
1428 ); 1623 );
1429 1624
1430 if (exists $self->{template}) { 1625 if (exists $self->{template}) {
… …
1457 1652
1458 delete $self->{texture}; 1653 delete $self->{texture};
1459 $self->SUPER::update; 1654 $self->SUPER::update;
1460} 1655}
1461 1656
1657sub realloc {
1658 my ($self) = @_;
1659
1660 delete $self->{ox};
1661 $self->SUPER::realloc;
1662}
1663
1462sub set_text { 1664sub set_text {
1463 my ($self, $text) = @_; 1665 my ($self, $text) = @_;
1464 1666
1465 return if $self->{text} eq "T$text"; 1667 return if $self->{text} eq "T$text";
1466 $self->{text} = "T$text"; 1668 $self->{text} = "T$text";
1467 1669
1468 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1469 $self->{layout}->set_text ($text); 1670 $self->{layout}->set_text ($text);
1470 1671
1672 delete $self->{size_req};
1471 $self->realloc; 1673 $self->realloc;
1472 $self->update; 1674 $self->update;
1473} 1675}
1474 1676
1475sub set_markup { 1677sub set_markup {
… …
1478 return if $self->{text} eq "M$markup"; 1680 return if $self->{text} eq "M$markup";
1479 $self->{text} = "M$markup"; 1681 $self->{text} = "M$markup";
1480 1682
1481 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1683 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1482 1684
1483 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1484 $self->{layout}->set_markup ($markup); 1685 $self->{layout}->set_markup ($markup);
1485 1686
1687 delete $self->{size_req};
1486 $self->realloc; 1688 $self->realloc;
1487 $self->update; 1689 $self->update;
1488} 1690}
1489 1691
1490sub size_request { 1692sub size_request {
1491 my ($self) = @_; 1693 my ($self) = @_;
1492 1694
1695 $self->{size_req} ||= do {
1493 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1696 $self->{layout}->set_font ($self->{font}) if $self->{font};
1494 $self->{layout}->set_width ($self->{max_w} || -1); 1697 $self->{layout}->set_width ($self->{max_w} || -1);
1495 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1698 $self->{layout}->set_ellipsise ($self->{ellipsise});
1496 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1699 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1700 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498 1701
1499 my ($w, $h) = $self->{layout}->size; 1702 my ($w, $h) = $self->{layout}->size;
1500 1703
1501 if (exists $self->{template}) { 1704 if (exists $self->{template}) {
1502 $self->{template}->set_font ($self->{font}) if $self->{font}; 1705 $self->{template}->set_font ($self->{font}) if $self->{font};
1706 $self->{template}->set_width ($self->{max_w} || -1);
1503 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1707 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1504 1708
1505 my ($w2, $h2) = $self->{template}->size; 1709 my ($w2, $h2) = $self->{template}->size;
1506 1710
1507 $w = List::Util::max $w, $w2; 1711 $w = List::Util::max $w, $w2;
1508 $h = List::Util::max $h, $h2; 1712 $h = List::Util::max $h, $h2;
1713 }
1714
1715 [$w, $h]
1509 } 1716 };
1510 1717
1511 ( 1718 @{ $self->{size_req} }
1512 $w + $self->{padding} * 2,
1513 $h + $self->{padding} * 2,
1514 )
1515} 1719}
1516 1720
1721sub baseline_shift {
1722 $_[0]{layout}->descent
1723}
1724
1517sub size_allocate { 1725sub invoke_size_allocate {
1518 my ($self, $w, $h, $changed) = @_; 1726 my ($self, $w, $h) = @_;
1727
1728 delete $self->{ox};
1519 1729
1520 delete $self->{texture} 1730 delete $self->{texture}
1521 if $changed; 1731 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1732
1733 1
1522} 1734}
1523 1735
1524sub set_fontsize { 1736sub set_fontsize {
1525 my ($self, $fontsize) = @_; 1737 my ($self, $fontsize) = @_;
1526 1738
1527 $self->{fontsize} = $fontsize; 1739 $self->{fontsize} = $fontsize;
1740 delete $self->{size_req};
1528 delete $self->{texture}; 1741 delete $self->{texture};
1529 1742
1530 $self->realloc; 1743 $self->realloc;
1531} 1744}
1532 1745
1746sub reconfigure {
1747 my ($self) = @_;
1748
1749 delete $self->{size_req};
1750 delete $self->{texture};
1751
1752 $self->SUPER::reconfigure;
1753}
1754
1533sub _draw { 1755sub _draw {
1534 my ($self) = @_; 1756 my ($self) = @_;
1535 1757
1536 $self->SUPER::_draw; # draw background, if applicable 1758 $self->SUPER::_draw; # draw background, if applicable
1537 1759
1538 my $tex = $self->{texture} ||= do { 1760 my $size = $self->{texture} ||= do {
1539 $self->{layout}->set_foreground (@{$self->{fg}}); 1761 $self->{layout}->set_foreground (@{$self->{fg}});
1540 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1762 $self->{layout}->set_font ($self->{font}) if $self->{font};
1541 $self->{layout}->set_width ($self->{w}); 1763 $self->{layout}->set_width ($self->{w});
1542 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1764 $self->{layout}->set_ellipsise ($self->{ellipsise});
1543 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1765 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1766 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545 1767
1546 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1768 [$self->{layout}->size]
1547
1548 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1549 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1550 : ($self->{w} - $tex->{w}) * 0.5);
1551
1552 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1553 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1554 : ($self->{h} - $tex->{h}) * 0.5);
1555
1556 $tex
1557 }; 1769 };
1558 1770
1559 glEnable GL_TEXTURE_2D; 1771 unless (exists $self->{ox}) {
1560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1772 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1773 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1774 : ($self->{w} - $size->[0]) * 0.5);
1561 1775
1562 if ($tex->{format} == GL_ALPHA) { 1776 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1563 glColor @{$self->{fg}}; 1777 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1564 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1778 : ($self->{h} - $size->[1]) * 0.5);
1565 } else {
1566 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1567 } 1779 };
1568 1780
1569 glDisable GL_TEXTURE_2D; 1781 my $w = List::Util::min $self->{w} + 4, $size->[0];
1782 my $h = List::Util::min $self->{h} + 2, $size->[1];
1783
1784 $self->{layout}->render ($self->{ox}, $self->{oy});
1570} 1785}
1571 1786
1572############################################################################# 1787#############################################################################
1573 1788
1574package CFClient::UI::EntryBase; 1789package CFClient::UI::EntryBase;
… …
1588 can_hover => 1, 1803 can_hover => 1,
1589 can_focus => 1, 1804 can_focus => 1,
1590 valign => 0, 1805 valign => 0,
1591 can_events => 1, 1806 can_events => 1,
1592 #text => ... 1807 #text => ...
1808 #hidden => "*",
1593 @_ 1809 @_
1594 ) 1810 )
1595} 1811}
1596 1812
1597sub _set_text { 1813sub _set_text {
… …
1599 1815
1600 delete $self->{cur_h}; 1816 delete $self->{cur_h};
1601 1817
1602 return if $self->{text} eq $text; 1818 return if $self->{text} eq $text;
1603 1819
1604 delete $self->{texture};
1605
1606 $self->{last_activity} = $::NOW; 1820 $self->{last_activity} = $::NOW;
1607 $self->{text} = $text; 1821 $self->{text} = $text;
1608 1822
1609 $text =~ s/./*/g if $self->{hidden}; 1823 $text =~ s/./*/g if $self->{hidden};
1610 $self->{layout}->set_text ("$text "); 1824 $self->{layout}->set_text ("$text ");
1825 delete $self->{size_req};
1611 1826
1612 $self->_emit (changed => $self->{text}); 1827 $self->emit (changed => $self->{text});
1828
1829 $self->realloc;
1830 $self->update;
1613} 1831}
1614 1832
1615sub set_text { 1833sub set_text {
1616 my ($self, $text) = @_; 1834 my ($self, $text) = @_;
1617 1835
1618 $self->{cursor} = length $text; 1836 $self->{cursor} = length $text;
1619 $self->_set_text ($text); 1837 $self->_set_text ($text);
1620
1621 $self->realloc;
1622} 1838}
1623 1839
1624sub get_text { 1840sub get_text {
1625 $_[0]{text} 1841 $_[0]{text}
1626} 1842}
… …
1631 my ($w, $h) = $self->SUPER::size_request; 1847 my ($w, $h) = $self->SUPER::size_request;
1632 1848
1633 ($w + 1, $h) # add 1 for cursor 1849 ($w + 1, $h) # add 1 for cursor
1634} 1850}
1635 1851
1636sub key_down { 1852sub invoke_key_down {
1637 my ($self, $ev) = @_; 1853 my ($self, $ev) = @_;
1638 1854
1639 my $mod = $ev->{mod}; 1855 my $mod = $ev->{mod};
1640 my $sym = $ev->{sym}; 1856 my $sym = $ev->{sym};
1641 my $uni = $ev->{unicode}; 1857 my $uni = $ev->{unicode};
… …
1653 } elsif ($sym == CFClient::SDLK_HOME) { 1869 } elsif ($sym == CFClient::SDLK_HOME) {
1654 $self->{cursor} = 0; 1870 $self->{cursor} = 0;
1655 } elsif ($sym == CFClient::SDLK_END) { 1871 } elsif ($sym == CFClient::SDLK_END) {
1656 $self->{cursor} = length $text; 1872 $self->{cursor} = length $text;
1657 } elsif ($uni == 27) { 1873 } elsif ($uni == 27) {
1658 $self->_emit ('escape'); 1874 $self->emit ('escape');
1659 } elsif ($uni) { 1875 } elsif ($uni) {
1660 substr $text, $self->{cursor}++, 0, chr $uni; 1876 substr $text, $self->{cursor}++, 0, chr $uni;
1877 } else {
1878 return 0;
1661 } 1879 }
1662 1880
1663 $self->_set_text ($text); 1881 $self->_set_text ($text);
1664 1882
1665 $self->realloc; 1883 $self->realloc;
1666}
1667 1884
1885 1
1886}
1887
1668sub focus_in { 1888sub invoke_focus_in {
1669 my ($self) = @_; 1889 my ($self) = @_;
1670 1890
1671 $self->{last_activity} = $::NOW; 1891 $self->{last_activity} = $::NOW;
1672 1892
1673 $self->SUPER::focus_in; 1893 $self->SUPER::invoke_focus_in
1674} 1894}
1675 1895
1676sub button_down { 1896sub invoke_button_down {
1677 my ($self, $ev, $x, $y) = @_; 1897 my ($self, $ev, $x, $y) = @_;
1678 1898
1679 $self->SUPER::button_down ($ev, $x, $y); 1899 $self->SUPER::invoke_button_down ($ev, $x, $y);
1680 1900
1681 my $idx = $self->{layout}->xy_to_index ($x, $y); 1901 my $idx = $self->{layout}->xy_to_index ($x, $y);
1682 1902
1683 # byte-index to char-index 1903 # byte-index to char-index
1684 my $text = $self->{text}; 1904 my $text = $self->{text};
1685 utf8::encode $text; 1905 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1686 $self->{cursor} = length substr $text, 0, $idx; 1906 $self->{cursor} = length $text;
1687 1907
1688 $self->_set_text ($self->{text}); 1908 $self->_set_text ($self->{text});
1689 $self->update; 1909 $self->update;
1910
1911 1
1690} 1912}
1691 1913
1692sub mouse_motion { 1914sub invoke_mouse_motion {
1693 my ($self, $ev, $x, $y) = @_; 1915 my ($self, $ev, $x, $y) = @_;
1694# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1916# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1917
1918 1
1695} 1919}
1696 1920
1697sub _draw { 1921sub _draw {
1698 my ($self) = @_; 1922 my ($self) = @_;
1699 1923
1700 local $self->{fg} = $self->{fg}; 1924 local $self->{fg} = $self->{fg};
1701 1925
1702 if ($FOCUS == $self) { 1926 if ($FOCUS == $self) {
1703 glColor @{$self->{active_bg}}; 1927 glColor_premultiply @{$self->{active_bg}};
1704 $self->{fg} = $self->{active_fg}; 1928 $self->{fg} = $self->{active_fg};
1705 } else { 1929 } else {
1706 glColor @{$self->{bg}}; 1930 glColor_premultiply @{$self->{bg}};
1707 } 1931 }
1708 1932
1709 glEnable GL_BLEND; 1933 glEnable GL_BLEND;
1710 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1934 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1711 glBegin GL_QUADS; 1935 glBegin GL_QUADS;
1712 glVertex 0 , 0; 1936 glVertex 0 , 0;
1713 glVertex 0 , $self->{h}; 1937 glVertex 0 , $self->{h};
1714 glVertex $self->{w}, $self->{h}; 1938 glVertex $self->{w}, $self->{h};
1715 glVertex $self->{w}, 0; 1939 glVertex $self->{w}, 0;
… …
1740 1964
1741our @ISA = CFClient::UI::EntryBase::; 1965our @ISA = CFClient::UI::EntryBase::;
1742 1966
1743use CFClient::OpenGL; 1967use CFClient::OpenGL;
1744 1968
1745sub key_down { 1969sub invoke_key_down {
1746 my ($self, $ev) = @_; 1970 my ($self, $ev) = @_;
1747 1971
1748 my $sym = $ev->{sym}; 1972 my $sym = $ev->{sym};
1749 1973
1750 if ($sym == 13) { 1974 if ($sym == 13) {
1751 unshift @{$self->{history}}, 1975 unshift @{$self->{history}},
1752 my $txt = $self->get_text; 1976 my $txt = $self->get_text;
1977
1753 $self->{history_pointer} = -1; 1978 $self->{history_pointer} = -1;
1754 $self->{history_saveback} = ''; 1979 $self->{history_saveback} = '';
1755 $self->_emit (activate => $txt); 1980 $self->emit (activate => $txt);
1756 $self->update; 1981 $self->update;
1757 1982
1758 } elsif ($sym == CFClient::SDLK_UP) { 1983 } elsif ($sym == CFClient::SDLK_UP) {
1759 if ($self->{history_pointer} < 0) { 1984 if ($self->{history_pointer} < 0) {
1760 $self->{history_saveback} = $self->get_text; 1985 $self->{history_saveback} = $self->get_text;
… …
1776 } else { 2001 } else {
1777 $self->set_text ($self->{history_saveback}); 2002 $self->set_text ($self->{history_saveback});
1778 } 2003 }
1779 2004
1780 } else { 2005 } else {
1781 $self->SUPER::key_down ($ev); 2006 return $self->SUPER::invoke_key_down ($ev)
2007 }
2008
1782 } 2009 1
1783
1784} 2010}
1785 2011
1786############################################################################# 2012#############################################################################
1787 2013
1788package CFClient::UI::Button; 2014package CFClient::UI::Button;
… …
1797 2023
1798sub new { 2024sub new {
1799 my $class = shift; 2025 my $class = shift;
1800 2026
1801 $class->SUPER::new ( 2027 $class->SUPER::new (
1802 padding => 4, 2028 padding_x => 4,
2029 padding_y => 4,
1803 fg => [1, 1, 1], 2030 fg => [1, 1, 1],
1804 active_fg => [0, 0, 1], 2031 active_fg => [0, 0, 1],
1805 can_hover => 1, 2032 can_hover => 1,
1806 align => 0, 2033 align => 0,
1807 valign => 0, 2034 valign => 0,
1808 can_events => 1, 2035 can_events => 1,
1809 @_ 2036 @_
1810 ) 2037 )
1811} 2038}
1812 2039
1813sub activate { }
1814
1815sub button_up { 2040sub invoke_button_up {
1816 my ($self, $ev, $x, $y) = @_; 2041 my ($self, $ev, $x, $y) = @_;
1817 2042
1818 $self->emit ("activate") 2043 $self->emit ("activate")
1819 if $x >= 0 && $x < $self->{w} 2044 if $x >= 0 && $x < $self->{w}
1820 && $y >= 0 && $y < $self->{h}; 2045 && $y >= 0 && $y < $self->{h};
2046
2047 1
1821} 2048}
1822 2049
1823sub _draw { 2050sub _draw {
1824 my ($self) = @_; 2051 my ($self) = @_;
1825 2052
1826 local $self->{fg} = $self->{fg}; 2053 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1827
1828 if ($GRAB == $self) {
1829 $self->{fg} = $self->{active_fg};
1830 }
1831 2054
1832 glEnable GL_TEXTURE_2D; 2055 glEnable GL_TEXTURE_2D;
1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2056 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1834 glColor 0, 0, 0, 1; 2057 glColor 0, 0, 0, 1;
1835 2058
… …
1840 $self->SUPER::_draw; 2063 $self->SUPER::_draw;
1841} 2064}
1842 2065
1843############################################################################# 2066#############################################################################
1844 2067
2068package CFClient::UI::ImageButton;
2069
2070our @ISA = CFClient::UI::Image::;
2071
2072use CFClient::OpenGL;
2073
2074my %textures;
2075
2076sub new {
2077 my $class = shift;
2078
2079 my $self = $class->SUPER::new (
2080 padding_x => 4,
2081 padding_y => 4,
2082 fg => [1, 1, 1],
2083 active_fg => [0, 0, 1],
2084 can_hover => 1,
2085 align => 0,
2086 valign => 0,
2087 can_events => 1,
2088 @_
2089 );
2090}
2091
2092sub invoke_button_up {
2093 my ($self, $ev, $x, $y) = @_;
2094
2095 $self->emit ("activate")
2096 if $x >= 0 && $x < $self->{w}
2097 && $y >= 0 && $y < $self->{h};
2098
2099 1
2100}
2101
2102#############################################################################
2103
1845package CFClient::UI::CheckBox; 2104package CFClient::UI::CheckBox;
1846 2105
1847our @ISA = CFClient::UI::DrawBG::; 2106our @ISA = CFClient::UI::DrawBG::;
1848 2107
1849my @tex = 2108my @tex =
… …
1854 2113
1855sub new { 2114sub new {
1856 my $class = shift; 2115 my $class = shift;
1857 2116
1858 $class->SUPER::new ( 2117 $class->SUPER::new (
1859 padding => 2, 2118 padding_x => 2,
2119 padding_y => 2,
1860 fg => [1, 1, 1], 2120 fg => [1, 1, 1],
1861 active_fg => [1, 1, 0], 2121 active_fg => [1, 1, 0],
1862 bg => [0, 0, 0, 0.2], 2122 bg => [0, 0, 0, 0.2],
1863 active_bg => [1, 1, 1, 0.5], 2123 active_bg => [1, 1, 1, 0.5],
1864 state => 0, 2124 state => 0,
… …
1868} 2128}
1869 2129
1870sub size_request { 2130sub size_request {
1871 my ($self) = @_; 2131 my ($self) = @_;
1872 2132
1873 ($self->{padding} * 2 + 6) x 2 2133 (6) x 2
1874} 2134}
1875 2135
2136sub toggle {
2137 my ($self) = @_;
2138
2139 $self->{state} = !$self->{state};
2140 $self->emit (changed => $self->{state});
2141 $self->update;
2142}
2143
1876sub button_down { 2144sub invoke_button_down {
1877 my ($self, $ev, $x, $y) = @_; 2145 my ($self, $ev, $x, $y) = @_;
1878 2146
1879 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2147 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2148 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881 $self->{state} = !$self->{state}; 2149 $self->toggle;
1882 $self->_emit (changed => $self->{state}); 2150 } else {
2151 return 0
2152 }
2153
1883 } 2154 1
1884} 2155}
1885 2156
1886sub _draw { 2157sub _draw {
1887 my ($self) = @_; 2158 my ($self) = @_;
1888 2159
1889 $self->SUPER::_draw; 2160 $self->SUPER::_draw;
1890 2161
1891 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2162 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892 2163
1893 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2164 my ($w, $h) = @$self{qw(w h)};
2165
2166 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1894 2167
1895 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2168 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896 2169
1897 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2170 my $tex = $self->{state} ? $tex[1] : $tex[0];
1898 2171
… …
1906package CFClient::UI::Image; 2179package CFClient::UI::Image;
1907 2180
1908our @ISA = CFClient::UI::Base::; 2181our @ISA = CFClient::UI::Base::;
1909 2182
1910use CFClient::OpenGL; 2183use CFClient::OpenGL;
1911use Carp qw/confess/;
1912 2184
1913our %loaded_images; 2185our %texture_cache;
1914 2186
1915sub new { 2187sub new {
1916 my $class = shift; 2188 my $class = shift;
1917 2189
1918 my $self = $class->SUPER::new (can_events => 0, @_); 2190 my $self = $class->SUPER::new (
2191 can_events => 0,
2192 @_,
2193 );
1919 2194
1920 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2195 $self->{path} || $self->{tex}
2196 or Carp::croak "'path' or 'tex' attributes required";
1921 2197
1922 $loaded_images{$self->{image}} ||= 2198 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1923 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2199 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1924 2200
1925 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2201 Scalar::Util::weaken $texture_cache{$self->{path}};
1926 2202
1927 Scalar::Util::weaken $loaded_images{$self->{image}}; 2203 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1928
1929 $self->{aspect} = $tex->{w} / $tex->{h};
1930 2204
1931 $self 2205 $self
1932} 2206}
1933 2207
1934sub size_request { 2208sub size_request {
1935 my ($self) = @_; 2209 my ($self) = @_;
1936 2210
1937 ($self->{tex}->{w}, $self->{tex}->{h}) 2211 ($self->{tex}{w}, $self->{tex}{h})
1938} 2212}
1939 2213
1940sub _draw { 2214sub _draw {
1941 my ($self) = @_; 2215 my ($self) = @_;
1942 2216
… …
2051 my $ycut1 = max 0, min 1, $ycut; 2325 my $ycut1 = max 0, min 1, $ycut;
2052 my $ycut2 = max 0, min 1, $ycut - 1; 2326 my $ycut2 = max 0, min 1, $ycut - 1;
2053 2327
2054 my $h1 = $self->{h} * (1 - $ycut1); 2328 my $h1 = $self->{h} * (1 - $ycut1);
2055 my $h2 = $self->{h} * (1 - $ycut2); 2329 my $h2 = $self->{h} * (1 - $ycut2);
2330 my $h3 = $self->{h};
2331
2332 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2056 2333
2057 glEnable GL_BLEND; 2334 glEnable GL_BLEND;
2058 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2335 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2336 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2059 glEnable GL_TEXTURE_2D; 2337 glEnable GL_TEXTURE_2D;
2060 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2338 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2061 2339
2062 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2340 glBindTexture GL_TEXTURE_2D, $t1->{name};
2063 glBegin GL_QUADS; 2341 glBegin GL_QUADS;
… …
2078 2356
2079 if ($t3) { 2357 if ($t3) {
2080 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2358 glBindTexture GL_TEXTURE_2D, $t3->{name};
2081 glBegin GL_QUADS; 2359 glBegin GL_QUADS;
2082 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2360 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2083 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2361 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2084 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2362 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2085 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2363 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2086 glEnd; 2364 glEnd;
2087 } 2365 }
2088 2366
2089 glDisable GL_BLEND; 2367 glDisable GL_BLEND;
… …
2177 $self->update; 2455 $self->update;
2178 2456
2179 $self 2457 $self
2180} 2458}
2181 2459
2182sub changed { }
2183
2184sub set_range { 2460sub set_range {
2185 my ($self, $range) = @_; 2461 my ($self, $range) = @_;
2186 2462
2187 ($range, $self->{range}) = ($self->{range}, $range); 2463 ($range, $self->{range}) = ($self->{range}, $range);
2188 2464
2189 $self->update
2190 if "@$range" ne "@{$self->{range}}"; 2465 if ("@$range" ne "@{$self->{range}}") {
2466 $self->update;
2467 $self->set_value ($self->{range}[0]);
2468 }
2191} 2469}
2192 2470
2193sub set_value { 2471sub set_value {
2194 my ($self, $value) = @_; 2472 my ($self, $value) = @_;
2195 2473
… …
2206 if $unit; 2484 if $unit;
2207 2485
2208 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2486 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2209 2487
2210 if ($value != $old_value) { 2488 if ($value != $old_value) {
2211 $self->_emit (changed => $value); 2489 $self->emit (changed => $value);
2212 $self->update; 2490 $self->update;
2213 } 2491 }
2214} 2492}
2215 2493
2216sub size_request { 2494sub size_request {
2217 my ($self) = @_; 2495 my ($self) = @_;
2218 2496
2219 ($self->{req_w}, $self->{req_h}) 2497 ($self->{req_w}, $self->{req_h})
2220} 2498}
2221 2499
2222sub button_down { 2500sub invoke_button_down {
2223 my ($self, $ev, $x, $y) = @_; 2501 my ($self, $ev, $x, $y) = @_;
2224 2502
2225 $self->SUPER::button_down ($ev, $x, $y); 2503 $self->SUPER::invoke_button_down ($ev, $x, $y);
2226 2504
2227 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2505 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2228 2506
2229 $self->mouse_motion ($ev, $x, $y); 2507 $self->invoke_mouse_motion ($ev, $x, $y)
2230} 2508}
2231 2509
2232sub mouse_motion { 2510sub invoke_mouse_motion {
2233 my ($self, $ev, $x, $y) = @_; 2511 my ($self, $ev, $x, $y) = @_;
2234 2512
2235 if ($GRAB == $self) { 2513 if ($GRAB == $self) {
2236 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2514 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2237 2515
2238 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2516 my (undef, $lo, $hi, $page) = @{$self->{range}};
2239 2517
2240 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2518 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2241 2519
2242 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2520 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2521 } else {
2522 return 0;
2523 }
2524
2243 } 2525 1
2526}
2527
2528sub invoke_mouse_wheel {
2529 my ($self, $ev) = @_;
2530
2531 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2532
2533 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
2534
2535 ! ! $delta
2244} 2536}
2245 2537
2246sub update { 2538sub update {
2247 my ($self) = @_; 2539 my ($self) = @_;
2248 2540
2249 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2541 delete $self->{knob_w};
2542 $self->SUPER::update;
2543}
2544
2545sub _draw {
2546 my ($self) = @_;
2547
2548 unless ($self->{knob_w}) {
2250 $self->set_value ($self->{range}[0]); 2549 $self->set_value ($self->{range}[0]);
2251 2550
2252 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2551 my ($value, $lo, $hi, $page) = @{$self->{range}};
2253 my $range = ($hi - $page - $lo) || 1e-100; 2552 my $range = ($hi - $page - $lo) || 1e-100;
2254 2553
… …
2260 $value = ($value - $lo) / $range; 2559 $value = ($value - $lo) / $range;
2261 $value = $value * $self->{scale} + $self->{offset}; 2560 $value = $value * $self->{scale} + $self->{offset};
2262 2561
2263 $self->{knob_x} = $value - $knob_w * 0.5; 2562 $self->{knob_x} = $value - $knob_w * 0.5;
2264 $self->{knob_w} = $knob_w; 2563 $self->{knob_w} = $knob_w;
2265 }); 2564 }
2266
2267 $self->SUPER::update;
2268}
2269
2270sub _draw {
2271 my ($self) = @_;
2272 2565
2273 $self->SUPER::_draw (); 2566 $self->SUPER::_draw ();
2274 2567
2275 glScale $self->{w}, $self->{h}; 2568 glScale $self->{w}, $self->{h};
2276 2569
… …
2337sub set_range { shift->{slider}->set_range (@_) } 2630sub set_range { shift->{slider}->set_range (@_) }
2338sub set_value { shift->{slider}->set_value (@_) } 2631sub set_value { shift->{slider}->set_value (@_) }
2339 2632
2340############################################################################# 2633#############################################################################
2341 2634
2342package CFClient::UI::TextView; 2635package CFClient::UI::TextScroller;
2343 2636
2344our @ISA = CFClient::UI::HBox::; 2637our @ISA = CFClient::UI::HBox::;
2345 2638
2346use CFClient::OpenGL; 2639use CFClient::OpenGL;
2347 2640
2348sub new { 2641sub new {
2349 my $class = shift; 2642 my $class = shift;
2350 2643
2351 my $self = $class->SUPER::new ( 2644 my $self = $class->SUPER::new (
2352 fontsize => 1, 2645 fontsize => 1,
2353 can_events => 0, 2646 can_events => 1,
2647 indent => 0,
2354 #font => default_font 2648 #font => default_font
2355 @_, 2649 @_,
2356 2650
2357 layout => (new CFClient::Layout 1), 2651 layout => (new CFClient::Layout),
2358 par => [], 2652 par => [],
2359 height => 0, 2653 height => 0,
2360 children => [ 2654 children => [
2361 (new CFClient::UI::Empty expand => 1), 2655 (new CFClient::UI::Empty expand => 1),
2362 (new CFClient::UI::Slider vertical => 1), 2656 (new CFClient::UI::Slider vertical => 1),
… …
2373 2667
2374 $self->{fontsize} = $fontsize; 2668 $self->{fontsize} = $fontsize;
2375 $self->reflow; 2669 $self->reflow;
2376} 2670}
2377 2671
2672sub size_request {
2673 my ($self) = @_;
2674
2675 my ($empty, $slider) = @{ $self->{children} };
2676
2677 local $self->{children} = [$empty, $slider];
2678 $self->SUPER::size_request
2679}
2680
2378sub size_allocate { 2681sub invoke_size_allocate {
2379 my ($self, $w, $h, $changed) = @_; 2682 my ($self, $w, $h) = @_;
2380 2683
2381 $self->SUPER::size_allocate ($w, $h, $changed); 2684 my ($empty, $slider, @other) = @{ $self->{children} };
2382 2685 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2383 return unless $changed;
2384 2686
2385 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2687 $self->{layout}->set_font ($self->{font}) if $self->{font};
2386 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2688 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2387 $self->{layout}->set_width ($self->{children}[0]{w}); 2689 $self->{layout}->set_width ($empty->{w});
2690 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2388 2691
2389 $self->reflow; 2692 $self->reflow;
2390}
2391 2693
2392sub text_size { 2694 local $self->{children} = [$empty, $slider];
2695 $self->SUPER::invoke_size_allocate ($w, $h)
2696}
2697
2698sub invoke_mouse_wheel {
2393 my ($self, $text, $indent) = @_; 2699 my ($self, $ev) = @_;
2700
2701 return 0 unless $ev->{dy}; # only vertical movements
2702
2703 $self->{children}[1]->emit (mouse_wheel => $ev);
2704
2705 1
2706}
2707
2708sub get_layout {
2709 my ($self, $para) = @_;
2394 2710
2395 my $layout = $self->{layout}; 2711 my $layout = $self->{layout};
2396 2712
2713 $layout->set_font ($self->{font}) if $self->{font};
2714 $layout->set_foreground (@{$para->{fg}});
2397 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2715 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2398 $layout->set_width ($self->{children}[0]{w} - $indent); 2716 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2717 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2399 $layout->set_markup ($text); 2718 $layout->set_markup ($para->{markup});
2719
2720 $layout->set_shapes (
2721 map
2722 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2723 @{$para->{widget}}
2400 2724 );
2725
2401 $layout->size 2726 $layout
2402} 2727}
2403 2728
2404sub reflow { 2729sub reflow {
2405 my ($self) = @_; 2730 my ($self) = @_;
2406 2731
… …
2415 $self->{children}[1]->set_value ($offset); 2740 $self->{children}[1]->set_value ($offset);
2416} 2741}
2417 2742
2418sub clear { 2743sub clear {
2419 my ($self) = @_; 2744 my ($self) = @_;
2745
2746 my (undef, undef, @other) = @{ $self->{children} };
2747 $self->remove ($_) for @other;
2420 2748
2421 $self->{par} = []; 2749 $self->{par} = [];
2422 $self->{height} = 0; 2750 $self->{height} = 0;
2423 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2751 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2424} 2752}
2425 2753
2426sub add_paragraph { 2754sub add_paragraph {
2427 my ($self, $color, $text, $indent) = @_; 2755 my ($self, $color, $para, $indent) = @_;
2428 2756
2429 for my $line (split /\n/, $text) { 2757 my ($text, @w) = ref $para ? @$para : $para;
2430 my ($w, $h) = $self->text_size ($line); 2758
2431 $self->{height} += $h; 2759 $para = {
2432 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2760 w => 1e10,
2761 wrapped => 1,
2762 fg => $color,
2763 indent => $indent,
2764 markup => $text,
2765 widget => \@w,
2433 } 2766 };
2434 2767
2435 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2768 $self->add (@w) if @w;
2769 push @{$self->{par}}, $para;
2770
2771 $self->{need_reflow}++;
2772 $self->update;
2773}
2774
2775sub scroll_to_bottom {
2776 my ($self) = @_;
2777
2778 $self->{scroll_to_bottom} = 1;
2779 $self->update;
2436} 2780}
2437 2781
2438sub update { 2782sub update {
2439 my ($self) = @_; 2783 my ($self) = @_;
2440 2784
… …
2442 2786
2443 return unless $self->{h} > 0; 2787 return unless $self->{h} > 0;
2444 2788
2445 delete $self->{texture}; 2789 delete $self->{texture};
2446 2790
2447 $ROOT->on_post_alloc ($self, sub { 2791 $ROOT->on_post_alloc ($self => sub {
2448 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2792 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2449 2793
2450 if (delete $self->{need_reflow}) { 2794 if (delete $self->{need_reflow}) {
2451 my $height = 0; 2795 my $height = 0;
2452 2796
2453 my $layout = $self->{layout};
2454
2455 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2456
2457 for (@{$self->{par}}) { 2797 for my $para (@{$self->{par}}) {
2458 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2798 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2459 $layout->set_width ($W - $_->[3]); 2799 my $layout = $self->get_layout ($para);
2460 $layout->set_markup ($_->[4]);
2461 my ($w, $h) = $layout->size; 2800 my ($w, $h) = $layout->size;
2462 $_->[0] = $w + $_->[3]; 2801
2463 $_->[1] = $h; 2802 $para->{w} = $w + $para->{indent};
2803 $para->{h} = $h;
2804 $para->{wrapped} = $layout->has_wrapped;
2464 } 2805 }
2465 2806
2466 $height += $_->[1]; 2807 $height += $para->{h};
2467 } 2808 }
2468 2809
2469 $self->{height} = $height; 2810 $self->{height} = $height;
2470 2811
2471 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2812 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2472 2813
2473 delete $self->{texture}; 2814 delete $self->{texture};
2474 } 2815 }
2475 2816
2817 if (delete $self->{scroll_to_bottom}) {
2818 $self->{children}[1]->set_value (1e10);
2819 }
2820
2476 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2821 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2477 glClearColor 0.5, 0.5, 0.5, 0; 2822 glClearColor 0, 0, 0, 0;
2478 glClear GL_COLOR_BUFFER_BIT; 2823 glClear GL_COLOR_BUFFER_BIT;
2479 2824
2480 my $top = int $self->{children}[1]{range}[0]; 2825 my $top = int $self->{children}[1]{range}[0];
2481 2826
2482 my $y0 = $top; 2827 my $y0 = $top;
2483 my $y1 = $top + $H; 2828 my $y1 = $top + $H;
2484 2829
2485 my $y = 0; 2830 my $y = 0;
2486 2831
2487 my $layout = $self->{layout};
2488
2489 $layout->set_font ($self->{font}) if $self->{font};
2490
2491 glEnable GL_BLEND;
2492 #TODO# not correct in windows where rgba is forced off
2493 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2494
2495 for my $par (@{$self->{par}}) { 2832 for my $para (@{$self->{par}}) {
2496 my $h = $par->[1]; 2833 my $h = $para->{h};
2497 2834
2498 if ($y0 < $y + $h && $y < $y1) { 2835 if ($y0 < $y + $h && $y < $y1) {
2499 $layout->set_foreground (@{ $par->[2] });
2500 $layout->set_width ($W - $par->[3]);
2501 $layout->set_markup ($par->[4]);
2502 2836
2503 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2837 my $layout = $self->get_layout ($para);
2504 2838
2505 glRasterPos $par->[3], $y - $y0; 2839 $layout->render ($para->{indent}, $y - $y0);
2506 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2840
2841 if (my @w = @{ $para->{widget} }) {
2842 my @s = $layout->get_shapes;
2843
2844 for (@w) {
2845 my ($dx, $dy) = splice @s, 0, 2, ();
2846
2847 $_->{x} = $dx + $para->{indent};
2848 $_->{y} = $dy + $y - $y0;
2849
2850 $_->draw;
2851 }
2852 }
2507 } 2853 }
2508 2854
2509 $y += $h; 2855 $y += $h;
2510 } 2856 }
2511
2512 glDisable GL_BLEND;
2513 }; 2857 };
2514 }); 2858 });
2515} 2859}
2516 2860
2861sub reconfigure {
2862 my ($self) = @_;
2863
2864 $self->SUPER::reconfigure;
2865
2866 $_->{w} = 1e10 for @{ $self->{par} };
2867 $self->reflow;
2868}
2869
2517sub _draw { 2870sub _draw {
2518 my ($self) = @_; 2871 my ($self) = @_;
2519 2872
2520 glEnable GL_TEXTURE_2D; 2873 glEnable GL_TEXTURE_2D;
2521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2874 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2522 glColor 1, 1, 1, 1; 2875 glColor 0, 0, 0, 1;
2523 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2876 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2524 glDisable GL_TEXTURE_2D; 2877 glDisable GL_TEXTURE_2D;
2525 2878
2526 $self->{children}[1]->draw; 2879 $self->{children}[1]->draw;
2527
2528} 2880}
2529 2881
2530############################################################################# 2882#############################################################################
2531 2883
2532package CFClient::UI::Animator; 2884package CFClient::UI::Animator;
… …
2611} 2963}
2612 2964
2613sub set_tooltip_from { 2965sub set_tooltip_from {
2614 my ($self, $widget) = @_; 2966 my ($self, $widget) = @_;
2615 2967
2968 my $tooltip = $widget->{tooltip};
2969
2970 if ($ENV{CFPLUS_DEBUG} & 2) {
2971 $tooltip .= "\n\n" . (ref $widget) . "\n"
2972 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2973 . "req $widget->{req_w} $widget->{req_h}\n"
2974 . "visible $widget->{visible}";
2975 }
2976
2977 $tooltip =~ s/^\n+//;
2978 $tooltip =~ s/\n+$//;
2979
2616 $self->add (new CFClient::UI::Label 2980 $self->add (new CFClient::UI::Label
2617 markup => $widget->{tooltip}, 2981 markup => $tooltip,
2618 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2982 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2619 fontsize => 0.8, 2983 fontsize => 0.8,
2620 fg => [0, 0, 0, 1], 2984 fg => [0, 0, 0, 1],
2621 ellipsise => 0, 2985 ellipsise => 0,
2622 font => ($widget->{tooltip_font} || $::FONT_PROP), 2986 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2629 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2993 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2630 2994
2631 ($w + 4, $h + 4) 2995 ($w + 4, $h + 4)
2632} 2996}
2633 2997
2634sub size_allocate { 2998sub invoke_size_allocate {
2635 my ($self, $w, $h, $changed) = @_; 2999 my ($self, $w, $h) = @_;
2636 3000
2637 return unless $changed;
2638
2639 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 3001 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2640} 3002}
2641 3003
2642sub visibility_change { 3004sub invoke_visibility_change {
2643 my ($self, $visible) = @_; 3005 my ($self, $visible) = @_;
2644 3006
2645 return unless $visible; 3007 return unless $visible;
2646 3008
2647 $self->{root}->on_post_alloc ("move_$self" => sub { 3009 $self->{root}->on_post_alloc ("move_$self" => sub {
2648 my $widget = $self->{owner} 3010 my $widget = $self->{owner}
2649 or return; 3011 or return;
2650 3012
3013 if ($widget->{visible}) {
2651 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3014 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2652 3015
2653 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3016 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2654 if $x + $self->{w} > $::WIDTH; 3017 if $x + $self->{w} > $self->{root}{w};
2655 3018
2656 $self->move_abs ($x, $y); 3019 $self->move_abs ($x, $y);
3020 } else {
3021 $self->hide;
3022 }
2657 }); 3023 });
2658} 3024}
2659 3025
2660sub _draw { 3026sub _draw {
2661 my ($self) = @_; 3027 my ($self) = @_;
… …
2748 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3114 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2749 3115
2750 if ($tex) { 3116 if ($tex) {
2751 glEnable GL_TEXTURE_2D; 3117 glEnable GL_TEXTURE_2D;
2752 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3118 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2753 glColor 1, 1, 1, 1; 3119 glColor 0, 0, 0, 1;
2754 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3120 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2755 glDisable GL_TEXTURE_2D; 3121 glDisable GL_TEXTURE_2D;
2756 } 3122 }
2757} 3123}
2758 3124
2759sub DESTROY { 3125sub destroy {
2760 my ($self) = @_; 3126 my ($self) = @_;
2761 3127
2762 $self->{timer}->cancel 3128 $self->{timer}->cancel
2763 if $self->{timer}; 3129 if $self->{timer};
2764 3130
2765 $self->SUPER::DESTROY; 3131 $self->SUPER::destroy;
2766} 3132}
2767 3133
2768############################################################################# 3134#############################################################################
2769 3135
2770package CFClient::UI::Inventory; 3136package CFClient::UI::Buttonbar;
2771 3137
2772our @ISA = CFClient::UI::ScrolledWindow::; 3138our @ISA = CFClient::UI::HBox::;
2773 3139
2774sub new { 3140# TODO: should actualyl wrap buttons and other goodies.
2775 my $class = shift;
2776
2777 my $self = $class->SUPER::new (
2778 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2779 @_,
2780 );
2781
2782 $self
2783}
2784
2785sub set_items {
2786 my ($self, $items) = @_;
2787
2788 $self->{scrolled}->clear;
2789 return unless $items;
2790
2791 my @items = sort {
2792 ($a->{type} <=> $b->{type})
2793 or ($a->{name} cmp $b->{name})
2794 } @$items;
2795
2796 $self->{real_items} = \@items;
2797
2798 my $row = 0;
2799 for my $item (@items) {
2800 CFClient::Item::update_widgets $item;
2801
2802 $self->{scrolled}->add (0, $row, $item->{face_widget});
2803 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2804 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2805
2806 $row++;
2807 }
2808}
2809 3141
2810############################################################################# 3142#############################################################################
2811 3143
2812package CFClient::UI::Menu; 3144package CFClient::UI::Menu;
2813 3145
… …
2825 ); 3157 );
2826 3158
2827 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3159 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2828 3160
2829 for my $item (@{ $self->{items} }) { 3161 for my $item (@{ $self->{items} }) {
2830 my ($widget, $cb) = @$item; 3162 my ($widget, $cb, $tooltip) = @$item;
2831 3163
2832 # handle various types of items, only text for now 3164 # handle various types of items, only text for now
2833 if (!ref $widget) { 3165 if (!ref $widget) {
3166 if ($widget =~ /\t/) {
3167 my ($left, $right) = split /\t/, $widget, 2;
3168
3169 $widget = new CFClient::UI::HBox
3170 can_hover => 1,
3171 can_events => 1,
3172 tooltip => $tooltip,
3173 children => [
3174 (new CFClient::UI::Label markup => $left, expand => 1),
3175 (new CFClient::UI::Label markup => $right, align => +1),
3176 ],
3177 ;
3178
3179 } else {
2834 $widget = new CFClient::UI::Label 3180 $widget = new CFClient::UI::Label
2835 can_hover => 1, 3181 can_hover => 1,
2836 can_events => 1, 3182 can_events => 1,
2837 text => $widget; 3183 markup => $widget,
3184 tooltip => $tooltip;
3185 }
2838 } 3186 }
2839 3187
2840 $self->{item}{$widget} = $item; 3188 $self->{item}{$widget} = $item;
2841 3189
2842 $self->{vbox}->add ($widget); 3190 $self->{vbox}->add ($widget);
… …
2847 3195
2848# popup given the event (must be a mouse button down event currently) 3196# popup given the event (must be a mouse button down event currently)
2849sub popup { 3197sub popup {
2850 my ($self, $ev) = @_; 3198 my ($self, $ev) = @_;
2851 3199
2852 $self->_emit ("popdown"); 3200 $self->emit ("popdown");
2853 3201
2854 # maybe save $GRAB? must be careful about events... 3202 # maybe save $GRAB? must be careful about events...
2855 $GRAB = $self; 3203 $GRAB = $self;
2856 $self->{button} = $ev->{button}; 3204 $self->{button} = $ev->{button};
2857 3205
2858 $self->show; 3206 $self->show;
2859 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3207 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2860} 3208}
2861 3209
2862sub mouse_motion { 3210sub invoke_mouse_motion {
2863 my ($self, $ev, $x, $y) = @_; 3211 my ($self, $ev, $x, $y) = @_;
2864 3212
2865 # TODO: should use vbox->find_widget or so 3213 # TODO: should use vbox->find_widget or so
2866 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3214 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2867 $self->{hover} = $self->{item}{$HOVER}; 3215 $self->{hover} = $self->{item}{$HOVER};
2868}
2869 3216
3217 0
3218}
3219
2870sub button_up { 3220sub invoke_button_up {
2871 my ($self, $ev, $x, $y) = @_; 3221 my ($self, $ev, $x, $y) = @_;
2872 3222
2873 if ($ev->{button} == $self->{button}) { 3223 if ($ev->{button} == $self->{button}) {
2874 undef $GRAB; 3224 undef $GRAB;
2875 $self->hide; 3225 $self->hide;
2876 3226
2877 $self->_emit ("popdown"); 3227 $self->emit ("popdown");
2878 $self->{hover}[1]->() if $self->{hover}; 3228 $self->{hover}[1]->() if $self->{hover};
3229 } else {
3230 return 0
3231 }
3232
2879 } 3233 1
2880} 3234}
2881 3235
2882############################################################################# 3236#############################################################################
2883 3237
2884package CFClient::UI::Statusbox; 3238package CFClient::UI::Multiplexer;
2885 3239
2886our @ISA = CFClient::UI::VBox::; 3240our @ISA = CFClient::UI::Container::;
2887 3241
2888sub new { 3242sub new {
2889 my $class = shift; 3243 my $class = shift;
2890 3244
2891 $class->SUPER::new ( 3245 my $self = $class->SUPER::new (
3246 @_,
3247 );
3248
3249 $self->{current} = $self->{children}[0]
3250 if @{ $self->{children} };
3251
3252 $self
3253}
3254
3255sub add {
3256 my ($self, @widgets) = @_;
3257
3258 $self->SUPER::add (@widgets);
3259
3260 $self->{current} = $self->{children}[0]
3261 if @{ $self->{children} };
3262}
3263
3264sub get_current_page {
3265 my ($self) = @_;
3266
3267 $self->{current}
3268}
3269
3270sub set_current_page {
3271 my ($self, $page_or_widget) = @_;
3272
3273 my $widget = ref $page_or_widget
3274 ? $page_or_widget
3275 : $self->{children}[$page_or_widget];
3276
3277 $self->{current} = $widget;
3278 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3279
3280 $self->emit (page_changed => $self->{current});
3281
3282 $self->realloc;
3283}
3284
3285sub visible_children {
3286 $_[0]{current}
3287}
3288
3289sub size_request {
3290 my ($self) = @_;
3291
3292 $self->{current}->size_request
3293}
3294
3295sub invoke_size_allocate {
3296 my ($self, $w, $h) = @_;
3297
3298 $self->{current}->configure (0, 0, $w, $h);
3299
3300 1
3301}
3302
3303sub _draw {
3304 my ($self) = @_;
3305
3306 $self->{current}->draw;
3307}
3308
3309#############################################################################
3310
3311package CFClient::UI::Notebook;
3312
3313our @ISA = CFClient::UI::VBox::;
3314
3315sub new {
3316 my $class = shift;
3317
3318 my $self = $class->SUPER::new (
3319 buttonbar => (new CFClient::UI::Buttonbar),
3320 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3321 # filter => # will be put between multiplexer and $self
3322 @_,
3323 );
3324
3325 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3326 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3327
3328 $self
3329}
3330
3331sub add {
3332 my ($self, $title, $widget, $tooltip) = @_;
3333
3334 Scalar::Util::weaken $self;
3335
3336 $self->{buttonbar}->add (new CFClient::UI::Button
3337 markup => $title,
3338 tooltip => $tooltip,
3339 on_activate => sub { $self->set_current_page ($widget) },
3340 );
3341
3342 $self->{multiplexer}->add ($widget);
3343}
3344
3345sub get_current_page {
3346 my ($self) = @_;
3347
3348 $self->{multiplexer}->get_current_page
3349}
3350
3351sub set_current_page {
3352 my ($self, $page) = @_;
3353
3354 $self->{multiplexer}->set_current_page ($page);
3355 $self->emit (page_changed => $self->{multiplexer}{current});
3356}
3357
3358#############################################################################
3359
3360package CFClient::UI::Combobox;
3361
3362use utf8;
3363
3364our @ISA = CFClient::UI::Button::;
3365
3366sub new {
3367 my $class = shift;
3368
3369 my $self = $class->SUPER::new (
3370 options => [], # [value, title, longdesc], ...
3371 value => undef,
3372 @_,
3373 );
3374
3375 $self->_set_value ($self->{value});
3376
3377 $self
3378}
3379
3380sub invoke_button_down {
3381 my ($self, $ev) = @_;
3382
3383 my @menu_items;
3384
3385 for (@{ $self->{options} }) {
3386 my ($value, $title, $tooltip) = @$_;
3387
3388 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3389 }
3390
3391 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3392}
3393
3394sub _set_value {
3395 my ($self, $value) = @_;
3396
3397 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3398 or return;
3399
3400 $self->{value} = $item->[0];
3401 $self->set_markup ("$item->[1] ⇓");
3402 $self->set_tooltip ($item->[2]);
3403}
3404
3405sub set_value {
3406 my ($self, $value) = @_;
3407
3408 return unless $self->{value} ne $value;
3409
3410 $self->_set_value ($value);
3411 $self->emit (changed => $value);
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::Statusbox;
3417
3418our @ISA = CFClient::UI::VBox::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (
2892 fontsize => 0.8, 3424 fontsize => 0.8,
2893 @_, 3425 @_,
2894 ) 3426 );
3427
3428 Scalar::Util::weaken (my $this = $self);
3429
3430 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3431
3432 $self
2895} 3433}
2896 3434
2897sub reorder { 3435sub reorder {
2898 my ($self) = @_; 3436 my ($self) = @_;
2899 my $NOW = time; 3437 my $NOW = Time::HiRes::time;
3438
3439 # freeze display when hovering over any label
3440 return if $CFClient::UI::TOOLTIP->{owner}
3441 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3442 values %{ $self->{item} };
2900 3443
2901 while (my ($k, $v) = each %{ $self->{item} }) { 3444 while (my ($k, $v) = each %{ $self->{item} }) {
2902 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3445 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2903 } 3446 }
2904 3447
… …
2907 my @items = sort { 3450 my @items = sort {
2908 $a->{pri} <=> $b->{pri} 3451 $a->{pri} <=> $b->{pri}
2909 or $b->{id} <=> $a->{id} 3452 or $b->{id} <=> $a->{id}
2910 } values %{ $self->{item} }; 3453 } values %{ $self->{item} };
2911 3454
3455 $self->{timer}->interval (1);
3456
2912 my $count = 10 + 1; 3457 my $count = 10 + 1;
2913 for my $item (@items) { 3458 for my $item (@items) {
2914 last unless --$count; 3459 last unless --$count;
2915 3460
2916 push @widgets, $item->{label} ||= do { 3461 my $label = $item->{label} ||= do {
2917 # TODO: doesn't handle markup well (read as: at all) 3462 # TODO: doesn't handle markup well (read as: at all)
2918 my $short = $item->{count} > 1 3463 my $short = $item->{count} > 1
2919 ? "<b>$item->{count} ×</b> $item->{text}" 3464 ? "<b>$item->{count} ×</b> $item->{text}"
2920 : $item->{text}; 3465 : $item->{text};
2921 3466
… …
2929 tooltip => $item->{tooltip}, 3474 tooltip => $item->{tooltip},
2930 tooltip_font => $::FONT_PROP, 3475 tooltip_font => $::FONT_PROP,
2931 tooltip_width => 0.67, 3476 tooltip_width => 0.67,
2932 fontsize => $item->{fontsize} || $self->{fontsize}, 3477 fontsize => $item->{fontsize} || $self->{fontsize},
2933 max_w => $::WIDTH * 0.44, 3478 max_w => $::WIDTH * 0.44,
2934 fg => $item->{fg}, 3479 fg => [@{ $item->{fg} }],
2935 can_events => 1, 3480 can_events => 1,
2936 can_hover => 1 3481 can_hover => 1
2937 }; 3482 };
3483
3484 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3485 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3486 $label->update;
3487 $label->set_max_size (undef, $label->{req_h} * $diff)
3488 if $diff < 1;
3489 $self->{timer}->interval (1/30);
3490 } else {
3491 $label->{fg}[3] = $item->{fg}[3] || 1;
3492 }
3493
3494 push @widgets, $label;
2938 } 3495 }
2939 3496
2940 $self->clear; 3497 $self->clear;
2941 $self->SUPER::add (reverse @widgets); 3498 $self->SUPER::add (reverse @widgets);
2942} 3499}
… …
2947 $text =~ s/^\s+//; 3504 $text =~ s/^\s+//;
2948 $text =~ s/\s+$//; 3505 $text =~ s/\s+$//;
2949 3506
2950 return unless $text; 3507 return unless $text;
2951 3508
2952 my $timeout = time + ((delete $arg{timeout}) || 60); 3509 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2953 3510
2954 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3511 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2955 3512
2956 if (my $item = $self->{item}{$group}) { 3513 if (my $item = $self->{item}{$group}) {
2957 if ($item->{text} eq $text) { 3514 if ($item->{text} eq $text) {
2958 $item->{count}++; 3515 $item->{count}++;
2959 } else { 3516 } else {
2960 $item->{count} = 1; 3517 $item->{count} = 1;
2961 $item->{text} = $item->{tooltip} = $text; 3518 $item->{text} = $item->{tooltip} = $text;
2962 } 3519 }
2963 $item->{id} = ++$self->{id}; 3520 $item->{id} += 0.2;#d#
2964 $item->{timeout} = $timeout; 3521 $item->{timeout} = $timeout;
2965 delete $item->{label}; 3522 delete $item->{label};
2966 } else { 3523 } else {
2967 $self->{item}{$group} = { 3524 $self->{item}{$group} = {
2968 id => ++$self->{id}, 3525 id => ++$self->{id},
… …
2974 count => 1, 3531 count => 1,
2975 %arg, 3532 %arg,
2976 }; 3533 };
2977 } 3534 }
2978 3535
3536 $ROOT->on_refresh (reorder => sub {
2979 $self->reorder; 3537 $self->reorder;
3538 });
2980} 3539}
2981 3540
2982sub reconfigure { 3541sub reconfigure {
2983 my ($self) = @_; 3542 my ($self) = @_;
2984 3543
… …
2987 3546
2988 $self->reorder; 3547 $self->reorder;
2989 $self->SUPER::reconfigure; 3548 $self->SUPER::reconfigure;
2990} 3549}
2991 3550
3551sub destroy {
3552 my ($self) = @_;
3553
3554 $self->{timer}->cancel;
3555
3556 $self->SUPER::destroy;
3557}
3558
2992############################################################################# 3559#############################################################################
2993 3560
3561package CFClient::UI::Inventory;
3562
3563our @ISA = CFClient::UI::Table::;
3564
3565sub new {
3566 my $class = shift;
3567
3568 my $self = $class->SUPER::new (
3569 col_expand => [0, 1, 0],
3570 items => [],
3571 @_,
3572 );
3573
3574 $self->set_sort_order (undef);
3575
3576 $self
3577}
3578
3579sub update_items {
3580 my ($self) = @_;
3581
3582 $self->clear;
3583
3584 my @item = $self->{sort}->(@{ $self->{items} });
3585
3586 my @adds;
3587 my $row = 0;
3588 for my $item ($self->{sort}->(@{ $self->{items} })) {
3589 CFClient::Item::update_widgets $item;
3590
3591 push @adds, 0, $row, $item->{face_widget};
3592 push @adds, 1, $row, $item->{desc_widget};
3593 push @adds, 2, $row, $item->{weight_widget};
3594
3595 $row++;
3596 }
3597
3598 $self->add (@adds);
3599}
3600
3601sub set_sort_order {
3602 my ($self, $order) = @_;
3603
3604 $self->{sort} = $order ||= sub {
3605 sort {
3606 $a->{type} <=> $b->{type}
3607 or $a->{name} cmp $b->{name}
3608 } @_
3609 };
3610
3611 $self->update_items;
3612}
3613
3614sub set_items {
3615 my ($self, $items) = @_;
3616
3617 $self->{items} = [$items ? values %$items : ()];
3618 $self->update_items;
3619}
3620
3621#############################################################################
3622
3623package CFClient::UI::SpellList;
3624
3625our @ISA = CFClient::UI::Table::;
3626
3627sub new {
3628 my $class = shift;
3629
3630 my $self = $class->SUPER::new (
3631 binding => [],
3632 commands => [],
3633 @_,
3634 )
3635}
3636
3637my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3638
3639my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3640 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3641my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3642 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3643my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3644 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3645my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3646 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3647my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3648 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3649
3650sub rebuild_spell_list {
3651 my ($self) = @_;
3652
3653 $CFClient::UI::ROOT->on_refresh ($self => sub {
3654 $self->clear;
3655
3656 return unless $::CONN;
3657
3658 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3659 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3660 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3661 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3662 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3663
3664 my $row = 0;
3665
3666 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3667 my $spell = $self->{spell}{$_};
3668
3669 $row++;
3670
3671 my $spell_cb = sub {
3672 my ($widget, $ev) = @_;
3673
3674 if ($ev->{button} == 1) {
3675 $::CONN->user_send ("cast $spell->{name}");
3676 } elsif ($ev->{button} == 2) {
3677 $::CONN->user_send ("invoke $spell->{name}");
3678 } elsif ($ev->{button} == 3) {
3679 (new CFClient::UI::Menu
3680 items => [
3681 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3682 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3683 ],
3684 )->popup ($ev);
3685 } else {
3686 return 0;
3687 }
3688
3689 1
3690 };
3691
3692 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3693
3694 #TODO: add path info to tooltip
3695 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3696
3697 $self->add (0, $row, new CFClient::UI::Face
3698 face => $spell->{face},
3699 can_hover => 1,
3700 can_events => 1,
3701 tooltip => $tooltip,
3702 on_button_down => $spell_cb,
3703 );
3704
3705 $self->add (1, $row, new CFClient::UI::Label
3706 expand => 1,
3707 text => $spell->{name},
3708 can_hover => 1,
3709 can_events => 1,
3710 tooltip => $tooltip,
3711 on_button_down => $spell_cb,
3712 );
3713
3714 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3715 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3716 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3717 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3718 }
3719 });
3720}
3721
3722sub add_spell {
3723 my ($self, $spell) = @_;
3724
3725 $self->{spell}->{$spell->{name}} = $spell;
3726 $self->rebuild_spell_list;
3727}
3728
3729sub remove_spell {
3730 my ($self, $spell) = @_;
3731
3732 delete $self->{spell}->{$spell->{name}};
3733 $self->rebuild_spell_list;
3734}
3735
3736sub clear_spells {
3737 my ($self) = @_;
3738
3739 $self->{spell} = {};
3740 $self->rebuild_spell_list;
3741}
3742
3743#############################################################################
3744
2994package CFClient::UI::Root; 3745package CFClient::UI::Root;
2995 3746
2996our @ISA = CFClient::UI::Container::; 3747our @ISA = CFClient::UI::Container::;
3748
3749use List::Util qw(min max);
2997 3750
2998use CFClient::OpenGL; 3751use CFClient::OpenGL;
2999 3752
3000sub new { 3753sub new {
3001 my $class = shift; 3754 my $class = shift;
… …
3008 Scalar::Util::weaken ($self->{root} = $self); 3761 Scalar::Util::weaken ($self->{root} = $self);
3009 3762
3010 $self 3763 $self
3011} 3764}
3012 3765
3013sub configure {
3014 my ($self, $x, $y, $w, $h) = @_;
3015
3016 $self->{w} = $w;
3017 $self->{h} = $h;
3018}
3019
3020sub reconfigure {
3021 my ($self) = @_;
3022
3023 $self->SUPER::reconfigure;
3024
3025 $self->size_allocate ($self->{w}, $self->{h}, 1)
3026 if $self->{w};
3027}
3028
3029sub size_request { 3766sub size_request {
3030 my ($self) = @_; 3767 my ($self) = @_;
3031 3768
3032 ($self->{w}, $self->{h}) 3769 ($self->{w}, $self->{h})
3033} 3770}
… …
3044 $coord = $max - $size if $coord > $max - $size; 3781 $coord = $max - $size if $coord > $max - $size;
3045 3782
3046 int $coord + 0.5 3783 int $coord + 0.5
3047} 3784}
3048 3785
3049sub size_allocate { 3786sub invoke_size_allocate {
3050 my ($self, $w, $h, $changed) = @_; 3787 my ($self, $w, $h) = @_;
3051 3788
3052 for my $child ($self->children) { 3789 for my $child ($self->children) {
3053 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3790 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3054 3791
3055 $X = $child->{force_x} if exists $child->{force_x}; 3792 $X = $child->{force_x} if exists $child->{force_x};
… …
3058 $X = _to_pixel $X, $W, $self->{w}; 3795 $X = _to_pixel $X, $W, $self->{w};
3059 $Y = _to_pixel $Y, $H, $self->{h}; 3796 $Y = _to_pixel $Y, $H, $self->{h};
3060 3797
3061 $child->configure ($X, $Y, $W, $H); 3798 $child->configure ($X, $Y, $W, $H);
3062 } 3799 }
3800
3801 1
3063} 3802}
3064 3803
3065sub coord2local { 3804sub coord2local {
3066 my ($self, $x, $y) = @_; 3805 my ($self, $x, $y) = @_;
3067 3806
… …
3123 $_->() 3862 $_->()
3124 for values %{delete $self->{refresh_hook}}; 3863 for values %{delete $self->{refresh_hook}};
3125 } 3864 }
3126 3865
3127 if ($self->{realloc}) { 3866 if ($self->{realloc}) {
3867 my %queue;
3128 my @queue; 3868 my @queue;
3869 my $widget;
3129 3870
3871 outer:
3130 while () { 3872 while () {
3131 if ($self->{realloc}) { 3873 if (my $realloc = delete $self->{realloc}) {
3132 #TODO use array-of-depth approach 3874 for $widget (values %$realloc) {
3875 $widget->{visible} or next; # do not resize invisible widgets
3133 3876
3134 @queue = sort { $a->{visible} <=> $b->{visible} } 3877 $queue{$widget+0}++ and next; # duplicates are common
3135 @queue, values %{delete $self->{realloc}}; 3878
3879 push @{ $queue[$widget->{visible}] }, $widget;
3880 }
3136 } 3881 }
3137 3882
3883 while () {
3884 @queue or last outer;
3885
3138 my $widget = pop @queue || last; 3886 $widget = pop @{ $queue[-1] || [] }
3887 and last;
3888
3889 pop @queue;
3890 }
3139 3891
3140 $widget->{visible} or last; # do not resize invisible widgets 3892 delete $queue{$widget+0};
3141 3893
3142 my ($w, $h) = $widget->size_request; 3894 my ($w, $h) = $widget->size_request;
3143 3895
3144 my $min_size = $widget->{is_toplevel} ? 16 : 0; 3896 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3897 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3145 3898
3146 $w = List::Util::max $widget->{min_w} || $widget->{is_toplevel} * 16, $w; 3899 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3147 $h = List::Util::max $widget->{min_h} || $widget->{is_toplevel} * 16, $h; 3900 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3148 3901
3149 $w = $widget->{force_w} if exists $widget->{force_w}; 3902 $w = $widget->{force_w} if exists $widget->{force_w};
3150 $h = $widget->{force_h} if exists $widget->{force_h}; 3903 $h = $widget->{force_h} if exists $widget->{force_h};
3151 3904
3905 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3906 || delete $widget->{force_realloc}) {
3152 $widget->{req_w} = $w; 3907 $widget->{req_w} = $w;
3153 $widget->{req_h} = $h; 3908 $widget->{req_h} = $h;
3154 3909
3155 $self->{size_alloc}{$widget} = [$widget, undef, undef]; 3910 $self->{size_alloc}{$widget+0} = $widget;
3156 3911
3157 push @queue, $widget->{parent} 3912 if (my $parent = $widget->{parent}) {
3158 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent}; 3913 $self->{realloc}{$parent+0} = $parent
3914 unless $queue{$parent+0};
3915
3916 $parent->{force_size_alloc} = 1;
3917 $self->{size_alloc}{$parent+0} = $parent;
3918 }
3919 }
3920
3921 delete $self->{realloc}{$widget+0};
3159 } 3922 }
3160 } 3923 }
3161 3924
3162 while (my $size_alloc = delete $self->{size_alloc}) { 3925 while (my $size_alloc = delete $self->{size_alloc}) {
3163 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3926 my @queue = sort { $b->{visible} <=> $a->{visible} }
3164 values %$size_alloc; 3927 values %$size_alloc;
3165 3928
3166 while () { 3929 while () {
3167 my ($widget, $w, $h) = @{ pop @queue or last }; 3930 my $widget = pop @queue || last;
3168 3931
3169 $w = $widget->{w} || $widget->{req_w} unless defined $w; 3932 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3170 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3171 3933
3172 $w = 0 if $w < 0; 3934 $w = 0 if $w < 0;
3173 $h = 0 if $h < 0; 3935 $h = 0 if $h < 0;
3174 3936
3937 $w = max $widget->{min_w}, $w;
3938 $h = max $widget->{min_h}, $h;
3939
3940 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3941 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3942
3175 $w = int $w + 0.5; 3943 $w = int $w + 0.5;
3176 $h = int $h + 0.5; 3944 $h = int $h + 0.5;
3177 3945
3178 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3946 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3947 $widget->{old_w} = $widget->{w};
3948 $widget->{old_h} = $widget->{h};
3179 3949
3180 $widget->{w} = $w; 3950 $widget->{w} = $w;
3181 $widget->{h} = $h; 3951 $widget->{h} = $h;
3182 3952
3183 $widget->emit (size_allocate => $w, $h, $changed); 3953 $widget->emit (size_allocate => $w, $h);
3954 }
3184 } 3955 }
3185 } 3956 }
3186 3957
3187 while ($self->{post_alloc_hook}) { 3958 while ($self->{post_alloc_hook}) {
3188 $_->() 3959 $_->()
3189 for values %{delete $self->{post_alloc_hook}}; 3960 for values %{delete $self->{post_alloc_hook}};
3190 } 3961 }
3962
3191 3963
3192 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3964 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3193 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3965 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3194 glClear GL_COLOR_BUFFER_BIT; 3966 glClear GL_COLOR_BUFFER_BIT;
3195 3967
… …
3197 glLoadIdentity; 3969 glLoadIdentity;
3198 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3970 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3199 glMatrixMode GL_MODELVIEW; 3971 glMatrixMode GL_MODELVIEW;
3200 glLoadIdentity; 3972 glLoadIdentity;
3201 3973
3974 {
3975 package CFClient::UI::Base;
3976
3977 ($draw_x, $draw_y, $draw_w, $draw_h) =
3978 (0, 0, $self->{w}, $self->{h});
3979 }
3980
3202 $self->_draw; 3981 $self->_draw;
3203} 3982}
3204 3983
3205############################################################################# 3984#############################################################################
3206 3985

Diff Legend

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