ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.256 by root, Tue May 30 01:42:16 2006 UTC vs.
Revision 1.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 is_toplevel => 1,
1032 can_events => 1, 1153 can_events => 1,
1033 @_ 1154 min_w => 64,
1155 min_h => 32,
1156 %arg,
1034 ); 1157 );
1035 1158
1036 $self->{title} &&= new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
1037 align => 0, 1160 align => 0,
1038 valign => 1, 1161 valign => 1,
1039 text => $self->{title}, 1162 text => $self->{title},
1040 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 }
1041 1174
1042 $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};
1043} 1184}
1044 1185
1045sub border { 1186sub border {
1046 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
1047} 1188}
1048 1189
1049sub size_request { 1190sub size_request {
1050 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};
1051 1198
1052 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
1053 1200
1054 ( 1201 (
1055 $w + $self->border * 2, 1202 $w + $self->border * 2,
1056 $h + $self->border * 2, 1203 $h + $self->border * 2,
1057 ) 1204 )
1058} 1205}
1059 1206
1060sub size_allocate { 1207sub invoke_size_allocate {
1061 my ($self, $w, $h, $changed) = @_; 1208 my ($self, $w, $h) = @_;
1062 1209
1063 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 }
1064 1215
1216 my $border = $self->border;
1217
1065 $h -= List::Util::max 0, $self->border * 2; 1218 $h -= List::Util::max 0, $border * 2;
1066 $w -= List::Util::max 0, $self->border * 2; 1219 $w -= List::Util::max 0, $border * 2;
1067 1220
1068 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1069 if $self->{title};
1070
1071 $self->child->configure ($self->border, $self->border, $w, $h); 1221 $self->child->configure ($border, $border, $w, $h);
1072}
1073 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
1074sub button_down { 1237sub invoke_button_down {
1075 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
1076 1239
1077 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1078 my $border = $self->border; 1241 my $border = $self->border;
1079 1242
… …
1095 my $dy = $ev->{y} - $oy; 1258 my $dy = $ev->{y} - $oy;
1096 1259
1097 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1260 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1098 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1261 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1099 1262
1263 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1100 $self->realloc; 1264 $self->realloc;
1101 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1102 }; 1265 };
1103 1266
1104 } elsif ($lr ^ $td) { 1267 } elsif ($lr ^ $td) {
1105 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1268 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1106 my ($bx, $by) = ($self->{x}, $self->{y}); 1269 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1109 my ($ev, $x, $y) = @_; 1272 my ($ev, $x, $y) = @_;
1110 1273
1111 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
1112 1275
1113 $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});
1114 }; 1279 };
1280 } else {
1281 return 0;
1282 }
1283
1115 } 1284 1
1116} 1285}
1117 1286
1118sub button_up { 1287sub invoke_button_up {
1119 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
1120 1289
1121 delete $self->{motion}; 1290 ! ! delete $self->{motion}
1122} 1291}
1123 1292
1124sub mouse_motion { 1293sub invoke_mouse_motion {
1125 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
1126 1295
1127 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1297
1298 ! ! $self->{motion}
1128} 1299}
1129 1300
1130sub _draw { 1301sub _draw {
1131 my ($self) = @_; 1302 my ($self) = @_;
1132 1303
1304 my $child = $self->{children}[0];
1305
1133 my ($w, $h ) = ($self->{w}, $self->{h}); 1306 my ($w, $h ) = ($self->{w}, $self->{h});
1134 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1307 my ($cw, $ch) = ($child->{w}, $child->{h});
1135 1308
1136 glEnable GL_TEXTURE_2D; 1309 glEnable GL_TEXTURE_2D;
1137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1310 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1138 1311
1139 my $border = $self->border; 1312 my $border = $self->border;
… …
1154 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1327 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1155 } 1328 }
1156 1329
1157 glDisable GL_TEXTURE_2D; 1330 glDisable GL_TEXTURE_2D;
1158 1331
1159 $self->{title}->draw if $self->{title};
1160
1161 $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};
1162} 1343}
1163 1344
1164############################################################################# 1345#############################################################################
1165 1346
1166package CFClient::UI::Table; 1347package CFClient::UI::Table;
… …
1183sub children { 1364sub children {
1184 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1185} 1366}
1186 1367
1187sub add { 1368sub add {
1188 my ($self, $x, $y, $child) = @_; 1369 my ($self) = shift;
1189 1370
1371 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, ();
1190 $child->set_parent ($self); 1373 $child->set_parent ($self);
1191 $self->{children}[$y][$x] = $child; 1374 $self->{children}[$y][$x] = $child;
1375 }
1192 1376
1377 $self->{force_realloc} = 1;
1378 $self->{force_size_alloc} = 1;
1193 $self->realloc; 1379 $self->realloc;
1380}
1381
1382sub remove {
1383 my ($self, $child) = @_;
1384
1385 # TODO: not yet implemented
1194} 1386}
1195 1387
1196# 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?
1197sub clear { 1389sub clear {
1198 my ($self) = @_; 1390 my ($self) = @_;
… …
1239 (sum @$ws), 1431 (sum @$ws),
1240 (sum @$hs), 1432 (sum @$hs),
1241 ) 1433 )
1242} 1434}
1243 1435
1244sub size_allocate { 1436sub invoke_size_allocate {
1245 my ($self, $w, $h, $changed) = @_; 1437 my ($self, $w, $h) = @_;
1246 1438
1247 my ($ws, $hs) = $self->get_wh; 1439 my ($ws, $hs) = $self->get_wh;
1248 1440
1249 my $req_w = (sum @$ws) || 1; 1441 my $req_w = (sum @$ws) || 1;
1250 my $req_h = (sum @$hs) || 1; 1442 my $req_h = (sum @$hs) || 1;
… …
1281 } 1473 }
1282 1474
1283 $y += $row_h; 1475 $y += $row_h;
1284 } 1476 }
1285 1477
1478 1
1286} 1479}
1287 1480
1288sub find_widget { 1481sub find_widget {
1289 my ($self, $x, $y) = @_; 1482 my ($self, $x, $y) = @_;
1290 1483
… …
1327 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1520 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1521 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 ) 1522 )
1330} 1523}
1331 1524
1332sub size_allocate { 1525sub invoke_size_allocate {
1333 my ($self, $w, $h, $changed) = @_; 1526 my ($self, $w, $h) = @_;
1334 1527
1335 my $space = $self->{vertical} ? $h : $w; 1528 my $space = $self->{vertical} ? $h : $w;
1336 my $children = $self->{children}; 1529 my @children = $self->visible_children;
1337 1530
1338 my @req; 1531 my @req;
1339 1532
1340 if ($self->{homogeneous}) { 1533 if ($self->{homogeneous}) {
1341 @req = ($space / (@$children || 1)) x @$children; 1534 @req = ($space / (@children || 1)) x @children;
1342 } else { 1535 } else {
1343 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1536 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1344 my $req = List::Util::sum @req; 1537 my $req = List::Util::sum @req;
1345 1538
1346 if ($req > $space) { 1539 if ($req > $space) {
1347 # ah well, not enough space 1540 # ah well, not enough space
1348 $_ *= $space / $req for @req; 1541 $_ *= $space / $req for @req;
1349 } else { 1542 } else {
1350 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1543 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1351 1544
1352 $space = ($space - $req) / $expand; # remaining space to give away 1545 $space = ($space - $req) / $expand; # remaining space to give away
1353 1546
1354 $req[$_] += $space * $children->[$_]{expand} 1547 $req[$_] += $space * $children[$_]{expand}
1355 for 0 .. $#$children; 1548 for 0 .. $#children;
1356 } 1549 }
1357 } 1550 }
1358 1551
1359 CFClient::UI::harmonize \@req; 1552 CFClient::UI::harmonize \@req;
1360 1553
1361 my $pos = 0; 1554 my $pos = 0;
1362 for (0 .. $#$children) { 1555 for (0 .. $#children) {
1363 my $alloc = $req[$_]; 1556 my $alloc = $req[$_];
1364 $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));
1365 1558
1366 $pos += $alloc; 1559 $pos += $alloc;
1367 } 1560 }
1368 1561
1369 1 1562 1
… …
1421 ellipsise => 3, # end 1614 ellipsise => 3, # end
1422 layout => (new CFClient::Layout), 1615 layout => (new CFClient::Layout),
1423 fontsize => 1, 1616 fontsize => 1,
1424 align => -1, 1617 align => -1,
1425 valign => -1, 1618 valign => -1,
1426 padding => 2, 1619 padding_x => 2,
1620 padding_y => 2,
1427 can_events => 0, 1621 can_events => 0,
1428 %arg 1622 %arg
1429 ); 1623 );
1430 1624
1431 if (exists $self->{template}) { 1625 if (exists $self->{template}) {
… …
1458 1652
1459 delete $self->{texture}; 1653 delete $self->{texture};
1460 $self->SUPER::update; 1654 $self->SUPER::update;
1461} 1655}
1462 1656
1657sub realloc {
1658 my ($self) = @_;
1659
1660 delete $self->{ox};
1661 $self->SUPER::realloc;
1662}
1663
1463sub set_text { 1664sub set_text {
1464 my ($self, $text) = @_; 1665 my ($self, $text) = @_;
1465 1666
1466 return if $self->{text} eq "T$text"; 1667 return if $self->{text} eq "T$text";
1467 $self->{text} = "T$text"; 1668 $self->{text} = "T$text";
1468 1669
1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1470 $self->{layout}->set_text ($text); 1670 $self->{layout}->set_text ($text);
1471 1671
1672 delete $self->{size_req};
1472 $self->realloc; 1673 $self->realloc;
1473 $self->update; 1674 $self->update;
1474} 1675}
1475 1676
1476sub set_markup { 1677sub set_markup {
… …
1479 return if $self->{text} eq "M$markup"; 1680 return if $self->{text} eq "M$markup";
1480 $self->{text} = "M$markup"; 1681 $self->{text} = "M$markup";
1481 1682
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1683 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1684
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485 $self->{layout}->set_markup ($markup); 1685 $self->{layout}->set_markup ($markup);
1486 1686
1687 delete $self->{size_req};
1487 $self->realloc; 1688 $self->realloc;
1488 $self->update; 1689 $self->update;
1489} 1690}
1490 1691
1491sub size_request { 1692sub size_request {
1492 my ($self) = @_; 1693 my ($self) = @_;
1493 1694
1695 $self->{size_req} ||= do {
1494 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1696 $self->{layout}->set_font ($self->{font}) if $self->{font};
1495 $self->{layout}->set_width ($self->{max_w} || -1); 1697 $self->{layout}->set_width ($self->{max_w} || -1);
1496 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1698 $self->{layout}->set_ellipsise ($self->{ellipsise});
1497 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1699 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1498 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1700 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1499 1701
1500 my ($w, $h) = $self->{layout}->size; 1702 my ($w, $h) = $self->{layout}->size;
1501 1703
1502 if (exists $self->{template}) { 1704 if (exists $self->{template}) {
1503 $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);
1504 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1707 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1505 1708
1506 my ($w2, $h2) = $self->{template}->size; 1709 my ($w2, $h2) = $self->{template}->size;
1507 1710
1508 $w = List::Util::max $w, $w2; 1711 $w = List::Util::max $w, $w2;
1509 $h = List::Util::max $h, $h2; 1712 $h = List::Util::max $h, $h2;
1713 }
1714
1715 [$w, $h]
1510 } 1716 };
1511 1717
1512 ( 1718 @{ $self->{size_req} }
1513 $w + $self->{padding} * 2,
1514 $h + $self->{padding} * 2,
1515 )
1516} 1719}
1517 1720
1721sub baseline_shift {
1722 $_[0]{layout}->descent
1723}
1724
1518sub size_allocate { 1725sub invoke_size_allocate {
1519 my ($self, $w, $h, $changed) = @_; 1726 my ($self, $w, $h) = @_;
1727
1728 delete $self->{ox};
1520 1729
1521 delete $self->{texture} 1730 delete $self->{texture}
1522 if $changed; 1731 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1732
1733 1
1523} 1734}
1524 1735
1525sub set_fontsize { 1736sub set_fontsize {
1526 my ($self, $fontsize) = @_; 1737 my ($self, $fontsize) = @_;
1527 1738
1528 $self->{fontsize} = $fontsize; 1739 $self->{fontsize} = $fontsize;
1740 delete $self->{size_req};
1529 delete $self->{texture}; 1741 delete $self->{texture};
1530 1742
1531 $self->realloc; 1743 $self->realloc;
1532} 1744}
1533 1745
1746sub reconfigure {
1747 my ($self) = @_;
1748
1749 delete $self->{size_req};
1750 delete $self->{texture};
1751
1752 $self->SUPER::reconfigure;
1753}
1754
1534sub _draw { 1755sub _draw {
1535 my ($self) = @_; 1756 my ($self) = @_;
1536 1757
1537 $self->SUPER::_draw; # draw background, if applicable 1758 $self->SUPER::_draw; # draw background, if applicable
1538 1759
1539 my $tex = $self->{texture} ||= do { 1760 my $size = $self->{texture} ||= do {
1540 $self->{layout}->set_foreground (@{$self->{fg}}); 1761 $self->{layout}->set_foreground (@{$self->{fg}});
1541 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1762 $self->{layout}->set_font ($self->{font}) if $self->{font};
1542 $self->{layout}->set_width ($self->{w}); 1763 $self->{layout}->set_width ($self->{w});
1543 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1764 $self->{layout}->set_ellipsise ($self->{ellipsise});
1544 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1765 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1766 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546 1767
1547 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1768 [$self->{layout}->size]
1548
1549 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1550 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1551 : ($self->{w} - $tex->{w}) * 0.5);
1552
1553 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1554 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1555 : ($self->{h} - $tex->{h}) * 0.5);
1556
1557 $tex
1558 }; 1769 };
1559 1770
1560 glEnable GL_TEXTURE_2D; 1771 unless (exists $self->{ox}) {
1561 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);
1562 1775
1563 if ($tex->{format} == GL_ALPHA) { 1776 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1564 glColor @{$self->{fg}}; 1777 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1565 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1778 : ($self->{h} - $size->[1]) * 0.5);
1566 } else {
1567 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1568 } 1779 };
1569 1780
1570 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});
1571} 1785}
1572 1786
1573############################################################################# 1787#############################################################################
1574 1788
1575package CFClient::UI::EntryBase; 1789package CFClient::UI::EntryBase;
… …
1589 can_hover => 1, 1803 can_hover => 1,
1590 can_focus => 1, 1804 can_focus => 1,
1591 valign => 0, 1805 valign => 0,
1592 can_events => 1, 1806 can_events => 1,
1593 #text => ... 1807 #text => ...
1808 #hidden => "*",
1594 @_ 1809 @_
1595 ) 1810 )
1596} 1811}
1597 1812
1598sub _set_text { 1813sub _set_text {
… …
1600 1815
1601 delete $self->{cur_h}; 1816 delete $self->{cur_h};
1602 1817
1603 return if $self->{text} eq $text; 1818 return if $self->{text} eq $text;
1604 1819
1605 delete $self->{texture};
1606
1607 $self->{last_activity} = $::NOW; 1820 $self->{last_activity} = $::NOW;
1608 $self->{text} = $text; 1821 $self->{text} = $text;
1609 1822
1610 $text =~ s/./*/g if $self->{hidden}; 1823 $text =~ s/./*/g if $self->{hidden};
1611 $self->{layout}->set_text ("$text "); 1824 $self->{layout}->set_text ("$text ");
1825 delete $self->{size_req};
1612 1826
1613 $self->_emit (changed => $self->{text}); 1827 $self->emit (changed => $self->{text});
1828
1829 $self->realloc;
1830 $self->update;
1614} 1831}
1615 1832
1616sub set_text { 1833sub set_text {
1617 my ($self, $text) = @_; 1834 my ($self, $text) = @_;
1618 1835
1619 $self->{cursor} = length $text; 1836 $self->{cursor} = length $text;
1620 $self->_set_text ($text); 1837 $self->_set_text ($text);
1621
1622 $self->realloc;
1623} 1838}
1624 1839
1625sub get_text { 1840sub get_text {
1626 $_[0]{text} 1841 $_[0]{text}
1627} 1842}
… …
1632 my ($w, $h) = $self->SUPER::size_request; 1847 my ($w, $h) = $self->SUPER::size_request;
1633 1848
1634 ($w + 1, $h) # add 1 for cursor 1849 ($w + 1, $h) # add 1 for cursor
1635} 1850}
1636 1851
1637sub key_down { 1852sub invoke_key_down {
1638 my ($self, $ev) = @_; 1853 my ($self, $ev) = @_;
1639 1854
1640 my $mod = $ev->{mod}; 1855 my $mod = $ev->{mod};
1641 my $sym = $ev->{sym}; 1856 my $sym = $ev->{sym};
1642 my $uni = $ev->{unicode}; 1857 my $uni = $ev->{unicode};
… …
1654 } elsif ($sym == CFClient::SDLK_HOME) { 1869 } elsif ($sym == CFClient::SDLK_HOME) {
1655 $self->{cursor} = 0; 1870 $self->{cursor} = 0;
1656 } elsif ($sym == CFClient::SDLK_END) { 1871 } elsif ($sym == CFClient::SDLK_END) {
1657 $self->{cursor} = length $text; 1872 $self->{cursor} = length $text;
1658 } elsif ($uni == 27) { 1873 } elsif ($uni == 27) {
1659 $self->_emit ('escape'); 1874 $self->emit ('escape');
1660 } elsif ($uni) { 1875 } elsif ($uni) {
1661 substr $text, $self->{cursor}++, 0, chr $uni; 1876 substr $text, $self->{cursor}++, 0, chr $uni;
1877 } else {
1878 return 0;
1662 } 1879 }
1663 1880
1664 $self->_set_text ($text); 1881 $self->_set_text ($text);
1665 1882
1666 $self->realloc; 1883 $self->realloc;
1667}
1668 1884
1885 1
1886}
1887
1669sub focus_in { 1888sub invoke_focus_in {
1670 my ($self) = @_; 1889 my ($self) = @_;
1671 1890
1672 $self->{last_activity} = $::NOW; 1891 $self->{last_activity} = $::NOW;
1673 1892
1674 $self->SUPER::focus_in; 1893 $self->SUPER::invoke_focus_in
1675} 1894}
1676 1895
1677sub button_down { 1896sub invoke_button_down {
1678 my ($self, $ev, $x, $y) = @_; 1897 my ($self, $ev, $x, $y) = @_;
1679 1898
1680 $self->SUPER::button_down ($ev, $x, $y); 1899 $self->SUPER::invoke_button_down ($ev, $x, $y);
1681 1900
1682 my $idx = $self->{layout}->xy_to_index ($x, $y); 1901 my $idx = $self->{layout}->xy_to_index ($x, $y);
1683 1902
1684 # byte-index to char-index 1903 # byte-index to char-index
1685 my $text = $self->{text}; 1904 my $text = $self->{text};
1686 utf8::encode $text; 1905 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1687 $self->{cursor} = length substr $text, 0, $idx; 1906 $self->{cursor} = length $text;
1688 1907
1689 $self->_set_text ($self->{text}); 1908 $self->_set_text ($self->{text});
1690 $self->update; 1909 $self->update;
1910
1911 1
1691} 1912}
1692 1913
1693sub mouse_motion { 1914sub invoke_mouse_motion {
1694 my ($self, $ev, $x, $y) = @_; 1915 my ($self, $ev, $x, $y) = @_;
1695# 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
1696} 1919}
1697 1920
1698sub _draw { 1921sub _draw {
1699 my ($self) = @_; 1922 my ($self) = @_;
1700 1923
1701 local $self->{fg} = $self->{fg}; 1924 local $self->{fg} = $self->{fg};
1702 1925
1703 if ($FOCUS == $self) { 1926 if ($FOCUS == $self) {
1704 glColor @{$self->{active_bg}}; 1927 glColor_premultiply @{$self->{active_bg}};
1705 $self->{fg} = $self->{active_fg}; 1928 $self->{fg} = $self->{active_fg};
1706 } else { 1929 } else {
1707 glColor @{$self->{bg}}; 1930 glColor_premultiply @{$self->{bg}};
1708 } 1931 }
1709 1932
1710 glEnable GL_BLEND; 1933 glEnable GL_BLEND;
1711 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1934 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1712 glBegin GL_QUADS; 1935 glBegin GL_QUADS;
1713 glVertex 0 , 0; 1936 glVertex 0 , 0;
1714 glVertex 0 , $self->{h}; 1937 glVertex 0 , $self->{h};
1715 glVertex $self->{w}, $self->{h}; 1938 glVertex $self->{w}, $self->{h};
1716 glVertex $self->{w}, 0; 1939 glVertex $self->{w}, 0;
… …
1741 1964
1742our @ISA = CFClient::UI::EntryBase::; 1965our @ISA = CFClient::UI::EntryBase::;
1743 1966
1744use CFClient::OpenGL; 1967use CFClient::OpenGL;
1745 1968
1746sub key_down { 1969sub invoke_key_down {
1747 my ($self, $ev) = @_; 1970 my ($self, $ev) = @_;
1748 1971
1749 my $sym = $ev->{sym}; 1972 my $sym = $ev->{sym};
1750 1973
1751 if ($sym == 13) { 1974 if ($sym == 13) {
1752 unshift @{$self->{history}}, 1975 unshift @{$self->{history}},
1753 my $txt = $self->get_text; 1976 my $txt = $self->get_text;
1977
1754 $self->{history_pointer} = -1; 1978 $self->{history_pointer} = -1;
1755 $self->{history_saveback} = ''; 1979 $self->{history_saveback} = '';
1756 $self->_emit (activate => $txt); 1980 $self->emit (activate => $txt);
1757 $self->update; 1981 $self->update;
1758 1982
1759 } elsif ($sym == CFClient::SDLK_UP) { 1983 } elsif ($sym == CFClient::SDLK_UP) {
1760 if ($self->{history_pointer} < 0) { 1984 if ($self->{history_pointer} < 0) {
1761 $self->{history_saveback} = $self->get_text; 1985 $self->{history_saveback} = $self->get_text;
… …
1777 } else { 2001 } else {
1778 $self->set_text ($self->{history_saveback}); 2002 $self->set_text ($self->{history_saveback});
1779 } 2003 }
1780 2004
1781 } else { 2005 } else {
1782 $self->SUPER::key_down ($ev); 2006 return $self->SUPER::invoke_key_down ($ev)
2007 }
2008
1783 } 2009 1
1784
1785} 2010}
1786 2011
1787############################################################################# 2012#############################################################################
1788 2013
1789package CFClient::UI::Button; 2014package CFClient::UI::Button;
… …
1798 2023
1799sub new { 2024sub new {
1800 my $class = shift; 2025 my $class = shift;
1801 2026
1802 $class->SUPER::new ( 2027 $class->SUPER::new (
1803 padding => 4, 2028 padding_x => 4,
2029 padding_y => 4,
1804 fg => [1, 1, 1], 2030 fg => [1, 1, 1],
1805 active_fg => [0, 0, 1], 2031 active_fg => [0, 0, 1],
1806 can_hover => 1, 2032 can_hover => 1,
1807 align => 0, 2033 align => 0,
1808 valign => 0, 2034 valign => 0,
1809 can_events => 1, 2035 can_events => 1,
1810 @_ 2036 @_
1811 ) 2037 )
1812} 2038}
1813 2039
1814sub activate { }
1815
1816sub button_up { 2040sub invoke_button_up {
1817 my ($self, $ev, $x, $y) = @_; 2041 my ($self, $ev, $x, $y) = @_;
1818 2042
1819 $self->emit ("activate") 2043 $self->emit ("activate")
1820 if $x >= 0 && $x < $self->{w} 2044 if $x >= 0 && $x < $self->{w}
1821 && $y >= 0 && $y < $self->{h}; 2045 && $y >= 0 && $y < $self->{h};
2046
2047 1
1822} 2048}
1823 2049
1824sub _draw { 2050sub _draw {
1825 my ($self) = @_; 2051 my ($self) = @_;
1826 2052
1827 local $self->{fg} = $self->{fg}; 2053 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1828
1829 if ($GRAB == $self) {
1830 $self->{fg} = $self->{active_fg};
1831 }
1832 2054
1833 glEnable GL_TEXTURE_2D; 2055 glEnable GL_TEXTURE_2D;
1834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2056 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1835 glColor 0, 0, 0, 1; 2057 glColor 0, 0, 0, 1;
1836 2058
… …
1841 $self->SUPER::_draw; 2063 $self->SUPER::_draw;
1842} 2064}
1843 2065
1844############################################################################# 2066#############################################################################
1845 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
1846package CFClient::UI::CheckBox; 2104package CFClient::UI::CheckBox;
1847 2105
1848our @ISA = CFClient::UI::DrawBG::; 2106our @ISA = CFClient::UI::DrawBG::;
1849 2107
1850my @tex = 2108my @tex =
… …
1855 2113
1856sub new { 2114sub new {
1857 my $class = shift; 2115 my $class = shift;
1858 2116
1859 $class->SUPER::new ( 2117 $class->SUPER::new (
1860 padding => 2, 2118 padding_x => 2,
2119 padding_y => 2,
1861 fg => [1, 1, 1], 2120 fg => [1, 1, 1],
1862 active_fg => [1, 1, 0], 2121 active_fg => [1, 1, 0],
1863 bg => [0, 0, 0, 0.2], 2122 bg => [0, 0, 0, 0.2],
1864 active_bg => [1, 1, 1, 0.5], 2123 active_bg => [1, 1, 1, 0.5],
1865 state => 0, 2124 state => 0,
… …
1869} 2128}
1870 2129
1871sub size_request { 2130sub size_request {
1872 my ($self) = @_; 2131 my ($self) = @_;
1873 2132
1874 ($self->{padding} * 2 + 6) x 2 2133 (6) x 2
1875} 2134}
1876 2135
2136sub toggle {
2137 my ($self) = @_;
2138
2139 $self->{state} = !$self->{state};
2140 $self->emit (changed => $self->{state});
2141 $self->update;
2142}
2143
1877sub button_down { 2144sub invoke_button_down {
1878 my ($self, $ev, $x, $y) = @_; 2145 my ($self, $ev, $x, $y) = @_;
1879 2146
1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2147 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2148 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882 $self->{state} = !$self->{state}; 2149 $self->toggle;
1883 $self->_emit (changed => $self->{state}); 2150 } else {
2151 return 0
2152 }
2153
1884 } 2154 1
1885} 2155}
1886 2156
1887sub _draw { 2157sub _draw {
1888 my ($self) = @_; 2158 my ($self) = @_;
1889 2159
1890 $self->SUPER::_draw; 2160 $self->SUPER::_draw;
1891 2161
1892 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2162 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893 2163
1894 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;
1895 2167
1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2168 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897 2169
1898 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2170 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899 2171
… …
1907package CFClient::UI::Image; 2179package CFClient::UI::Image;
1908 2180
1909our @ISA = CFClient::UI::Base::; 2181our @ISA = CFClient::UI::Base::;
1910 2182
1911use CFClient::OpenGL; 2183use CFClient::OpenGL;
1912use Carp qw/confess/;
1913 2184
1914our %loaded_images; 2185our %texture_cache;
1915 2186
1916sub new { 2187sub new {
1917 my $class = shift; 2188 my $class = shift;
1918 2189
1919 my $self = $class->SUPER::new (can_events => 0, @_); 2190 my $self = $class->SUPER::new (
2191 can_events => 0,
2192 @_,
2193 );
1920 2194
1921 $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";
1922 2197
1923 $loaded_images{$self->{image}} ||= 2198 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1924 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;
1925 2200
1926 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2201 Scalar::Util::weaken $texture_cache{$self->{path}};
1927 2202
1928 Scalar::Util::weaken $loaded_images{$self->{image}}; 2203 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1929
1930 $self->{aspect} = $tex->{w} / $tex->{h};
1931 2204
1932 $self 2205 $self
1933} 2206}
1934 2207
1935sub size_request { 2208sub size_request {
1936 my ($self) = @_; 2209 my ($self) = @_;
1937 2210
1938 ($self->{tex}->{w}, $self->{tex}->{h}) 2211 ($self->{tex}{w}, $self->{tex}{h})
1939} 2212}
1940 2213
1941sub _draw { 2214sub _draw {
1942 my ($self) = @_; 2215 my ($self) = @_;
1943 2216
… …
2052 my $ycut1 = max 0, min 1, $ycut; 2325 my $ycut1 = max 0, min 1, $ycut;
2053 my $ycut2 = max 0, min 1, $ycut - 1; 2326 my $ycut2 = max 0, min 1, $ycut - 1;
2054 2327
2055 my $h1 = $self->{h} * (1 - $ycut1); 2328 my $h1 = $self->{h} * (1 - $ycut1);
2056 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);
2057 2333
2058 glEnable GL_BLEND; 2334 glEnable GL_BLEND;
2059 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;
2060 glEnable GL_TEXTURE_2D; 2337 glEnable GL_TEXTURE_2D;
2061 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2338 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062 2339
2063 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2340 glBindTexture GL_TEXTURE_2D, $t1->{name};
2064 glBegin GL_QUADS; 2341 glBegin GL_QUADS;
… …
2079 2356
2080 if ($t3) { 2357 if ($t3) {
2081 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2358 glBindTexture GL_TEXTURE_2D, $t3->{name};
2082 glBegin GL_QUADS; 2359 glBegin GL_QUADS;
2083 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2360 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2084 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2361 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2085 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2362 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2086 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2363 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2087 glEnd; 2364 glEnd;
2088 } 2365 }
2089 2366
2090 glDisable GL_BLEND; 2367 glDisable GL_BLEND;
… …
2164 fg => [1, 1, 1], 2441 fg => [1, 1, 1],
2165 active_fg => [0, 0, 0], 2442 active_fg => [0, 0, 0],
2166 bg => [0, 0, 0, 0.2], 2443 bg => [0, 0, 0, 0.2],
2167 active_bg => [1, 1, 1, 0.5], 2444 active_bg => [1, 1, 1, 0.5],
2168 range => [0, 0, 100, 10, 0], 2445 range => [0, 0, 100, 10, 0],
2169 req_w => $::WIDTH / 80, 2446 min_w => $::WIDTH / 80,
2170 req_h => $::WIDTH / 80, 2447 min_h => $::WIDTH / 80,
2171 vertical => 0, 2448 vertical => 0,
2172 can_hover => 1, 2449 can_hover => 1,
2173 inner_pad => 0.02, 2450 inner_pad => 0.02,
2174 @_ 2451 @_
2175 ); 2452 );
… …
2178 $self->update; 2455 $self->update;
2179 2456
2180 $self 2457 $self
2181} 2458}
2182 2459
2183sub changed { }
2184
2185sub set_range { 2460sub set_range {
2186 my ($self, $range) = @_; 2461 my ($self, $range) = @_;
2187 2462
2188 ($range, $self->{range}) = ($self->{range}, $range); 2463 ($range, $self->{range}) = ($self->{range}, $range);
2189 2464
2190 $self->update
2191 if "@$range" ne "@{$self->{range}}"; 2465 if ("@$range" ne "@{$self->{range}}") {
2466 $self->update;
2467 $self->set_value ($self->{range}[0]);
2468 }
2192} 2469}
2193 2470
2194sub set_value { 2471sub set_value {
2195 my ($self, $value) = @_; 2472 my ($self, $value) = @_;
2196 2473
… …
2207 if $unit; 2484 if $unit;
2208 2485
2209 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2486 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2210 2487
2211 if ($value != $old_value) { 2488 if ($value != $old_value) {
2212 $self->_emit (changed => $value); 2489 $self->emit (changed => $value);
2213 $self->update; 2490 $self->update;
2214 } 2491 }
2215} 2492}
2216 2493
2217sub size_request { 2494sub size_request {
2218 my ($self) = @_; 2495 my ($self) = @_;
2219 2496
2220 my $w = $self->{req_w}; 2497 ($self->{req_w}, $self->{req_h})
2221 my $h = $self->{req_h};
2222
2223 $self->{vertical} ? ($h, $w) : ($w, $h)
2224} 2498}
2225 2499
2226sub button_down { 2500sub invoke_button_down {
2227 my ($self, $ev, $x, $y) = @_; 2501 my ($self, $ev, $x, $y) = @_;
2228 2502
2229 $self->SUPER::button_down ($ev, $x, $y); 2503 $self->SUPER::invoke_button_down ($ev, $x, $y);
2230 2504
2231 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2505 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2232 2506
2233 $self->mouse_motion ($ev, $x, $y); 2507 $self->invoke_mouse_motion ($ev, $x, $y)
2234} 2508}
2235 2509
2236sub mouse_motion { 2510sub invoke_mouse_motion {
2237 my ($self, $ev, $x, $y) = @_; 2511 my ($self, $ev, $x, $y) = @_;
2238 2512
2239 if ($GRAB == $self) { 2513 if ($GRAB == $self) {
2240 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2514 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2241 2515
2242 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2516 my (undef, $lo, $hi, $page) = @{$self->{range}};
2243 2517
2244 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2518 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2245 2519
2246 $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
2247 } 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
2248} 2536}
2249 2537
2250sub update { 2538sub update {
2251 my ($self) = @_; 2539 my ($self) = @_;
2252 2540
2253 $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}) {
2254 $self->set_value ($self->{range}[0]); 2549 $self->set_value ($self->{range}[0]);
2255 2550
2256 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2551 my ($value, $lo, $hi, $page) = @{$self->{range}};
2257 my $range = ($hi - $page - $lo) || 1e-100; 2552 my $range = ($hi - $page - $lo) || 1e-100;
2258 2553
… …
2264 $value = ($value - $lo) / $range; 2559 $value = ($value - $lo) / $range;
2265 $value = $value * $self->{scale} + $self->{offset}; 2560 $value = $value * $self->{scale} + $self->{offset};
2266 2561
2267 $self->{knob_x} = $value - $knob_w * 0.5; 2562 $self->{knob_x} = $value - $knob_w * 0.5;
2268 $self->{knob_w} = $knob_w; 2563 $self->{knob_w} = $knob_w;
2269 }); 2564 }
2270
2271 $self->SUPER::update;
2272}
2273
2274sub _draw {
2275 my ($self) = @_;
2276 2565
2277 $self->SUPER::_draw (); 2566 $self->SUPER::_draw ();
2278 2567
2279 glScale $self->{w}, $self->{h}; 2568 glScale $self->{w}, $self->{h};
2280 2569
… …
2341sub set_range { shift->{slider}->set_range (@_) } 2630sub set_range { shift->{slider}->set_range (@_) }
2342sub set_value { shift->{slider}->set_value (@_) } 2631sub set_value { shift->{slider}->set_value (@_) }
2343 2632
2344############################################################################# 2633#############################################################################
2345 2634
2346package CFClient::UI::TextView; 2635package CFClient::UI::TextScroller;
2347 2636
2348our @ISA = CFClient::UI::HBox::; 2637our @ISA = CFClient::UI::HBox::;
2349 2638
2350use CFClient::OpenGL; 2639use CFClient::OpenGL;
2351 2640
2352sub new { 2641sub new {
2353 my $class = shift; 2642 my $class = shift;
2354 2643
2355 my $self = $class->SUPER::new ( 2644 my $self = $class->SUPER::new (
2356 fontsize => 1, 2645 fontsize => 1,
2357 can_events => 0, 2646 can_events => 1,
2647 indent => 0,
2358 #font => default_font 2648 #font => default_font
2359 @_, 2649 @_,
2360 2650
2361 layout => (new CFClient::Layout 1), 2651 layout => (new CFClient::Layout),
2362 par => [], 2652 par => [],
2363 height => 0, 2653 height => 0,
2364 children => [ 2654 children => [
2365 (new CFClient::UI::Empty expand => 1), 2655 (new CFClient::UI::Empty expand => 1),
2366 (new CFClient::UI::Slider vertical => 1), 2656 (new CFClient::UI::Slider vertical => 1),
… …
2377 2667
2378 $self->{fontsize} = $fontsize; 2668 $self->{fontsize} = $fontsize;
2379 $self->reflow; 2669 $self->reflow;
2380} 2670}
2381 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
2382sub size_allocate { 2681sub invoke_size_allocate {
2383 my ($self, $w, $h, $changed) = @_; 2682 my ($self, $w, $h) = @_;
2384 2683
2385 $self->SUPER::size_allocate ($w, $h, $changed); 2684 my ($empty, $slider, @other) = @{ $self->{children} };
2386 2685 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2387 return unless $changed;
2388 2686
2389 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2687 $self->{layout}->set_font ($self->{font}) if $self->{font};
2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2688 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2391 $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});
2392 2691
2393 $self->reflow; 2692 $self->reflow;
2394}
2395 2693
2396sub text_size { 2694 local $self->{children} = [$empty, $slider];
2695 $self->SUPER::invoke_size_allocate ($w, $h)
2696}
2697
2698sub invoke_mouse_wheel {
2397 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) = @_;
2398 2710
2399 my $layout = $self->{layout}; 2711 my $layout = $self->{layout};
2400 2712
2713 $layout->set_font ($self->{font}) if $self->{font};
2714 $layout->set_foreground (@{$para->{fg}});
2401 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2715 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2402 $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});
2403 $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}}
2404 2724 );
2725
2405 $layout->size 2726 $layout
2406} 2727}
2407 2728
2408sub reflow { 2729sub reflow {
2409 my ($self) = @_; 2730 my ($self) = @_;
2410 2731
… …
2419 $self->{children}[1]->set_value ($offset); 2740 $self->{children}[1]->set_value ($offset);
2420} 2741}
2421 2742
2422sub clear { 2743sub clear {
2423 my ($self) = @_; 2744 my ($self) = @_;
2745
2746 my (undef, undef, @other) = @{ $self->{children} };
2747 $self->remove ($_) for @other;
2424 2748
2425 $self->{par} = []; 2749 $self->{par} = [];
2426 $self->{height} = 0; 2750 $self->{height} = 0;
2427 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2751 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2428} 2752}
2429 2753
2430sub add_paragraph { 2754sub add_paragraph {
2431 my ($self, $color, $text, $indent) = @_; 2755 my ($self, $color, $para, $indent) = @_;
2432 2756
2433 for my $line (split /\n/, $text) { 2757 my ($text, @w) = ref $para ? @$para : $para;
2434 my ($w, $h) = $self->text_size ($line); 2758
2435 $self->{height} += $h; 2759 $para = {
2436 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,
2437 } 2766 };
2438 2767
2439 $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;
2440} 2780}
2441 2781
2442sub update { 2782sub update {
2443 my ($self) = @_; 2783 my ($self) = @_;
2444 2784
… …
2446 2786
2447 return unless $self->{h} > 0; 2787 return unless $self->{h} > 0;
2448 2788
2449 delete $self->{texture}; 2789 delete $self->{texture};
2450 2790
2451 $ROOT->on_post_alloc ($self, sub { 2791 $ROOT->on_post_alloc ($self => sub {
2452 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2792 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2453 2793
2454 if (delete $self->{need_reflow}) { 2794 if (delete $self->{need_reflow}) {
2455 my $height = 0; 2795 my $height = 0;
2456 2796
2457 my $layout = $self->{layout};
2458
2459 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2460
2461 for (@{$self->{par}}) { 2797 for my $para (@{$self->{par}}) {
2462 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2798 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2463 $layout->set_width ($W - $_->[3]); 2799 my $layout = $self->get_layout ($para);
2464 $layout->set_markup ($_->[4]);
2465 my ($w, $h) = $layout->size; 2800 my ($w, $h) = $layout->size;
2466 $_->[0] = $w + $_->[3]; 2801
2467 $_->[1] = $h; 2802 $para->{w} = $w + $para->{indent};
2803 $para->{h} = $h;
2804 $para->{wrapped} = $layout->has_wrapped;
2468 } 2805 }
2469 2806
2470 $height += $_->[1]; 2807 $height += $para->{h};
2471 } 2808 }
2472 2809
2473 $self->{height} = $height; 2810 $self->{height} = $height;
2474 2811
2475 $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]);
2476 2813
2477 delete $self->{texture}; 2814 delete $self->{texture};
2478 } 2815 }
2479 2816
2817 if (delete $self->{scroll_to_bottom}) {
2818 $self->{children}[1]->set_value (1e10);
2819 }
2820
2480 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2821 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2481 glClearColor 0.5, 0.5, 0.5, 0; 2822 glClearColor 0, 0, 0, 0;
2482 glClear GL_COLOR_BUFFER_BIT; 2823 glClear GL_COLOR_BUFFER_BIT;
2483 2824
2484 my $top = int $self->{children}[1]{range}[0]; 2825 my $top = int $self->{children}[1]{range}[0];
2485 2826
2486 my $y0 = $top; 2827 my $y0 = $top;
2487 my $y1 = $top + $H; 2828 my $y1 = $top + $H;
2488 2829
2489 my $y = 0; 2830 my $y = 0;
2490 2831
2491 my $layout = $self->{layout};
2492
2493 $layout->set_font ($self->{font}) if $self->{font};
2494
2495 glEnable GL_BLEND;
2496 #TODO# not correct in windows where rgba is forced off
2497 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2498
2499 for my $par (@{$self->{par}}) { 2832 for my $para (@{$self->{par}}) {
2500 my $h = $par->[1]; 2833 my $h = $para->{h};
2501 2834
2502 if ($y0 < $y + $h && $y < $y1) { 2835 if ($y0 < $y + $h && $y < $y1) {
2503 $layout->set_foreground (@{ $par->[2] });
2504 $layout->set_width ($W - $par->[3]);
2505 $layout->set_markup ($par->[4]);
2506 2836
2507 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2837 my $layout = $self->get_layout ($para);
2508 2838
2509 glRasterPos $par->[3], $y - $y0; 2839 $layout->render ($para->{indent}, $y - $y0);
2510 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 }
2511 } 2853 }
2512 2854
2513 $y += $h; 2855 $y += $h;
2514 } 2856 }
2515
2516 glDisable GL_BLEND;
2517 }; 2857 };
2518 }); 2858 });
2519} 2859}
2520 2860
2861sub reconfigure {
2862 my ($self) = @_;
2863
2864 $self->SUPER::reconfigure;
2865
2866 $_->{w} = 1e10 for @{ $self->{par} };
2867 $self->reflow;
2868}
2869
2521sub _draw { 2870sub _draw {
2522 my ($self) = @_; 2871 my ($self) = @_;
2523 2872
2524 glEnable GL_TEXTURE_2D; 2873 glEnable GL_TEXTURE_2D;
2525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2874 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2526 glColor 1, 1, 1, 1; 2875 glColor 0, 0, 0, 1;
2527 $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});
2528 glDisable GL_TEXTURE_2D; 2877 glDisable GL_TEXTURE_2D;
2529 2878
2530 $self->{children}[1]->draw; 2879 $self->{children}[1]->draw;
2531
2532} 2880}
2533 2881
2534############################################################################# 2882#############################################################################
2535 2883
2536package CFClient::UI::Animator; 2884package CFClient::UI::Animator;
… …
2615} 2963}
2616 2964
2617sub set_tooltip_from { 2965sub set_tooltip_from {
2618 my ($self, $widget) = @_; 2966 my ($self, $widget) = @_;
2619 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
2620 $self->add (new CFClient::UI::Label 2980 $self->add (new CFClient::UI::Label
2621 markup => $widget->{tooltip}, 2981 markup => $tooltip,
2622 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2982 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2623 fontsize => 0.8, 2983 fontsize => 0.8,
2624 fg => [0, 0, 0, 1], 2984 fg => [0, 0, 0, 1],
2625 ellipsise => 0, 2985 ellipsise => 0,
2626 font => ($widget->{tooltip_font} || $::FONT_PROP), 2986 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2633 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2993 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2634 2994
2635 ($w + 4, $h + 4) 2995 ($w + 4, $h + 4)
2636} 2996}
2637 2997
2638sub size_allocate { 2998sub invoke_size_allocate {
2639 my ($self, $w, $h, $changed) = @_; 2999 my ($self, $w, $h) = @_;
2640 3000
2641 return unless $changed;
2642
2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 3001 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2644} 3002}
2645 3003
2646sub visibility_change { 3004sub invoke_visibility_change {
2647 my ($self, $visible) = @_; 3005 my ($self, $visible) = @_;
2648 3006
2649 return unless $visible; 3007 return unless $visible;
2650 3008
2651 $self->{root}->on_post_alloc ("move_$self" => sub { 3009 $self->{root}->on_post_alloc ("move_$self" => sub {
2652 my $widget = $self->{owner} 3010 my $widget = $self->{owner}
2653 or return; 3011 or return;
2654 3012
3013 if ($widget->{visible}) {
2655 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3014 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2656 3015
2657 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3016 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2658 if $x + $self->{w} > $::WIDTH; 3017 if $x + $self->{w} > $self->{root}{w};
2659 3018
2660 $self->move_abs ($x, $y); 3019 $self->move_abs ($x, $y);
3020 } else {
3021 $self->hide;
3022 }
2661 }); 3023 });
2662} 3024}
2663 3025
2664sub _draw { 3026sub _draw {
2665 my ($self) = @_; 3027 my ($self) = @_;
… …
2752 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3114 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2753 3115
2754 if ($tex) { 3116 if ($tex) {
2755 glEnable GL_TEXTURE_2D; 3117 glEnable GL_TEXTURE_2D;
2756 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3118 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2757 glColor 1, 1, 1, 1; 3119 glColor 0, 0, 0, 1;
2758 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3120 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2759 glDisable GL_TEXTURE_2D; 3121 glDisable GL_TEXTURE_2D;
2760 } 3122 }
2761} 3123}
2762 3124
2763sub DESTROY { 3125sub destroy {
2764 my ($self) = @_; 3126 my ($self) = @_;
2765 3127
2766 $self->{timer}->cancel 3128 $self->{timer}->cancel
2767 if $self->{timer}; 3129 if $self->{timer};
2768 3130
2769 $self->SUPER::DESTROY; 3131 $self->SUPER::destroy;
2770} 3132}
2771 3133
2772############################################################################# 3134#############################################################################
2773 3135
2774package CFClient::UI::Inventory; 3136package CFClient::UI::Buttonbar;
2775 3137
2776our @ISA = CFClient::UI::ScrolledWindow::; 3138our @ISA = CFClient::UI::HBox::;
2777 3139
2778sub new { 3140# TODO: should actualyl wrap buttons and other goodies.
2779 my $class = shift;
2780
2781 my $self = $class->SUPER::new (
2782 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2783 @_,
2784 );
2785
2786 $self
2787}
2788
2789sub set_items {
2790 my ($self, $items) = @_;
2791
2792 $self->{scrolled}->clear;
2793 return unless $items;
2794
2795 my @items = sort {
2796 ($a->{type} <=> $b->{type})
2797 or ($a->{name} cmp $b->{name})
2798 } @$items;
2799
2800 $self->{real_items} = \@items;
2801
2802 my $row = 0;
2803 for my $item (@items) {
2804 CFClient::Item::update_widgets $item;
2805
2806 $self->{scrolled}->add (0, $row, $item->{face_widget});
2807 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2808 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2809
2810 $row++;
2811 }
2812}
2813 3141
2814############################################################################# 3142#############################################################################
2815 3143
2816package CFClient::UI::Menu; 3144package CFClient::UI::Menu;
2817 3145
… …
2829 ); 3157 );
2830 3158
2831 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3159 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2832 3160
2833 for my $item (@{ $self->{items} }) { 3161 for my $item (@{ $self->{items} }) {
2834 my ($widget, $cb) = @$item; 3162 my ($widget, $cb, $tooltip) = @$item;
2835 3163
2836 # handle various types of items, only text for now 3164 # handle various types of items, only text for now
2837 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 {
2838 $widget = new CFClient::UI::Label 3180 $widget = new CFClient::UI::Label
2839 can_hover => 1, 3181 can_hover => 1,
2840 can_events => 1, 3182 can_events => 1,
2841 text => $widget; 3183 markup => $widget,
3184 tooltip => $tooltip;
3185 }
2842 } 3186 }
2843 3187
2844 $self->{item}{$widget} = $item; 3188 $self->{item}{$widget} = $item;
2845 3189
2846 $self->{vbox}->add ($widget); 3190 $self->{vbox}->add ($widget);
… …
2851 3195
2852# 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)
2853sub popup { 3197sub popup {
2854 my ($self, $ev) = @_; 3198 my ($self, $ev) = @_;
2855 3199
2856 $self->_emit ("popdown"); 3200 $self->emit ("popdown");
2857 3201
2858 # maybe save $GRAB? must be careful about events... 3202 # maybe save $GRAB? must be careful about events...
2859 $GRAB = $self; 3203 $GRAB = $self;
2860 $self->{button} = $ev->{button}; 3204 $self->{button} = $ev->{button};
2861 3205
2862 $self->show; 3206 $self->show;
2863 $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);
2864} 3208}
2865 3209
2866sub mouse_motion { 3210sub invoke_mouse_motion {
2867 my ($self, $ev, $x, $y) = @_; 3211 my ($self, $ev, $x, $y) = @_;
2868 3212
2869 # TODO: should use vbox->find_widget or so 3213 # TODO: should use vbox->find_widget or so
2870 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3214 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2871 $self->{hover} = $self->{item}{$HOVER}; 3215 $self->{hover} = $self->{item}{$HOVER};
2872}
2873 3216
3217 0
3218}
3219
2874sub button_up { 3220sub invoke_button_up {
2875 my ($self, $ev, $x, $y) = @_; 3221 my ($self, $ev, $x, $y) = @_;
2876 3222
2877 if ($ev->{button} == $self->{button}) { 3223 if ($ev->{button} == $self->{button}) {
2878 undef $GRAB; 3224 undef $GRAB;
2879 $self->hide; 3225 $self->hide;
2880 3226
2881 $self->_emit ("popdown"); 3227 $self->emit ("popdown");
2882 $self->{hover}[1]->() if $self->{hover}; 3228 $self->{hover}[1]->() if $self->{hover};
3229 } else {
3230 return 0
3231 }
3232
2883 } 3233 1
2884} 3234}
2885 3235
2886############################################################################# 3236#############################################################################
2887 3237
2888package CFClient::UI::Statusbox; 3238package CFClient::UI::Multiplexer;
2889 3239
2890our @ISA = CFClient::UI::VBox::; 3240our @ISA = CFClient::UI::Container::;
2891 3241
2892sub new { 3242sub new {
2893 my $class = shift; 3243 my $class = shift;
2894 3244
2895 $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 (
2896 fontsize => 0.8, 3424 fontsize => 0.8,
2897 @_, 3425 @_,
2898 ) 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
2899} 3433}
2900 3434
2901sub reorder { 3435sub reorder {
2902 my ($self) = @_; 3436 my ($self) = @_;
2903 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} };
2904 3443
2905 while (my ($k, $v) = each %{ $self->{item} }) { 3444 while (my ($k, $v) = each %{ $self->{item} }) {
2906 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3445 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2907 } 3446 }
2908 3447
… …
2911 my @items = sort { 3450 my @items = sort {
2912 $a->{pri} <=> $b->{pri} 3451 $a->{pri} <=> $b->{pri}
2913 or $b->{id} <=> $a->{id} 3452 or $b->{id} <=> $a->{id}
2914 } values %{ $self->{item} }; 3453 } values %{ $self->{item} };
2915 3454
3455 $self->{timer}->interval (1);
3456
2916 my $count = 10 + 1; 3457 my $count = 10 + 1;
2917 for my $item (@items) { 3458 for my $item (@items) {
2918 last unless --$count; 3459 last unless --$count;
2919 3460
2920 push @widgets, $item->{label} ||= do { 3461 my $label = $item->{label} ||= do {
2921 # TODO: doesn't handle markup well (read as: at all) 3462 # TODO: doesn't handle markup well (read as: at all)
2922 my $short = $item->{count} > 1 3463 my $short = $item->{count} > 1
2923 ? "<b>$item->{count} ×</b> $item->{text}" 3464 ? "<b>$item->{count} ×</b> $item->{text}"
2924 : $item->{text}; 3465 : $item->{text};
2925 3466
… …
2933 tooltip => $item->{tooltip}, 3474 tooltip => $item->{tooltip},
2934 tooltip_font => $::FONT_PROP, 3475 tooltip_font => $::FONT_PROP,
2935 tooltip_width => 0.67, 3476 tooltip_width => 0.67,
2936 fontsize => $item->{fontsize} || $self->{fontsize}, 3477 fontsize => $item->{fontsize} || $self->{fontsize},
2937 max_w => $::WIDTH * 0.44, 3478 max_w => $::WIDTH * 0.44,
2938 fg => $item->{fg}, 3479 fg => [@{ $item->{fg} }],
2939 can_events => 1, 3480 can_events => 1,
2940 can_hover => 1 3481 can_hover => 1
2941 }; 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;
2942 } 3495 }
2943 3496
2944 $self->clear; 3497 $self->clear;
2945 $self->SUPER::add (reverse @widgets); 3498 $self->SUPER::add (reverse @widgets);
2946} 3499}
… …
2951 $text =~ s/^\s+//; 3504 $text =~ s/^\s+//;
2952 $text =~ s/\s+$//; 3505 $text =~ s/\s+$//;
2953 3506
2954 return unless $text; 3507 return unless $text;
2955 3508
2956 my $timeout = time + ((delete $arg{timeout}) || 60); 3509 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2957 3510
2958 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3511 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2959 3512
2960 if (my $item = $self->{item}{$group}) { 3513 if (my $item = $self->{item}{$group}) {
2961 if ($item->{text} eq $text) { 3514 if ($item->{text} eq $text) {
2962 $item->{count}++; 3515 $item->{count}++;
2963 } else { 3516 } else {
2964 $item->{count} = 1; 3517 $item->{count} = 1;
2965 $item->{text} = $item->{tooltip} = $text; 3518 $item->{text} = $item->{tooltip} = $text;
2966 } 3519 }
2967 $item->{id} = ++$self->{id}; 3520 $item->{id} += 0.2;#d#
2968 $item->{timeout} = $timeout; 3521 $item->{timeout} = $timeout;
2969 delete $item->{label}; 3522 delete $item->{label};
2970 } else { 3523 } else {
2971 $self->{item}{$group} = { 3524 $self->{item}{$group} = {
2972 id => ++$self->{id}, 3525 id => ++$self->{id},
… …
2978 count => 1, 3531 count => 1,
2979 %arg, 3532 %arg,
2980 }; 3533 };
2981 } 3534 }
2982 3535
3536 $ROOT->on_refresh (reorder => sub {
2983 $self->reorder; 3537 $self->reorder;
3538 });
2984} 3539}
2985 3540
2986sub reconfigure { 3541sub reconfigure {
2987 my ($self) = @_; 3542 my ($self) = @_;
2988 3543
… …
2991 3546
2992 $self->reorder; 3547 $self->reorder;
2993 $self->SUPER::reconfigure; 3548 $self->SUPER::reconfigure;
2994} 3549}
2995 3550
3551sub destroy {
3552 my ($self) = @_;
3553
3554 $self->{timer}->cancel;
3555
3556 $self->SUPER::destroy;
3557}
3558
2996############################################################################# 3559#############################################################################
2997 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
2998package CFClient::UI::Root; 3745package CFClient::UI::Root;
2999 3746
3000our @ISA = CFClient::UI::Container::; 3747our @ISA = CFClient::UI::Container::;
3748
3749use List::Util qw(min max);
3001 3750
3002use CFClient::OpenGL; 3751use CFClient::OpenGL;
3003 3752
3004sub new { 3753sub new {
3005 my $class = shift; 3754 my $class = shift;
… …
3012 Scalar::Util::weaken ($self->{root} = $self); 3761 Scalar::Util::weaken ($self->{root} = $self);
3013 3762
3014 $self 3763 $self
3015} 3764}
3016 3765
3017sub configure {
3018 my ($self, $x, $y, $w, $h) = @_;
3019
3020 $self->{w} = $w;
3021 $self->{h} = $h;
3022}
3023
3024sub reconfigure {
3025 my ($self) = @_;
3026
3027 $self->SUPER::reconfigure;
3028
3029 $self->size_allocate ($self->{w}, $self->{h}, 1)
3030 if $self->{w};
3031}
3032
3033sub size_request { 3766sub size_request {
3034 my ($self) = @_; 3767 my ($self) = @_;
3035 3768
3036 ($self->{w}, $self->{h}) 3769 ($self->{w}, $self->{h})
3037} 3770}
… …
3048 $coord = $max - $size if $coord > $max - $size; 3781 $coord = $max - $size if $coord > $max - $size;
3049 3782
3050 int $coord + 0.5 3783 int $coord + 0.5
3051} 3784}
3052 3785
3053sub size_allocate { 3786sub invoke_size_allocate {
3054 my ($self, $w, $h, $changed) = @_; 3787 my ($self, $w, $h) = @_;
3055 3788
3056 for my $child ($self->children) { 3789 for my $child ($self->children) {
3057 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)};
3058 3791
3059 $X = $child->{force_x} if exists $child->{force_x}; 3792 $X = $child->{force_x} if exists $child->{force_x};
… …
3062 $X = _to_pixel $X, $W, $self->{w}; 3795 $X = _to_pixel $X, $W, $self->{w};
3063 $Y = _to_pixel $Y, $H, $self->{h}; 3796 $Y = _to_pixel $Y, $H, $self->{h};
3064 3797
3065 $child->configure ($X, $Y, $W, $H); 3798 $child->configure ($X, $Y, $W, $H);
3066 } 3799 }
3800
3801 1
3067} 3802}
3068 3803
3069sub coord2local { 3804sub coord2local {
3070 my ($self, $x, $y) = @_; 3805 my ($self, $x, $y) = @_;
3071 3806
… …
3127 $_->() 3862 $_->()
3128 for values %{delete $self->{refresh_hook}}; 3863 for values %{delete $self->{refresh_hook}};
3129 } 3864 }
3130 3865
3131 if ($self->{realloc}) { 3866 if ($self->{realloc}) {
3867 my %queue;
3132 my @queue; 3868 my @queue;
3869 my $widget;
3133 3870
3871 outer:
3134 while () { 3872 while () {
3135 if ($self->{realloc}) { 3873 if (my $realloc = delete $self->{realloc}) {
3136 #TODO use array-of-depth approach 3874 for $widget (values %$realloc) {
3875 $widget->{visible} or next; # do not resize invisible widgets
3137 3876
3138 @queue = sort { $a->{visible} <=> $b->{visible} } 3877 $queue{$widget+0}++ and next; # duplicates are common
3139 @queue, values %{delete $self->{realloc}}; 3878
3879 push @{ $queue[$widget->{visible}] }, $widget;
3880 }
3140 } 3881 }
3141 3882
3883 while () {
3884 @queue or last outer;
3885
3886 $widget = pop @{ $queue[-1] || [] }
3887 and last;
3888
3889 pop @queue;
3890 }
3891
3892 delete $queue{$widget+0};
3893
3894 my ($w, $h) = $widget->size_request;
3895
3896 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3897 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3898
3899 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3900 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3901
3902 $w = $widget->{force_w} if exists $widget->{force_w};
3903 $h = $widget->{force_h} if exists $widget->{force_h};
3904
3905 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3906 || delete $widget->{force_realloc}) {
3907 $widget->{req_w} = $w;
3908 $widget->{req_h} = $h;
3909
3910 $self->{size_alloc}{$widget+0} = $widget;
3911
3912 if (my $parent = $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};
3922 }
3923 }
3924
3925 while (my $size_alloc = delete $self->{size_alloc}) {
3926 my @queue = sort { $b->{visible} <=> $a->{visible} }
3927 values %$size_alloc;
3928
3929 while () {
3142 my $widget = pop @queue || last; 3930 my $widget = pop @queue || last;
3143 3931
3144 $widget->{visible} or last; # do not resize invisible widgets 3932 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3145
3146 my ($w, $h) = exists $widget->{force_w} && exists $widget->{force_h}
3147 ? @$widget{qw(force_w force_h)}
3148 : $widget->size_request;
3149
3150 my $min_size = $widget->{is_toplevel} ? 16 : 0;
3151
3152 $w = $min_size if $w < $min_size;
3153 $h = $min_size if $h < $min_size;
3154
3155 $widget->{req_w} = $w;
3156 $widget->{req_h} = $h;
3157
3158 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3159
3160 push @queue, $widget->{parent}
3161 if $widget->{parent};
3162 }
3163 }
3164
3165 while (my $size_alloc = delete $self->{size_alloc}) {
3166 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3167 values %$size_alloc;
3168
3169 while () {
3170 my ($widget, $w, $h) = @{ pop @queue or last };
3171
3172 $w = $widget->{w} || $widget->{req_w} unless defined $w;
3173 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3174 3933
3175 $w = 0 if $w < 0; 3934 $w = 0 if $w < 0;
3176 $h = 0 if $h < 0; 3935 $h = 0 if $h < 0;
3177 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
3178 $w = int $w + 0.5; 3943 $w = int $w + 0.5;
3179 $h = int $h + 0.5; 3944 $h = int $h + 0.5;
3180 3945
3181 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};
3182 3949
3183 $widget->{w} = $w; 3950 $widget->{w} = $w;
3184 $widget->{h} = $h; 3951 $widget->{h} = $h;
3185 3952
3186 $widget->emit (size_allocate => $w, $h, $changed); 3953 $widget->emit (size_allocate => $w, $h);
3954 }
3187 } 3955 }
3188 } 3956 }
3189 3957
3190 while ($self->{post_alloc_hook}) { 3958 while ($self->{post_alloc_hook}) {
3191 $_->() 3959 $_->()
3192 for values %{delete $self->{post_alloc_hook}}; 3960 for values %{delete $self->{post_alloc_hook}};
3193 } 3961 }
3962
3194 3963
3195 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3964 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3196 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3965 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3197 glClear GL_COLOR_BUFFER_BIT; 3966 glClear GL_COLOR_BUFFER_BIT;
3198 3967
… …
3200 glLoadIdentity; 3969 glLoadIdentity;
3201 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3970 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3202 glMatrixMode GL_MODELVIEW; 3971 glMatrixMode GL_MODELVIEW;
3203 glLoadIdentity; 3972 glLoadIdentity;
3204 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
3205 $self->_draw; 3981 $self->_draw;
3206} 3982}
3207 3983
3208############################################################################# 3984#############################################################################
3209 3985

Diff Legend

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