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.260 by elmex, Tue May 30 14:35:09 2006 UTC vs.
Revision 1.372 by root, Sun Jul 15 22:13:43 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
7use Event;
8 8
9use CFClient; 9use CFPlus;
10use CFPlus::Pod;
10use CFClient::Texture; 11use CFPlus::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
13 14
14our $LAYOUT; 15our $LAYOUT;
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->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide;
29
30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32
33 return if $ENV{CFPLUS_DEBUG} & 8;
34
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show;
41 }
42
43 return;
44 }
45 }
46 }
47
48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner};
51});
20 52
21sub get_layout { 53sub get_layout {
22 my $layout; 54 my $layout;
23 55
24 for (grep { $_->{name} } values %WIDGET) { 56 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 71 my ($layout) = @_;
40 72
41 $LAYOUT = $layout; 73 $LAYOUT = $layout;
42} 74}
43 75
44sub check_tooltip {
45 if (!$GRAB) {
46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47 if (length $widget->{tooltip}) {
48
49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
52 $TOOLTIP->{owner} = $widget;
53
54 my $tip = $widget->{tooltip};
55
56 $tip = $tip->($widget) if CODE:: eq ref $tip;
57
58 $TOOLTIP->set_tooltip_from ($widget);
59 $TOOLTIP->show;
60 }
61
62 return;
63 }
64 }
65 }
66
67 $TOOLTIP->hide;
68 delete $TOOLTIP->{owner};
69}
70
71# class methods for events 76# class methods for events
72sub feed_sdl_key_down_event { 77sub feed_sdl_key_down_event {
73 $FOCUS->emit (key_down => $_[0]) 78 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS; 79 if $FOCUS;
75} 80}
… …
77sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
78 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
79 if $FOCUS; 84 if $FOCUS;
80} 85}
81 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
82sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
83 my ($ev) = @_; 101 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
85 103
86 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
87 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
88 108
89 $GRAB = $widget; 109 $GRAB = $widget;
90 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
91 111
92 check_tooltip; 112 $TOOLTIP_WATCHER->cb->();
93 } 113 }
94 114
95 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
96 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
98 if $GRAB; 118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9;
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
124 }
99} 125}
100 126
101sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
102 my ($ev) = @_; 128 my ($ev) = @_;
103 my ($x, $y) = ($ev->{x}, $ev->{y});
104 129
105 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
106 131
107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
108 133
109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
110 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
111 136
112 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
113 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
114 $grab->update if $grab; 139 $grab->update if $grab;
115 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
116 141
117 check_tooltip; 142 check_hover $widget;
143 $TOOLTIP_WATCHER->cb->();
118 } 144 }
119} 145}
120 146
121sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
122 my ($ev) = @_; 148 my ($ev) = @_;
123 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
124 150
125 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
126 152
127 if ($widget != $HOVER) { 153 check_hover $widget;
128 my $hover = $HOVER; $HOVER = $widget;
129 154
130 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
131 $HOVER->update if $HOVER && $HOVER->{can_hover};
132
133 check_tooltip;
134 }
135
136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER; 156 if $HOVER;
138} 157}
139 158
140# convert position array to integers 159# convert position array to integers
141sub harmonize { 160sub harmonize {
… …
170sub rescale_widgets { 189sub rescale_widgets {
171 my ($sx, $sy) = @_; 190 my ($sx, $sy) = @_;
172 191
173 for my $widget (values %WIDGET) { 192 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) { 193 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 194 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 195 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177 196
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 197 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 198 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 199 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; 200 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 201 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 202 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 203
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 204 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 205 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187 206
188 } 207 }
189 } 208 }
190 209
191 reconfigure_widgets; 210 reconfigure_widgets;
192} 211}
193 212
194############################################################################# 213#############################################################################
195 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
196package CFClient::UI::Base; 223package CFPlus::UI::Base;
197 224
198use strict; 225use strict;
199 226
200use CFClient::OpenGL; 227use CFPlus::OpenGL;
201 228
202sub new { 229sub new {
203 my $class = shift; 230 my $class = shift;
204 231
205 my $self = bless { 232 my $self = bless {
… …
210 h => undef, 237 h => undef,
211 can_events => 1, 238 can_events => 1,
212 @_ 239 @_
213 }, $class; 240 }, $class;
214 241
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
216 243
217 for (keys %$self) { 244 for (keys %$self) {
218 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
219 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
220 } 247 }
221 } 248 }
222 249
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
228 255
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231 258
232 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
237 264
238sub destroy { 265sub destroy {
239 my ($self) = @_; 266 my ($self) = @_;
240 267
241 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
242 %$self = (); 270 %$self = ();
243} 271}
244 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
245sub show { 277sub show {
246 my ($self) = @_; 278 my ($self) = @_;
247 279
248 return if $self->{parent}; 280 return if $self->{parent};
249 281
250 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
251} 283}
252 284
253sub set_visible { 285sub set_visible {
254 my ($self) = @_; 286 my ($self) = @_;
255 287
… …
270 302
271 return unless $self->{visible}; 303 return unless $self->{visible};
272 304
273 $_->set_invisible for $self->children; 305 $_->set_invisible for $self->children;
274 306
307 delete $self->{visible};
275 delete $self->{root}; 308 delete $self->{root};
276 delete $self->{visible};
277 309
278 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
280 312
281 CFClient::UI::check_tooltip 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
282 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
283 315
284 $self->focus_out; 316 $self->emit ("focus_out");
285
286 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
287} 318}
288 319
289sub set_visibility { 320sub set_visibility {
290 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
291 322
292 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
293 324
294 $visible ? $self->hide 325 $visible ? $self->show
295 : $self->show; 326 : $self->hide;
296} 327}
297 328
298sub toggle_visibility { 329sub toggle_visibility {
299 my ($self) = @_; 330 my ($self) = @_;
300 331
… …
313} 344}
314 345
315sub move_abs { 346sub move_abs {
316 my ($self, $x, $y, $z) = @_; 347 my ($self, $x, $y, $z) = @_;
317 348
318 $self->{x} = List::Util::max 0, int $x; 349 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
319 $self->{y} = List::Util::max 0, int $y; 350 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
320 $self->{z} = $z if defined $z; 351 $self->{z} = $z if defined $z;
321 352
322 $self->update; 353 $self->update;
323} 354}
324 355
… …
334sub size_request { 365sub size_request {
335 require Carp; 366 require Carp;
336 Carp::confess "size_request is abstract"; 367 Carp::confess "size_request is abstract";
337} 368}
338 369
370sub baseline_shift {
371 0
372}
373
339sub configure { 374sub configure {
340 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
341 376
342 if ($self->{aspect}) { 377 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
344 379
345 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
346 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
347 382
348 # use alignment to adjust x, y 383 # use alignment to adjust x, y
349 384
350 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
351 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
365 400
366 $self->{root}{size_alloc}{$self+0} = $self; 401 $self->{root}{size_alloc}{$self+0} = $self;
367 } 402 }
368} 403}
369 404
370sub size_allocate {
371 # nothing to be done
372}
373
374sub children { 405sub children {
406 # nop
407}
408
409sub visible_children {
410 $_[0]->children
375} 411}
376 412
377sub set_max_size { 413sub set_max_size {
378 my ($self, $w, $h) = @_; 414 my ($self, $w, $h) = @_;
379 415
380 delete $self->{max_w}; $self->{max_w} = $w if $w; 416 $self->{max_w} = int $w if defined $w;
381 delete $self->{max_h}; $self->{max_h} = $h if $h; 417 $self->{max_h} = int $h if defined $h;
418
419 $self->realloc;
382} 420}
383 421
384sub set_tooltip { 422sub set_tooltip {
385 my ($self, $tooltip) = @_; 423 my ($self, $tooltip) = @_;
386 424
… …
389 427
390 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
391 429
392 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
393 431
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip; 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
397 } 435 }
398} 436}
399 437
400# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
401sub coord2local { 439sub coord2local {
402 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
403 441
442 Carp::confess unless $self->{parent};#d#
443
404 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
405} 445}
406 446
407# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
408sub coord2global { 448sub coord2global {
409 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
410 450
451 Carp::confess unless $self->{parent};#d#
452
411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
412} 454}
413 455
414sub focus_in { 456sub invoke_focus_in {
415 my ($self) = @_; 457 my ($self) = @_;
416 458
417 return if $FOCUS == $self; 459 return if $FOCUS == $self;
418 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
419 461
420 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
421 463
422 $self->_emit (focus_in => $focus); 464 $self->update;
423 465
424 $focus->update if $focus; 466 0
425 $FOCUS->update;
426} 467}
427 468
428sub focus_out { 469sub invoke_focus_out {
429 my ($self) = @_; 470 my ($self) = @_;
430 471
431 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
432 473
433 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
434 475
435 $self->_emit (focus_out => $focus); 476 $self->update;
436 477
437 $focus->update if $focus; #?
438
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 478 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
440 unless $FOCUS; 479 unless $FOCUS;
441}
442 480
481 0
482}
483
484sub grab_focus {
485 my ($self) = @_;
486
487 $FOCUS->emit ("focus_out") if $FOCUS;
488 $self->emit ("focus_in");
489}
490
443sub mouse_motion { } 491sub invoke_mouse_motion { 0 }
444sub button_up { } 492sub invoke_button_up { 0 }
445sub key_down { } 493sub invoke_key_down { 0 }
446sub key_up { } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
447 496
448sub button_down { 497sub invoke_button_down {
449 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
450 499
451 $self->focus_in; 500 $self->grab_focus;
452}
453 501
454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 502 0
455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 503}
456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 504
457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 505sub connect {
458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 506 my ($self, $signal, $cb) = @_;
507
508 push @{ $self->{signal_cb}{$signal} }, $cb;
509
510 defined wantarray and CFPlus::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} };
513 }
514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
520}
521
522my %has_coords = (
523 button_down => 1,
524 button_up => 1,
525 mouse_motion => 1,
526 mouse_wheel => 1,
527);
528
529sub emit {
530 my ($self, $signal, @args) = @_;
531
532 # I do not really like this solution, but I do not like duplication
533 # and needlessly verbose code, either.
534 my @append
535 = $has_coords{$signal}
536 ? $args[0]->xy ($self)
537 : ();
538
539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
540
541 for my $cb (
542 @{$self->{signal_cb}{$signal} || []}, # before
543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args)
550}
459 551
460sub find_widget { 552sub find_widget {
461 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
462 554
463 return () unless $self->{can_events}; 555 return () unless $self->{can_events};
… …
470} 562}
471 563
472sub set_parent { 564sub set_parent {
473 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
474 566
475 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500} 569}
501 570
502sub realloc { 571sub realloc {
503 my ($self) = @_; 572 my ($self) = @_;
504 573
… …
525 594
526 $self->realloc; 595 $self->realloc;
527 $self->update; 596 $self->update;
528} 597}
529 598
599# using global variables seems a bit hacky, but passing through all drawing
600# functions seems pointless.
601our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
602
530sub draw { 603sub draw {
531 my ($self) = @_; 604 my ($self) = @_;
532 605
533 return unless $self->{h} && $self->{w}; 606 return unless $self->{h} && $self->{w};
607
608 # update screen rectangle
609 local $draw_x = $draw_x + $self->{x};
610 local $draw_y = $draw_y + $self->{y};
611
612 # skip widgets that are entirely outside the drawing area
613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
534 615
535 glPushMatrix; 616 glPushMatrix;
536 glTranslate $self->{x}, $self->{y}, 0; 617 glTranslate $self->{x}, $self->{y}, 0;
537 $self->_draw;
538 glPopMatrix;
539 618
540 if ($self == $HOVER && $self->{can_hover}) { 619 if ($self == $HOVER && $self->{can_hover}) {
541 my ($x, $y) = @$self{qw(x y)};
542
543 glColor 1, 0.8, 0.5, 0.2; 620 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
544 glEnable GL_BLEND; 621 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 622 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glBegin GL_QUADS; 623 glBegin GL_QUADS;
547 glVertex $x , $y; 624 glVertex 0 , 0;
548 glVertex $x + $self->{w}, $y; 625 glVertex $self->{w}, 0;
549 glVertex $x + $self->{w}, $y + $self->{h}; 626 glVertex $self->{w}, $self->{h};
550 glVertex $x , $y + $self->{h}; 627 glVertex 0 , $self->{h};
551 glEnd; 628 glEnd;
552 glDisable GL_BLEND; 629 glDisable GL_BLEND;
553 } 630 }
554 631
555 if ($ENV{CFPLUS_DEBUG} & 1) { 632 if ($ENV{CFPLUS_DEBUG} & 1) {
556 glPushMatrix; 633 glPushMatrix;
557 glColor 1, 1, 0, 1; 634 glColor 1, 1, 0, 1;
558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 635 glTranslate 0.375, 0.375;
559 glBegin GL_LINE_LOOP; 636 glBegin GL_LINE_LOOP;
560 glVertex 0 , 0; 637 glVertex 0 , 0;
561 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
562 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
563 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
564 glEnd; 641 glEnd;
565 glPopMatrix; 642 glPopMatrix;
566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
567 } 644 }
645
646 $self->_draw;
647 glPopMatrix;
568} 648}
569 649
570sub _draw { 650sub _draw {
571 my ($self) = @_; 651 my ($self) = @_;
572 652
573 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
574} 654}
575 655
656my $cntx;#d#
576sub DESTROY { 657sub DESTROY {
577 my ($self) = @_; 658 my ($self) = @_;
578 659
660 return if CFPlus::in_destruct;
661
662 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
579 delete $WIDGET{$self+0}; 665 delete $WIDGET{$self+0};
580 #$self->deactivate;
581} 666}
582 667
583############################################################################# 668#############################################################################
584 669
585package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
586 671
587our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
588 673
589use strict; 674use strict;
590use CFClient::OpenGL; 675use CFPlus::OpenGL;
591 676
592sub new { 677sub new {
593 my $class = shift; 678 my $class = shift;
594 679
595 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
610 695
611 if ($color && (@$color < 4 || $color->[3])) { 696 if ($color && (@$color < 4 || $color->[3])) {
612 my ($w, $h) = @$self{qw(w h)}; 697 my ($w, $h) = @$self{qw(w h)};
613 698
614 glEnable GL_BLEND; 699 glEnable GL_BLEND;
615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 700 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616 glColor @$color; 701 glColor_premultiply @$color;
617 702
618 glBegin GL_QUADS; 703 glBegin GL_QUADS;
619 glVertex 0 , 0; 704 glVertex 0 , 0;
620 glVertex 0 , $h; 705 glVertex 0 , $h;
621 glVertex $w, $h; 706 glVertex $w, $h;
… …
626 } 711 }
627} 712}
628 713
629############################################################################# 714#############################################################################
630 715
631package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
632 717
633our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
634 719
635sub new { 720sub new {
636 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
637 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
638} 723}
… …
645 730
646sub draw { } 731sub draw { }
647 732
648############################################################################# 733#############################################################################
649 734
650package CFClient::UI::Container; 735package CFPlus::UI::Container;
651 736
652our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
653 738
654sub new { 739sub new {
655 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
656 741
657 my $children = delete $arg{children} || []; 742 my $children = delete $arg{children};
658 743
659 my $self = $class->SUPER::new ( 744 my $self = $class->SUPER::new (
660 children => [], 745 children => [],
661 can_events => 0, 746 can_events => 0,
662 %arg, 747 %arg,
663 ); 748 );
749
664 $self->add ($_) for @$children; 750 $self->add (@$children)
751 if $children;
665 752
666 $self 753 $self
754}
755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
667} 762}
668 763
669sub add { 764sub add {
670 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
671 766
… …
717 $x -= $self->{x}; 812 $x -= $self->{x};
718 $y -= $self->{y}; 813 $y -= $self->{y};
719 814
720 my $res; 815 my $res;
721 816
722 for (reverse @{ $self->{children} }) { 817 for (reverse $self->visible_children) {
723 $res = $_->find_widget ($x, $y) 818 $res = $_->find_widget ($x, $y)
724 and return $res; 819 and return $res;
725 } 820 }
726 821
727 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 822 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
733 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
734} 829}
735 830
736############################################################################# 831#############################################################################
737 832
738package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
739 834
740our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
741 836
742sub new { 837sub new {
743 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
744 839
745 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
746 841
747 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
748} 843}
749 844
750sub add { 845sub add {
751 my ($self, $child) = @_; 846 my ($self, $child) = @_;
752 847
753 $self->{children} = []; 848 $self->SUPER::remove ($_) for @{ $self->{children} };
754
755 $self->SUPER::add ($child); 849 $self->SUPER::add ($child);
756} 850}
757 851
758sub remove { 852sub remove {
759 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
760 854
761 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
762 856
763 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
764 unless @{$self->{children}}; 858 unless @{$self->{children}};
765} 859}
766 860
767sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
768 862
769sub size_request { 863sub size_request {
770 $_[0]{children}[0]->size_request 864 $_[0]{children}[0]->size_request
771} 865}
772 866
773sub size_allocate { 867sub invoke_size_allocate {
774 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
775 869
776 $self->{children}[0]->configure (0, 0, $w, $h); 870 $self->{children}[0]->configure (0, 0, $w, $h);
871
872 1
777} 873}
778 874
779############################################################################# 875#############################################################################
780 876
877# back-buffered drawing area
878
781package CFClient::UI::Window; 879package CFPlus::UI::Window;
782 880
783our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
784 882
785use CFClient::OpenGL; 883use CFPlus::OpenGL;
786 884
787sub new { 885sub new {
788 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
789 887
790 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
795 893
796 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 894 $ROOT->on_post_alloc ($self => sub { $self->render_child });
797 $self->SUPER::update; 895 $self->SUPER::update;
798} 896}
799 897
800sub size_allocate { 898sub invoke_size_allocate {
801 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
802 900
803 $self->SUPER::size_allocate ($w, $h);
804 $self->update; 901 $self->update;
902
903 $self->SUPER::invoke_size_allocate ($w, $h)
805} 904}
806 905
807sub _render { 906sub _render {
907 my ($self) = @_;
908
808 $_[0]{children}[0]->draw; 909 $self->{children}[0]->draw;
809} 910}
810 911
811sub render_child { 912sub render_child {
812 my ($self) = @_; 913 my ($self) = @_;
813 914
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
817 918
919 {
920 package CFPlus::UI::Base;
921
922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
923 (0, 0, $self->{w}, $self->{h});
924
818 $self->_render; 925 $self->_render;
926 }
819 }; 927 };
820} 928}
821 929
822sub _draw { 930sub _draw {
823 my ($self) = @_; 931 my ($self) = @_;
824
825 my ($w, $h) = ($self->w, $self->h);
826 932
827 my $tex = $self->{texture} 933 my $tex = $self->{texture}
828 or return; 934 or return;
829 935
830 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1; 938 glColor 0, 0, 0, 1;
833 939
834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
835 941
836 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
837} 943}
838 944
839############################################################################# 945#############################################################################
840 946
841package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
842 948
843our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
844 950
845sub new { 951sub new {
846 my $class = shift; 952 my $class = shift;
847 953
848 $class->SUPER::new ( 954 $class->SUPER::new (
… …
861 $h = 10 if $self->{scroll_y}; 967 $h = 10 if $self->{scroll_y};
862 968
863 ($w, $h) 969 ($w, $h)
864} 970}
865 971
866sub size_allocate { 972sub invoke_size_allocate {
867 my ($self, $w, $h) = @_; 973 my ($self, $w, $h) = @_;
868 974
869 my $child = $self->child; 975 my $child = $self->child;
870 976
871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 977 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 978 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
873 979
874 $self->child->configure (0, 0, $w, $h); 980 $self->child->configure (0, 0, $w, $h);
875 $self->update; 981 $self->update;
982
983 1
876} 984}
877 985
878sub set_offset { 986sub set_offset {
879 my ($self, $x, $y) = @_; 987 my ($self, $x, $y) = @_;
880 988
… …
906 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
907 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
908 ) { 1016 ) {
909 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
910 } else { 1018 } else {
911 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
912 } 1020 }
913} 1021}
914 1022
915sub _render { 1023sub _render {
916 my ($self) = @_; 1024 my ($self) = @_;
917 1025
1026 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1027 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1028
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919 1030
920 $self->SUPER::_render; 1031 $self->SUPER::_render;
921} 1032}
922 1033
923############################################################################# 1034#############################################################################
924 1035
925package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
926 1037
927our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
928 1039
929sub new { 1040sub new {
930 my $class = shift; 1041 my ($class, %arg) = @_;
1042
1043 my $child = delete $arg{child};
931 1044
932 my $self; 1045 my $self;
933 1046
934 my $slider = new CFClient::UI::Slider 1047 my $hslider = new CFPlus::UI::Slider
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new CFPlus::UI::Slider
935 vertical => 1, 1057 vertical => 1,
936 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
937 on_changed => sub { 1059 on_changed => sub {
938 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
939 }, 1062 },
940 ; 1063 ;
941 1064
942 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1), 1066 scroll_x => 0,
1067 scroll_y => 1,
1068 can_events => 1,
944 slider => $slider, 1069 hslider => $hslider,
945 @_, 1070 vslider => $vslider,
1071 col_expand => [1, 0],
1072 row_expand => [1, 0],
1073 %arg,
946 ); 1074 );
947 1075
948 $self->{vp}->add ($self->{scrolled}); 1076 $self->{vp} = new CFPlus::UI::ViewPort
1077 expand => 1,
1078 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y},
1080 ;
1081
949 $self->add ($self->{vp}); 1082 $self->SUPER::add (0, 0, $self->{vp});
950 $self->add ($self->{slider}); 1083 $self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
1084 $self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
1085
1086 $self->add ($child) if $child;
951 1087
952 $self 1088 $self
953} 1089}
954 1090
1091#TODO# update range on size_allocate depending on child
1092
1093sub add {
1094 my ($self, $widget) = @_;
1095
1096 $self->{vp}->add ($self->{child} = $widget);
1097}
1098
1099sub invoke_mouse_wheel {
1100 my ($self, $ev) = @_;
1101
1102 return 0 unless $ev->{dy}; # only vertical movements
1103
1104 $self->{vslider}->emit (mouse_wheel => $ev);
1105
1106 1
1107}
1108
1109sub update_slider {
1110 my ($self) = @_;
1111
1112 my $child = ($self->{vp} or return)->child;
1113
1114 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1115 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1116 #$self->{hslider}->set_visibility ($w1 != $w2);
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120 #$self->{vslider}->set_visibility ($h1 != $h2);
1121}
1122
955sub update { 1123sub update {
956 my ($self) = @_; 1124 my ($self) = @_;
957 1125
958 $self->SUPER::update; 1126 $self->SUPER::update;
959 1127 $self->update_slider;
960 # todo: overwrite size_allocate of child
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963} 1128}
964 1129
965sub size_allocate { 1130sub invoke_size_allocate {
966 my ($self, $w, $h) = @_; 1131 my ($self, $w, $h) = @_;
967 1132
1133 $self->update_slider;
968 $self->SUPER::size_allocate ($w, $h); 1134 $self->SUPER::invoke_size_allocate ($w, $h)
969
970 my $child = $self->{vp}->child;
971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
972} 1135}
973
974#TODO# update range on size_allocate depending on child
975# update viewport offset on scroll
976 1136
977############################################################################# 1137#############################################################################
978 1138
979package CFClient::UI::Frame; 1139package CFPlus::UI::Frame;
980 1140
981our @ISA = CFClient::UI::Bin::; 1141our @ISA = CFPlus::UI::Bin::;
982 1142
983use CFClient::OpenGL; 1143use CFPlus::OpenGL;
984 1144
985sub new { 1145sub new {
986 my $class = shift; 1146 my $class = shift;
987 1147
988 $class->SUPER::new ( 1148 $class->SUPER::new (
… …
996 1156
997 if ($self->{bg}) { 1157 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)}; 1158 my ($w, $h) = @$self{qw(w h)};
999 1159
1000 glEnable GL_BLEND; 1160 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1161 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} }; 1162 glColor_premultiply @{ $self->{bg} };
1003 1163
1004 glBegin GL_QUADS; 1164 glBegin GL_QUADS;
1005 glVertex 0 , 0; 1165 glVertex 0 , 0;
1006 glVertex 0 , $h; 1166 glVertex 0 , $h;
1007 glVertex $w, $h; 1167 glVertex $w, $h;
… …
1014 $self->SUPER::_draw; 1174 $self->SUPER::_draw;
1015} 1175}
1016 1176
1017############################################################################# 1177#############################################################################
1018 1178
1019package CFClient::UI::FancyFrame; 1179package CFPlus::UI::FancyFrame;
1020 1180
1021our @ISA = CFClient::UI::Bin::; 1181our @ISA = CFPlus::UI::Bin::;
1022 1182
1023use CFClient::OpenGL; 1183use CFPlus::OpenGL;
1184
1185sub new {
1186 my ($class, %arg) = @_;
1187
1188 if ((exists $arg{label}) && !ref $arg{label}) {
1189 $arg{label} = new CFPlus::UI::Label
1190 align => 1,
1191 valign => 0,
1192 text => $arg{label},
1193 fontsize => ($arg{border} || 0.8) * 0.75;
1194 }
1195
1196 my $self = $class->SUPER::new (
1197 # label => "",
1198 fg => [0.6, 0.3, 0.1],
1199 border => 0.8,
1200 style => 'single',
1201 %arg,
1202 );
1203
1204 $self
1205}
1206
1207sub add {
1208 my ($self, @widgets) = @_;
1209
1210 $self->SUPER::add (@widgets);
1211 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1212}
1213
1214sub border {
1215 int $_[0]{border} * $::FONTSIZE
1216}
1217
1218sub size_request {
1219 my ($self) = @_;
1220
1221 ($self->{label_w}, undef) = $self->{label}->size_request
1222 if $self->{label};
1223
1224 my ($w, $h) = $self->SUPER::size_request;
1225
1226 (
1227 $w + $self->border * 2,
1228 $h + $self->border * 2,
1229 )
1230}
1231
1232sub invoke_size_allocate {
1233 my ($self, $w, $h) = @_;
1234
1235 my $border = $self->border;
1236
1237 $w -= List::Util::max 0, $border * 2;
1238 $h -= List::Util::max 0, $border * 2;
1239
1240 if (my $label = $self->{label}) {
1241 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1242 $label->{h} = List::Util::min $h, $border;
1243 $label->invoke_size_allocate ($label->{w}, $label->{h});
1244 }
1245
1246 $self->child->configure ($border, $border, $w, $h);
1247
1248 1
1249}
1250
1251sub _draw {
1252 my ($self) = @_;
1253
1254 my $child = $self->{children}[0];
1255
1256 my $border = $self->border;
1257 my ($w, $h) = ($self->{w}, $self->{h});
1258
1259 $child->draw;
1260
1261 glColor @{$self->{fg}};
1262 glBegin GL_LINE_STRIP;
1263 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1264 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1265 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1266 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1267 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1268 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1269 glEnd;
1270
1271 if ($self->{label}) {
1272 glTranslate $border * 2, 0;
1273 $self->{label}->_draw;
1274 }
1275}
1276
1277#############################################################################
1278
1279package CFPlus::UI::Toplevel;
1280
1281our @ISA = CFPlus::UI::Bin::;
1282
1283use CFPlus::OpenGL;
1024 1284
1025my $bg = 1285my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1286 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1; 1287 mipmap => 1, wrap => 1;
1028 1288
1029my @border = 1289my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1290 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1291 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032 1292
1033sub new { 1293sub new {
1034 my $class = shift; 1294 my ($class, %arg) = @_;
1035 1295
1036 my $self = $class->SUPER::new ( 1296 my $self = $class->SUPER::new (
1037 bg => [1, 1, 1, 1], 1297 bg => [1, 1, 1, 1],
1038 border_bg => [1, 1, 1, 1], 1298 border_bg => [1, 1, 1, 1],
1039 border => 0.6, 1299 border => 0.6,
1040 can_events => 1, 1300 can_events => 1,
1041 min_w => 16, 1301 min_w => 64,
1042 min_h => 16, 1302 min_h => 32,
1043 @_ 1303 %arg,
1044 ); 1304 );
1045 1305
1046 $self->{title} &&= new CFClient::UI::Label 1306 $self->{title_widget} = new CFPlus::UI::Label
1047 align => 0, 1307 align => 0,
1048 valign => 1, 1308 valign => 1,
1049 text => $self->{title}, 1309 text => $self->{title},
1050 fontsize => $self->{border}; 1310 fontsize => $self->{border},
1311 if exists $self->{title};
1312
1313 if ($self->{has_close_button}) {
1314 $self->{close_button} =
1315 new CFPlus::UI::ImageButton
1316 path => 'x1_close.png',
1317 on_activate => sub { $self->emit ("delete") };
1318
1319 $self->CFPlus::UI::Container::add ($self->{close_button});
1320 }
1051 1321
1052 $self 1322 $self
1323}
1324
1325sub add {
1326 my ($self, @widgets) = @_;
1327
1328 $self->SUPER::add (@widgets);
1329 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1330 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1053} 1331}
1054 1332
1055sub border { 1333sub border {
1056 int $_[0]{border} * $::FONTSIZE 1334 int $_[0]{border} * $::FONTSIZE
1057} 1335}
1058 1336
1059sub size_request { 1337sub size_request {
1060 my ($self) = @_; 1338 my ($self) = @_;
1339
1340 $self->{title_widget}->size_request
1341 if $self->{title_widget};
1342
1343 $self->{close_button}->size_request
1344 if $self->{close_button};
1061 1345
1062 my ($w, $h) = $self->SUPER::size_request; 1346 my ($w, $h) = $self->SUPER::size_request;
1063 1347
1064 ( 1348 (
1065 $w + $self->border * 2, 1349 $w + $self->border * 2,
1066 $h + $self->border * 2, 1350 $h + $self->border * 2,
1067 ) 1351 )
1068} 1352}
1069 1353
1070sub size_allocate { 1354sub invoke_size_allocate {
1071 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1072 1356
1357 if ($self->{title_widget}) {
1358 $self->{title_widget}{w} = $w;
1359 $self->{title_widget}{h} = $h;
1360 $self->{title_widget}->invoke_size_allocate ($w, $h);
1361 }
1362
1363 my $border = $self->border;
1364
1073 $h -= List::Util::max 0, $self->border * 2; 1365 $h -= List::Util::max 0, $border * 2;
1074 $w -= List::Util::max 0, $self->border * 2; 1366 $w -= List::Util::max 0, $border * 2;
1075 1367
1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1077 if $self->{title};
1078
1079 $self->child->configure ($self->border, $self->border, $w, $h); 1368 $self->child->configure ($border, $border, $w, $h);
1080}
1081 1369
1370 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1371 if $self->{close_button};
1372
1373 1
1374}
1375
1376sub invoke_delete {
1377 my ($self) = @_;
1378
1379 $self->hide;
1380
1381 1
1382}
1383
1082sub button_down { 1384sub invoke_button_down {
1083 my ($self, $ev, $x, $y) = @_; 1385 my ($self, $ev, $x, $y) = @_;
1084 1386
1085 my ($w, $h) = @$self{qw(w h)}; 1387 my ($w, $h) = @$self{qw(w h)};
1086 my $border = $self->border; 1388 my $border = $self->border;
1087 1389
… …
1103 my $dy = $ev->{y} - $oy; 1405 my $dy = $ev->{y} - $oy;
1104 1406
1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1407 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1408 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107 1409
1410 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108 $self->realloc; 1411 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110 }; 1412 };
1111 1413
1112 } elsif ($lr ^ $td) { 1414 } elsif ($lr ^ $td) {
1113 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1415 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114 my ($bx, $by) = ($self->{x}, $self->{y}); 1416 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1117 my ($ev, $x, $y) = @_; 1419 my ($ev, $x, $y) = @_;
1118 1420
1119 ($x, $y) = ($ev->{x}, $ev->{y}); 1421 ($x, $y) = ($ev->{x}, $ev->{y});
1120 1422
1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1423 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1424 # HACK: the next line is required to enforce placement
1425 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122 }; 1426 };
1427 } else {
1428 return 0;
1429 }
1430
1123 } 1431 1
1124} 1432}
1125 1433
1126sub button_up { 1434sub invoke_button_up {
1127 my ($self, $ev, $x, $y) = @_; 1435 my ($self, $ev, $x, $y) = @_;
1128 1436
1129 delete $self->{motion}; 1437 ! ! delete $self->{motion}
1130} 1438}
1131 1439
1132sub mouse_motion { 1440sub invoke_mouse_motion {
1133 my ($self, $ev, $x, $y) = @_; 1441 my ($self, $ev, $x, $y) = @_;
1134 1442
1135 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1443 $self->{motion}->($ev, $x, $y) if $self->{motion};
1444
1445 ! ! $self->{motion}
1446}
1447
1448sub invoke_visibility_change {
1449 my ($self, $visible) = @_;
1450
1451 delete $self->{motion} unless $visible;
1452
1453 0
1136} 1454}
1137 1455
1138sub _draw { 1456sub _draw {
1139 my ($self) = @_; 1457 my ($self) = @_;
1140 1458
1459 my $child = $self->{children}[0];
1460
1141 my ($w, $h ) = ($self->{w}, $self->{h}); 1461 my ($w, $h ) = ($self->{w}, $self->{h});
1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1462 my ($cw, $ch) = ($child->{w}, $child->{h});
1143 1463
1144 glEnable GL_TEXTURE_2D; 1464 glEnable GL_TEXTURE_2D;
1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1465 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146 1466
1147 my $border = $self->border; 1467 my $border = $self->border;
… …
1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1482 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 } 1483 }
1164 1484
1165 glDisable GL_TEXTURE_2D; 1485 glDisable GL_TEXTURE_2D;
1166 1486
1167 $self->{title}->draw if $self->{title};
1168
1169 $self->child->draw; 1487 $child->draw;
1488
1489 if ($self->{title_widget}) {
1490 glTranslate 0, $border - $self->{h};
1491 $self->{title_widget}->_draw;
1492
1493 glTranslate 0, - ($border - $self->{h});
1494 }
1495
1496 $self->{close_button}->draw
1497 if $self->{close_button};
1170} 1498}
1171 1499
1172############################################################################# 1500#############################################################################
1173 1501
1174package CFClient::UI::Table; 1502package CFPlus::UI::Table;
1175 1503
1176our @ISA = CFClient::UI::Base::; 1504our @ISA = CFPlus::UI::Base::;
1177 1505
1178use List::Util qw(max sum); 1506use List::Util qw(max sum);
1179 1507
1180use CFClient::OpenGL; 1508use CFPlus::OpenGL;
1181 1509
1182sub new { 1510sub new {
1183 my $class = shift; 1511 my $class = shift;
1184 1512
1185 $class->SUPER::new ( 1513 $class->SUPER::new (
1186 col_expand => [], 1514 col_expand => [],
1515 row_expand => [],
1187 @_, 1516 @_,
1188 ) 1517 )
1189} 1518}
1190 1519
1191sub children { 1520sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1521 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1193} 1522}
1194 1523
1195sub add { 1524sub add {
1196 my ($self, $x, $y, $child) = @_; 1525 my ($self) = shift;
1197 1526
1527 while (@_) {
1528 my ($x, $y, $child) = splice @_, 0, 3, ();
1198 $child->set_parent ($self); 1529 $child->set_parent ($self);
1199 $self->{children}[$y][$x] = $child; 1530 $self->{children}[$y][$x] = $child;
1531 }
1200 1532
1533 $self->{force_realloc} = 1;
1534 $self->{force_size_alloc} = 1;
1201 $self->realloc; 1535 $self->realloc;
1536}
1537
1538sub remove {
1539 my ($self, $child) = @_;
1540
1541 # TODO: not yet implemented
1202} 1542}
1203 1543
1204# TODO: move to container class maybe? send children a signal on removal? 1544# TODO: move to container class maybe? send children a signal on removal?
1205sub clear { 1545sub clear {
1206 my ($self) = @_; 1546 my ($self) = @_;
… …
1247 (sum @$ws), 1587 (sum @$ws),
1248 (sum @$hs), 1588 (sum @$hs),
1249 ) 1589 )
1250} 1590}
1251 1591
1252sub size_allocate { 1592sub invoke_size_allocate {
1253 my ($self, $w, $h) = @_; 1593 my ($self, $w, $h) = @_;
1254 1594
1255 my ($ws, $hs) = $self->get_wh; 1595 my ($ws, $hs) = $self->get_wh;
1256 1596
1257 my $req_w = (sum @$ws) || 1; 1597 my $req_w = (sum @$ws) || 1;
1258 my $req_h = (sum @$hs) || 1; 1598 my $req_h = (sum @$hs) || 1;
1259 1599
1260 # TODO: nicer code && do row_expand 1600 # TODO: nicer code
1261 my @col_expand = @{$self->{col_expand}}; 1601 my @col_expand = @{$self->{col_expand}};
1262 @col_expand = (1) x @$ws unless @col_expand; 1602 @col_expand = (1) x @$ws unless @col_expand;
1263 my $col_expand = (sum @col_expand) || 1; 1603 my $col_expand = (sum @col_expand) || 1;
1264 1604
1265 # linearly scale sizes
1266 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1605 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1267 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1268 1606
1269 CFClient::UI::harmonize $ws; 1607 CFPlus::UI::harmonize $ws;
1608
1609 my @row_expand = @{$self->{row_expand}};
1610 @row_expand = (1) x @$ws unless @row_expand;
1611 my $row_expand = (sum @row_expand) || 1;
1612
1613 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1614
1270 CFClient::UI::harmonize $hs; 1615 CFPlus::UI::harmonize $hs;
1271 1616
1272 my $y; 1617 my $y;
1273 1618
1274 for my $r (0 .. $#{$self->{children}}) { 1619 for my $r (0 .. $#{$self->{children}}) {
1275 my $row = $self->{children}[$r] 1620 my $row = $self->{children}[$r]
… …
1289 } 1634 }
1290 1635
1291 $y += $row_h; 1636 $y += $row_h;
1292 } 1637 }
1293 1638
1639 1
1294} 1640}
1295 1641
1296sub find_widget { 1642sub find_widget {
1297 my ($self, $x, $y) = @_; 1643 my ($self, $x, $y) = @_;
1298 1644
… …
1317 } 1663 }
1318} 1664}
1319 1665
1320############################################################################# 1666#############################################################################
1321 1667
1322package CFClient::UI::Box; 1668package CFPlus::UI::Box;
1323 1669
1324our @ISA = CFClient::UI::Container::; 1670our @ISA = CFPlus::UI::Container::;
1325 1671
1326sub size_request { 1672sub size_request {
1327 my ($self) = @_; 1673 my ($self) = @_;
1328 1674
1329 $self->{vertical} 1675 $self->{vertical}
… …
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1681 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1682 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 ) 1683 )
1338} 1684}
1339 1685
1340sub size_allocate { 1686sub invoke_size_allocate {
1341 my ($self, $w, $h) = @_; 1687 my ($self, $w, $h) = @_;
1342 1688
1343 my $space = $self->{vertical} ? $h : $w; 1689 my $space = $self->{vertical} ? $h : $w;
1344 my $children = $self->{children}; 1690 my @children = $self->visible_children;
1345 1691
1346 my @req; 1692 my @req;
1347 1693
1348 if ($self->{homogeneous}) { 1694 if ($self->{homogeneous}) {
1349 @req = ($space / (@$children || 1)) x @$children; 1695 @req = ($space / (@children || 1)) x @children;
1350 } else { 1696 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1697 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1352 my $req = List::Util::sum @req; 1698 my $req = List::Util::sum @req;
1353 1699
1354 if ($req > $space) { 1700 if ($req > $space) {
1355 # ah well, not enough space 1701 # ah well, not enough space
1356 $_ *= $space / $req for @req; 1702 $_ *= $space / $req for @req;
1357 } else { 1703 } else {
1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1704 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1359 1705
1360 $space = ($space - $req) / $expand; # remaining space to give away 1706 $space = ($space - $req) / $expand; # remaining space to give away
1361 1707
1362 $req[$_] += $space * $children->[$_]{expand} 1708 $req[$_] += $space * $children[$_]{expand}
1363 for 0 .. $#$children; 1709 for 0 .. $#children;
1364 } 1710 }
1365 } 1711 }
1366 1712
1367 CFClient::UI::harmonize \@req; 1713 CFPlus::UI::harmonize \@req;
1368 1714
1369 my $pos = 0; 1715 my $pos = 0;
1370 for (0 .. $#$children) { 1716 for (0 .. $#children) {
1371 my $alloc = $req[$_]; 1717 my $alloc = $req[$_];
1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1718 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1373 1719
1374 $pos += $alloc; 1720 $pos += $alloc;
1375 } 1721 }
1376 1722
1377 1 1723 1
1378} 1724}
1379 1725
1380############################################################################# 1726#############################################################################
1381 1727
1382package CFClient::UI::HBox; 1728package CFPlus::UI::HBox;
1383 1729
1384our @ISA = CFClient::UI::Box::; 1730our @ISA = CFPlus::UI::Box::;
1385 1731
1386sub new { 1732sub new {
1387 my $class = shift; 1733 my $class = shift;
1388 1734
1389 $class->SUPER::new ( 1735 $class->SUPER::new (
… …
1392 ) 1738 )
1393} 1739}
1394 1740
1395############################################################################# 1741#############################################################################
1396 1742
1397package CFClient::UI::VBox; 1743package CFPlus::UI::VBox;
1398 1744
1399our @ISA = CFClient::UI::Box::; 1745our @ISA = CFPlus::UI::Box::;
1400 1746
1401sub new { 1747sub new {
1402 my $class = shift; 1748 my $class = shift;
1403 1749
1404 $class->SUPER::new ( 1750 $class->SUPER::new (
… …
1407 ) 1753 )
1408} 1754}
1409 1755
1410############################################################################# 1756#############################################################################
1411 1757
1412package CFClient::UI::Label; 1758package CFPlus::UI::Label;
1413 1759
1414our @ISA = CFClient::UI::DrawBG::; 1760our @ISA = CFPlus::UI::DrawBG::;
1415 1761
1416use CFClient::OpenGL; 1762use CFPlus::OpenGL;
1417 1763
1418sub new { 1764sub new {
1419 my ($class, %arg) = @_; 1765 my ($class, %arg) = @_;
1420 1766
1421 my $self = $class->SUPER::new ( 1767 my $self = $class->SUPER::new (
… …
1424 #active_bg => none 1770 #active_bg => none
1425 #font => default_font 1771 #font => default_font
1426 #text => initial text 1772 #text => initial text
1427 #markup => initial narkup 1773 #markup => initial narkup
1428 #max_w => maximum pixel width 1774 #max_w => maximum pixel width
1775 #style => 0, # render flags
1429 ellipsise => 3, # end 1776 ellipsise => 3, # end
1430 layout => (new CFClient::Layout), 1777 layout => (new CFPlus::Layout),
1431 fontsize => 1, 1778 fontsize => 1,
1432 align => -1, 1779 align => -1,
1433 valign => -1, 1780 valign => -1,
1434 padding_x => 2, 1781 padding_x => 2,
1435 padding_y => 2, 1782 padding_y => 2,
1436 can_events => 0, 1783 can_events => 0,
1437 %arg 1784 %arg
1438 ); 1785 );
1439 1786
1440 if (exists $self->{template}) { 1787 if (exists $self->{template}) {
1441 my $layout = new CFClient::Layout; 1788 my $layout = new CFPlus::Layout;
1442 $layout->set_text (delete $self->{template}); 1789 $layout->set_text (delete $self->{template});
1443 $self->{template} = $layout; 1790 $self->{template} = $layout;
1444 } 1791 }
1445 1792
1446 if (exists $self->{markup}) { 1793 if (exists $self->{markup}) {
… …
1450 } 1797 }
1451 1798
1452 $self 1799 $self
1453} 1800}
1454 1801
1455sub escape($) {
1456 local $_ = $_[0];
1457
1458 s/&/&amp;/g;
1459 s/>/&gt;/g;
1460 s/</&lt;/g;
1461
1462 $_
1463}
1464
1465sub update { 1802sub update {
1466 my ($self) = @_; 1803 my ($self) = @_;
1467 1804
1468 delete $self->{texture}; 1805 delete $self->{texture};
1469 $self->SUPER::update; 1806 $self->SUPER::update;
1470} 1807}
1471 1808
1809sub realloc {
1810 my ($self) = @_;
1811
1812 delete $self->{ox};
1813 $self->SUPER::realloc;
1814}
1815
1472sub set_text { 1816sub set_text {
1473 my ($self, $text) = @_; 1817 my ($self, $text) = @_;
1474 1818
1475 return if $self->{text} eq "T$text"; 1819 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text"; 1820 $self->{text} = "T$text";
1477 1821
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479 $self->{layout}->set_text ($text); 1822 $self->{layout}->set_text ($text);
1480 1823
1824 delete $self->{size_req};
1481 $self->realloc; 1825 $self->realloc;
1482 $self->update; 1826 $self->update;
1483} 1827}
1484 1828
1485sub set_markup { 1829sub set_markup {
… …
1488 return if $self->{text} eq "M$markup"; 1832 return if $self->{text} eq "M$markup";
1489 $self->{text} = "M$markup"; 1833 $self->{text} = "M$markup";
1490 1834
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1835 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492 1836
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1494 $self->{layout}->set_markup ($markup); 1837 $self->{layout}->set_markup ($markup);
1495 1838
1839 delete $self->{size_req};
1496 $self->realloc; 1840 $self->realloc;
1497 $self->update; 1841 $self->update;
1498} 1842}
1499 1843
1500sub size_request { 1844sub size_request {
1501 my ($self) = @_; 1845 my ($self) = @_;
1502 1846
1847 $self->{size_req} ||= do {
1503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1848 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1); 1849 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1850 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1851 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1852 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508 1853
1509 my ($w, $h) = $self->{layout}->size; 1854 my ($w, $h) = $self->{layout}->size;
1510 1855
1511 if (exists $self->{template}) { 1856 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font}; 1857 $self->{template}->set_font ($self->{font}) if $self->{font};
1858 $self->{template}->set_width ($self->{max_w} || -1);
1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1859 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514 1860
1515 my ($w2, $h2) = $self->{template}->size; 1861 my ($w2, $h2) = $self->{template}->size;
1516 1862
1517 $w = List::Util::max $w, $w2; 1863 $w = List::Util::max $w, $w2;
1518 $h = List::Util::max $h, $h2; 1864 $h = List::Util::max $h, $h2;
1865 }
1866
1867 [$w, $h]
1519 } 1868 };
1520 1869
1521 ($w, $h) 1870 @{ $self->{size_req} }
1522} 1871}
1523 1872
1873sub baseline_shift {
1874 $_[0]{layout}->descent
1875}
1876
1524sub size_allocate { 1877sub invoke_size_allocate {
1525 my ($self, $w, $h) = @_; 1878 my ($self, $w, $h) = @_;
1526 1879
1880 delete $self->{ox};
1881
1527 delete $self->{texture}; 1882 delete $self->{texture}
1883 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1884
1885 1
1528} 1886}
1529 1887
1530sub set_fontsize { 1888sub set_fontsize {
1531 my ($self, $fontsize) = @_; 1889 my ($self, $fontsize) = @_;
1532 1890
1533 $self->{fontsize} = $fontsize; 1891 $self->{fontsize} = $fontsize;
1892 delete $self->{size_req};
1534 delete $self->{texture}; 1893 delete $self->{texture};
1535 1894
1536 $self->realloc; 1895 $self->realloc;
1537} 1896}
1538 1897
1898sub reconfigure {
1899 my ($self) = @_;
1900
1901 delete $self->{size_req};
1902 delete $self->{texture};
1903
1904 $self->SUPER::reconfigure;
1905}
1906
1539sub _draw { 1907sub _draw {
1540 my ($self) = @_; 1908 my ($self) = @_;
1541 1909
1542 $self->SUPER::_draw; # draw background, if applicable 1910 $self->SUPER::_draw; # draw background, if applicable
1543 1911
1544 my $tex = $self->{texture} ||= do { 1912 my $size = $self->{texture} ||= do {
1545 $self->{layout}->set_foreground (@{$self->{fg}}); 1913 $self->{layout}->set_foreground (@{$self->{fg}});
1546 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1914 $self->{layout}->set_font ($self->{font}) if $self->{font};
1547 $self->{layout}->set_width ($self->{w}); 1915 $self->{layout}->set_width ($self->{w});
1548 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1916 $self->{layout}->set_ellipsise ($self->{ellipsise});
1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1917 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1918 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551 1919
1552 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1920 [$self->{layout}->size]
1921 };
1553 1922
1923 unless (exists $self->{ox}) {
1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1924 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1925 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1556 : ($self->{w} - $tex->{w}) * 0.5); 1926 : ($self->{w} - $size->[0]) * 0.5);
1557 1927
1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1928 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1929 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1560 : ($self->{h} - $tex->{h}) * 0.5); 1930 : ($self->{h} - $size->[1]) * 0.5);
1561
1562 $tex
1563 }; 1931 };
1564 1932
1565 glEnable GL_TEXTURE_2D; 1933 my $w = List::Util::min $self->{w} + 4, $size->[0];
1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1934 my $h = List::Util::min $self->{h} + 2, $size->[1];
1567 1935
1568 if ($tex->{format} == GL_ALPHA) { 1936 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1569 glColor @{$self->{fg}};
1570 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1571 } else {
1572 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1573 }
1574
1575 glDisable GL_TEXTURE_2D;
1576} 1937}
1577 1938
1578############################################################################# 1939#############################################################################
1579 1940
1580package CFClient::UI::EntryBase; 1941package CFPlus::UI::EntryBase;
1581 1942
1582our @ISA = CFClient::UI::Label::; 1943our @ISA = CFPlus::UI::Label::;
1583 1944
1584use CFClient::OpenGL; 1945use CFPlus::OpenGL;
1585 1946
1586sub new { 1947sub new {
1587 my $class = shift; 1948 my $class = shift;
1588 1949
1589 $class->SUPER::new ( 1950 $class->SUPER::new (
… …
1593 active_fg => [0, 0, 0], 1954 active_fg => [0, 0, 0],
1594 can_hover => 1, 1955 can_hover => 1,
1595 can_focus => 1, 1956 can_focus => 1,
1596 valign => 0, 1957 valign => 0,
1597 can_events => 1, 1958 can_events => 1,
1959 ellipsise => 0,
1598 #text => ... 1960 #text => ...
1961 #hidden => "*",
1599 @_ 1962 @_
1600 ) 1963 )
1601} 1964}
1602 1965
1603sub _set_text { 1966sub _set_text {
… …
1605 1968
1606 delete $self->{cur_h}; 1969 delete $self->{cur_h};
1607 1970
1608 return if $self->{text} eq $text; 1971 return if $self->{text} eq $text;
1609 1972
1610 delete $self->{texture};
1611
1612 $self->{last_activity} = $::NOW; 1973 $self->{last_activity} = $::NOW;
1613 $self->{text} = $text; 1974 $self->{text} = $text;
1614 1975
1615 $text =~ s/./*/g if $self->{hidden}; 1976 $text =~ s/./*/g if $self->{hidden};
1616 $self->{layout}->set_text ("$text "); 1977 $self->{layout}->set_text ("$text ");
1978 delete $self->{size_req};
1617 1979
1618 $self->_emit (changed => $self->{text}); 1980 $self->emit (changed => $self->{text});
1981
1982 $self->realloc;
1983 $self->update;
1619} 1984}
1620 1985
1621sub set_text { 1986sub set_text {
1622 my ($self, $text) = @_; 1987 my ($self, $text) = @_;
1623 1988
1624 $self->{cursor} = length $text; 1989 $self->{cursor} = length $text;
1625 $self->_set_text ($text); 1990 $self->_set_text ($text);
1626
1627 $self->realloc;
1628} 1991}
1629 1992
1630sub get_text { 1993sub get_text {
1631 $_[0]{text} 1994 $_[0]{text}
1632} 1995}
… …
1637 my ($w, $h) = $self->SUPER::size_request; 2000 my ($w, $h) = $self->SUPER::size_request;
1638 2001
1639 ($w + 1, $h) # add 1 for cursor 2002 ($w + 1, $h) # add 1 for cursor
1640} 2003}
1641 2004
1642sub key_down { 2005sub invoke_key_down {
1643 my ($self, $ev) = @_; 2006 my ($self, $ev) = @_;
1644 2007
1645 my $mod = $ev->{mod}; 2008 my $mod = $ev->{mod};
1646 my $sym = $ev->{sym}; 2009 my $sym = $ev->{sym};
1647 my $uni = $ev->{unicode}; 2010 my $uni = $ev->{unicode};
1648 2011
1649 my $text = $self->get_text; 2012 my $text = $self->get_text;
2013
2014 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1650 2015
1651 if ($uni == 8) { 2016 if ($uni == 8) {
1652 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2017 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1653 } elsif ($uni == 127) { 2018 } elsif ($uni == 127) {
1654 substr $text, $self->{cursor}, 1, ""; 2019 substr $text, $self->{cursor}, 1, "";
1655 } elsif ($sym == CFClient::SDLK_LEFT) { 2020 } elsif ($sym == CFPlus::SDLK_LEFT) {
1656 --$self->{cursor} if $self->{cursor}; 2021 --$self->{cursor} if $self->{cursor};
1657 } elsif ($sym == CFClient::SDLK_RIGHT) { 2022 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1658 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2023 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1659 } elsif ($sym == CFClient::SDLK_HOME) { 2024 } elsif ($sym == CFPlus::SDLK_HOME) {
2025 # what a hack
2026 $self->{cursor} =
2027 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2028 ? length $1
2029 : 0;
2030 } elsif ($sym == CFPlus::SDLK_END) {
2031 # uh, again
2032 $self->{cursor} =
2033 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2034 ? $self->{cursor} + length $1
2035 : length $self->{text};
2036 } elsif ($uni == 21) { # ctrl-u
2037 $text = "";
1660 $self->{cursor} = 0; 2038 $self->{cursor} = 0;
1661 } elsif ($sym == CFClient::SDLK_END) {
1662 $self->{cursor} = length $text;
1663 } elsif ($uni == 27) { 2039 } elsif ($uni == 27) {
1664 $self->_emit ('escape'); 2040 $self->emit ('escape');
1665 } elsif ($uni) { 2041 } elsif ($uni == 0x0d) {
2042 substr $text, $self->{cursor}++, 0, "\012";
2043 } elsif ($uni >= 0x20) {
1666 substr $text, $self->{cursor}++, 0, chr $uni; 2044 substr $text, $self->{cursor}++, 0, chr $uni;
2045 } else {
2046 return 0;
1667 } 2047 }
1668 2048
1669 $self->_set_text ($text); 2049 $self->_set_text ($text);
1670 2050
1671 $self->realloc; 2051 $self->realloc;
1672} 2052 $self->update;
1673 2053
2054 1
2055}
2056
1674sub focus_in { 2057sub invoke_focus_in {
1675 my ($self) = @_; 2058 my ($self) = @_;
1676 2059
1677 $self->{last_activity} = $::NOW; 2060 $self->{last_activity} = $::NOW;
1678 2061
1679 $self->SUPER::focus_in; 2062 $self->SUPER::invoke_focus_in
1680} 2063}
1681 2064
1682sub button_down { 2065sub invoke_button_down {
1683 my ($self, $ev, $x, $y) = @_; 2066 my ($self, $ev, $x, $y) = @_;
1684 2067
1685 $self->SUPER::button_down ($ev, $x, $y); 2068 $self->SUPER::invoke_button_down ($ev, $x, $y);
1686 2069
1687 my $idx = $self->{layout}->xy_to_index ($x, $y); 2070 my $idx = $self->{layout}->xy_to_index ($x, $y);
1688 2071
1689 # byte-index to char-index 2072 # byte-index to char-index
1690 my $text = $self->{text}; 2073 my $text = $self->{text};
1691 utf8::encode $text; 2074 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1692 $self->{cursor} = length substr $text, 0, $idx; 2075 $self->{cursor} = length $text;
1693 2076
1694 $self->_set_text ($self->{text}); 2077 $self->_set_text ($self->{text});
1695 $self->update; 2078 $self->update;
2079
2080 1
1696} 2081}
1697 2082
1698sub mouse_motion { 2083sub invoke_mouse_motion {
1699 my ($self, $ev, $x, $y) = @_; 2084 my ($self, $ev, $x, $y) = @_;
1700# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2085# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2086
2087 1
1701} 2088}
1702 2089
1703sub _draw { 2090sub _draw {
1704 my ($self) = @_; 2091 my ($self) = @_;
1705 2092
1706 local $self->{fg} = $self->{fg}; 2093 local $self->{fg} = $self->{fg};
1707 2094
1708 if ($FOCUS == $self) { 2095 if ($FOCUS == $self) {
1709 glColor @{$self->{active_bg}}; 2096 glColor_premultiply @{$self->{active_bg}};
1710 $self->{fg} = $self->{active_fg}; 2097 $self->{fg} = $self->{active_fg};
1711 } else { 2098 } else {
1712 glColor @{$self->{bg}}; 2099 glColor_premultiply @{$self->{bg}};
1713 } 2100 }
1714 2101
1715 glEnable GL_BLEND; 2102 glEnable GL_BLEND;
1716 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2103 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1717 glBegin GL_QUADS; 2104 glBegin GL_QUADS;
1718 glVertex 0 , 0; 2105 glVertex 0 , 0;
1719 glVertex 0 , $self->{h}; 2106 glVertex 0 , $self->{h};
1720 glVertex $self->{w}, $self->{h}; 2107 glVertex $self->{w}, $self->{h};
1721 glVertex $self->{w}, 0; 2108 glVertex $self->{w}, 0;
… …
1732 utf8::encode $text; 2119 utf8::encode $text;
1733 2120
1734 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2121 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1735 } 2122 }
1736 2123
1737 glColor @{$self->{fg}};
1738 glBegin GL_LINES; 2124 glBegin GL_LINES;
1739 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2125 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1740 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2126 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1741 glEnd; 2127 glEnd;
1742 } 2128 }
1743} 2129}
1744 2130
2131#############################################################################
2132
1745package CFClient::UI::Entry; 2133package CFPlus::UI::Entry;
1746 2134
1747our @ISA = CFClient::UI::EntryBase::; 2135our @ISA = CFPlus::UI::EntryBase::;
1748 2136
1749use CFClient::OpenGL; 2137use CFPlus::OpenGL;
1750 2138
1751sub key_down { 2139sub invoke_key_down {
1752 my ($self, $ev) = @_; 2140 my ($self, $ev) = @_;
1753 2141
1754 my $sym = $ev->{sym}; 2142 my $sym = $ev->{sym};
1755 2143
1756 if ($sym == 13) { 2144 if ($ev->{uni} == 0x0d || $sym == 13) {
1757 unshift @{$self->{history}}, 2145 unshift @{$self->{history}},
1758 my $txt = $self->get_text; 2146 my $txt = $self->get_text;
2147
1759 $self->{history_pointer} = -1; 2148 $self->{history_pointer} = -1;
1760 $self->{history_saveback} = ''; 2149 $self->{history_saveback} = '';
1761 $self->_emit (activate => $txt); 2150 $self->emit (activate => $txt);
1762 $self->update; 2151 $self->update;
1763 2152
1764 } elsif ($sym == CFClient::SDLK_UP) { 2153 } elsif ($sym == CFPlus::SDLK_UP) {
1765 if ($self->{history_pointer} < 0) { 2154 if ($self->{history_pointer} < 0) {
1766 $self->{history_saveback} = $self->get_text; 2155 $self->{history_saveback} = $self->get_text;
1767 } 2156 }
1768 if (@{$self->{history} || []} > 0) { 2157 if (@{$self->{history} || []} > 0) {
1769 $self->{history_pointer}++; 2158 $self->{history_pointer}++;
… …
1771 $self->{history_pointer} = @{$self->{history} || []} - 1; 2160 $self->{history_pointer} = @{$self->{history} || []} - 1;
1772 } 2161 }
1773 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2162 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1774 } 2163 }
1775 2164
1776 } elsif ($sym == CFClient::SDLK_DOWN) { 2165 } elsif ($sym == CFPlus::SDLK_DOWN) {
1777 $self->{history_pointer}--; 2166 $self->{history_pointer}--;
1778 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2167 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1779 2168
1780 if ($self->{history_pointer} >= 0) { 2169 if ($self->{history_pointer} >= 0) {
1781 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2170 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1782 } else { 2171 } else {
1783 $self->set_text ($self->{history_saveback}); 2172 $self->set_text ($self->{history_saveback});
1784 } 2173 }
1785 2174
1786 } else { 2175 } else {
1787 $self->SUPER::key_down ($ev); 2176 return $self->SUPER::invoke_key_down ($ev)
2177 }
2178
1788 } 2179 1
1789
1790} 2180}
1791 2181
1792############################################################################# 2182#############################################################################
1793 2183
2184package CFPlus::UI::TextEdit;
2185
2186our @ISA = CFPlus::UI::EntryBase::;
2187
2188use CFPlus::OpenGL;
2189
2190sub move_cursor_ver {
2191 my ($self, $dy) = @_;
2192
2193 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2194
2195 $y += $dy;
2196
2197 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2198 $self->{cursor} = $index;
2199 delete $self->{cur_h};
2200 $self->update;
2201 return;
2202 }
2203}
2204
2205sub invoke_key_down {
2206 my ($self, $ev) = @_;
2207
2208 my $sym = $ev->{sym};
2209
2210 if ($sym == CFPlus::SDLK_UP) {
2211 $self->move_cursor_ver (-1);
2212 } elsif ($sym == CFPlus::SDLK_DOWN) {
2213 $self->move_cursor_ver (+1);
2214 } else {
2215 return $self->SUPER::invoke_key_down ($ev)
2216 }
2217
2218 1
2219}
2220
2221#############################################################################
2222
1794package CFClient::UI::Button; 2223package CFPlus::UI::Button;
1795 2224
1796our @ISA = CFClient::UI::Label::; 2225our @ISA = CFPlus::UI::Label::;
1797 2226
1798use CFClient::OpenGL; 2227use CFPlus::OpenGL;
1799 2228
1800my @tex = 2229my @tex =
1801 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2230 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1802 qw(b1_button_active.png); 2231 qw(b1_button_active.png);
1803 2232
1804sub new { 2233sub new {
1805 my $class = shift; 2234 my $class = shift;
1806 2235
… …
1815 can_events => 1, 2244 can_events => 1,
1816 @_ 2245 @_
1817 ) 2246 )
1818} 2247}
1819 2248
1820sub activate { }
1821
1822sub button_up { 2249sub invoke_button_up {
1823 my ($self, $ev, $x, $y) = @_; 2250 my ($self, $ev, $x, $y) = @_;
1824 2251
1825 $self->emit ("activate") 2252 $self->emit ("activate")
1826 if $x >= 0 && $x < $self->{w} 2253 if $x >= 0 && $x < $self->{w}
1827 && $y >= 0 && $y < $self->{h}; 2254 && $y >= 0 && $y < $self->{h};
2255
2256 1
1828} 2257}
1829 2258
1830sub _draw { 2259sub _draw {
1831 my ($self) = @_; 2260 my ($self) = @_;
1832 2261
1833 local $self->{fg} = $self->{fg}; 2262 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1834
1835 if ($GRAB == $self) {
1836 $self->{fg} = $self->{active_fg};
1837 }
1838 2263
1839 glEnable GL_TEXTURE_2D; 2264 glEnable GL_TEXTURE_2D;
1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2265 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841 glColor 0, 0, 0, 1; 2266 glColor 0, 0, 0, 1;
1842 2267
… …
1847 $self->SUPER::_draw; 2272 $self->SUPER::_draw;
1848} 2273}
1849 2274
1850############################################################################# 2275#############################################################################
1851 2276
1852package CFClient::UI::CheckBox; 2277package CFPlus::UI::CheckBox;
1853 2278
1854our @ISA = CFClient::UI::DrawBG::; 2279our @ISA = CFPlus::UI::DrawBG::;
1855 2280
1856my @tex = 2281my @tex =
1857 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2282 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1858 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2283 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1859 2284
1860use CFClient::OpenGL; 2285use CFPlus::OpenGL;
1861 2286
1862sub new { 2287sub new {
1863 my $class = shift; 2288 my $class = shift;
1864 2289
1865 $class->SUPER::new ( 2290 $class->SUPER::new (
… …
1879 my ($self) = @_; 2304 my ($self) = @_;
1880 2305
1881 (6) x 2 2306 (6) x 2
1882} 2307}
1883 2308
2309sub toggle {
2310 my ($self) = @_;
2311
2312 $self->{state} = !$self->{state};
2313 $self->emit (changed => $self->{state});
2314 $self->update;
2315}
2316
1884sub button_down { 2317sub invoke_button_down {
1885 my ($self, $ev, $x, $y) = @_; 2318 my ($self, $ev, $x, $y) = @_;
1886 2319
1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2320 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2321 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1889 $self->{state} = !$self->{state}; 2322 $self->toggle;
1890 $self->_emit (changed => $self->{state}); 2323 } else {
2324 return 0
2325 }
2326
1891 } 2327 1
1892} 2328}
1893 2329
1894sub _draw { 2330sub _draw {
1895 my ($self) = @_; 2331 my ($self) = @_;
1896 2332
… …
1911 glDisable GL_TEXTURE_2D; 2347 glDisable GL_TEXTURE_2D;
1912} 2348}
1913 2349
1914############################################################################# 2350#############################################################################
1915 2351
1916package CFClient::UI::Image; 2352package CFPlus::UI::Image;
1917 2353
1918our @ISA = CFClient::UI::Base::; 2354our @ISA = CFPlus::UI::Base::;
1919 2355
1920use CFClient::OpenGL; 2356use CFPlus::OpenGL;
1921use Carp qw/confess/;
1922 2357
1923our %loaded_images; 2358our %texture_cache;
1924 2359
1925sub new { 2360sub new {
1926 my $class = shift; 2361 my $class = shift;
1927 2362
1928 my $self = $class->SUPER::new (can_events => 0, @_); 2363 my $self = $class->SUPER::new (
2364 can_events => 0,
2365 @_,
2366 );
1929 2367
1930 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2368 $self->{path} || $self->{tex}
2369 or Carp::croak "'path' or 'tex' attributes required";
1931 2370
1932 $loaded_images{$self->{image}} ||= 2371 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1933 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2372 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1934 2373
1935 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2374 CFPlus::weaken $texture_cache{$self->{path}};
1936 2375
1937 Scalar::Util::weaken $loaded_images{$self->{image}}; 2376 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1938
1939 $self->{aspect} = $tex->{w} / $tex->{h};
1940 2377
1941 $self 2378 $self
1942} 2379}
1943 2380
2381sub STORABLE_freeze {
2382 my ($self, $cloning) = @_;
2383
2384 $self->{path}
2385 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2386
2387 $self->{path}
2388}
2389
2390sub STORABLE_attach {
2391 my ($self, $cloning, $path) = @_;
2392
2393 $self->new (path => $path)
2394}
2395
1944sub size_request { 2396sub size_request {
1945 my ($self) = @_; 2397 my ($self) = @_;
1946 2398
1947 ($self->{tex}->{w}, $self->{tex}->{h}) 2399 ($self->{tex}{w}, $self->{tex}{h})
1948} 2400}
1949 2401
1950sub _draw { 2402sub _draw {
1951 my ($self) = @_; 2403 my ($self) = @_;
1952 2404
… …
1962 } 2414 }
1963 2415
1964 glEnable GL_TEXTURE_2D; 2416 glEnable GL_TEXTURE_2D;
1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1966 2418
1967 $tex->draw_quad_alpha (0, 0, $w, $h); 2419 $tex->draw_quad (0, 0, $w, $h);
1968 2420
1969 glDisable GL_TEXTURE_2D; 2421 glDisable GL_TEXTURE_2D;
1970} 2422}
1971 2423
1972############################################################################# 2424#############################################################################
1973 2425
2426package CFPlus::UI::ImageButton;
2427
2428our @ISA = CFPlus::UI::Image::;
2429
2430use CFPlus::OpenGL;
2431
2432my %textures;
2433
2434sub new {
2435 my $class = shift;
2436
2437 my $self = $class->SUPER::new (
2438 padding_x => 4,
2439 padding_y => 4,
2440 fg => [1, 1, 1],
2441 active_fg => [0, 0, 1],
2442 can_hover => 1,
2443 align => 0,
2444 valign => 0,
2445 can_events => 1,
2446 @_
2447 );
2448}
2449
2450sub invoke_button_up {
2451 my ($self, $ev, $x, $y) = @_;
2452
2453 $self->emit ("activate")
2454 if $x >= 0 && $x < $self->{w}
2455 && $y >= 0 && $y < $self->{h};
2456
2457 1
2458}
2459
2460#############################################################################
2461
1974package CFClient::UI::VGauge; 2462package CFPlus::UI::VGauge;
1975 2463
1976our @ISA = CFClient::UI::Base::; 2464our @ISA = CFPlus::UI::Base::;
1977 2465
1978use List::Util qw(min max); 2466use List::Util qw(min max);
1979 2467
1980use CFClient::OpenGL; 2468use CFPlus::OpenGL;
1981 2469
1982my %tex = ( 2470my %tex = (
1983 food => [ 2471 food => [
1984 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2472 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1985 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2473 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1986 ], 2474 ],
1987 grace => [ 2475 grace => [
1988 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2476 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1989 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2477 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1990 ], 2478 ],
1991 hp => [ 2479 hp => [
1992 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2480 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1993 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2481 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1994 ], 2482 ],
1995 mana => [ 2483 mana => [
1996 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2484 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1997 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2485 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1998 ], 2486 ],
1999); 2487);
2000 2488
2001# eg. VGauge->new (gauge => 'food'), default gauge: food 2489# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2061 my $ycut1 = max 0, min 1, $ycut; 2549 my $ycut1 = max 0, min 1, $ycut;
2062 my $ycut2 = max 0, min 1, $ycut - 1; 2550 my $ycut2 = max 0, min 1, $ycut - 1;
2063 2551
2064 my $h1 = $self->{h} * (1 - $ycut1); 2552 my $h1 = $self->{h} * (1 - $ycut1);
2065 my $h2 = $self->{h} * (1 - $ycut2); 2553 my $h2 = $self->{h} * (1 - $ycut2);
2554 my $h3 = $self->{h};
2555
2556 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2066 2557
2067 glEnable GL_BLEND; 2558 glEnable GL_BLEND;
2068 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2559 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2560 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2069 glEnable GL_TEXTURE_2D; 2561 glEnable GL_TEXTURE_2D;
2070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2562 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2071 2563
2072 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2564 glBindTexture GL_TEXTURE_2D, $t1->{name};
2073 glBegin GL_QUADS; 2565 glBegin GL_QUADS;
… …
2088 2580
2089 if ($t3) { 2581 if ($t3) {
2090 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2582 glBindTexture GL_TEXTURE_2D, $t3->{name};
2091 glBegin GL_QUADS; 2583 glBegin GL_QUADS;
2092 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2584 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2093 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2585 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2094 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2586 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2095 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2587 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2096 glEnd; 2588 glEnd;
2097 } 2589 }
2098 2590
2099 glDisable GL_BLEND; 2591 glDisable GL_BLEND;
2100 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2101} 2593}
2102 2594
2103############################################################################# 2595#############################################################################
2104 2596
2105package CFClient::UI::Gauge; 2597package CFPlus::UI::Gauge;
2106 2598
2107our @ISA = CFClient::UI::VBox::; 2599our @ISA = CFPlus::UI::VBox::;
2108 2600
2109sub new { 2601sub new {
2110 my ($class, %arg) = @_; 2602 my ($class, %arg) = @_;
2111 2603
2112 my $self = $class->SUPER::new ( 2604 my $self = $class->SUPER::new (
… …
2114 can_hover => 1, 2606 can_hover => 1,
2115 can_events => 1, 2607 can_events => 1,
2116 %arg, 2608 %arg,
2117 ); 2609 );
2118 2610
2119 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2611 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2120 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2612 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2121 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2613 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2122 2614
2123 $self 2615 $self
2124} 2616}
2125 2617
2126sub set_fontsize { 2618sub set_fontsize {
… …
2147 $self->{value}->set_text ($val); 2639 $self->{value}->set_text ($val);
2148} 2640}
2149 2641
2150############################################################################# 2642#############################################################################
2151 2643
2152package CFClient::UI::Slider; 2644package CFPlus::UI::Slider;
2153 2645
2154use strict; 2646use strict;
2155 2647
2156use CFClient::OpenGL; 2648use CFPlus::OpenGL;
2157 2649
2158our @ISA = CFClient::UI::DrawBG::; 2650our @ISA = CFPlus::UI::DrawBG::;
2159 2651
2160my @tex = 2652my @tex =
2161 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2162 qw(s1_slider.png s1_slider_bg.png); 2654 qw(s1_slider.png s1_slider_bg.png);
2163 2655
2164sub new { 2656sub new {
2165 my $class = shift; 2657 my $class = shift;
2166 2658
… …
2187 $self->update; 2679 $self->update;
2188 2680
2189 $self 2681 $self
2190} 2682}
2191 2683
2192sub changed { }
2193
2194sub set_range { 2684sub set_range {
2195 my ($self, $range) = @_; 2685 my ($self, $range) = @_;
2196 2686
2197 ($range, $self->{range}) = ($self->{range}, $range); 2687 ($range, $self->{range}) = ($self->{range}, $range);
2198 2688
2199 $self->update
2200 if "@$range" ne "@{$self->{range}}"; 2689 if ("@$range" ne "@{$self->{range}}") {
2690 $self->update;
2691 $self->set_value ($self->{range}[0]);
2692 }
2201} 2693}
2202 2694
2203sub set_value { 2695sub set_value {
2204 my ($self, $value) = @_; 2696 my ($self, $value) = @_;
2205 2697
… …
2216 if $unit; 2708 if $unit;
2217 2709
2218 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2710 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2219 2711
2220 if ($value != $old_value) { 2712 if ($value != $old_value) {
2221 $self->_emit (changed => $value); 2713 $self->emit (changed => $value);
2222 $self->update; 2714 $self->update;
2223 } 2715 }
2224} 2716}
2225 2717
2226sub size_request { 2718sub size_request {
2227 my ($self) = @_; 2719 my ($self) = @_;
2228 2720
2229 ($self->{req_w}, $self->{req_h}) 2721 ($self->{req_w}, $self->{req_h})
2230} 2722}
2231 2723
2232sub button_down { 2724sub invoke_button_down {
2233 my ($self, $ev, $x, $y) = @_; 2725 my ($self, $ev, $x, $y) = @_;
2234 2726
2235 $self->SUPER::button_down ($ev, $x, $y); 2727 $self->SUPER::invoke_button_down ($ev, $x, $y);
2236 2728
2237 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2729 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238 2730
2239 $self->mouse_motion ($ev, $x, $y); 2731 $self->invoke_mouse_motion ($ev, $x, $y)
2240} 2732}
2241 2733
2242sub mouse_motion { 2734sub invoke_mouse_motion {
2243 my ($self, $ev, $x, $y) = @_; 2735 my ($self, $ev, $x, $y) = @_;
2244 2736
2245 if ($GRAB == $self) { 2737 if ($GRAB == $self) {
2246 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2738 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2247 2739
2248 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2740 my (undef, $lo, $hi, $page) = @{$self->{range}};
2249 2741
2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2742 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251 2743
2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2744 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2745 } else {
2746 return 0;
2747 }
2748
2253 } 2749 1
2750}
2751
2752sub invoke_mouse_wheel {
2753 my ($self, $ev) = @_;
2754
2755 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2756
2757 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2758
2759 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2760
2761 ! ! $delta
2254} 2762}
2255 2763
2256sub update { 2764sub update {
2257 my ($self) = @_; 2765 my ($self) = @_;
2258 2766
2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2767 delete $self->{knob_w};
2768 $self->SUPER::update;
2769}
2770
2771sub _draw {
2772 my ($self) = @_;
2773
2774 unless ($self->{knob_w}) {
2260 $self->set_value ($self->{range}[0]); 2775 $self->set_value ($self->{range}[0]);
2261 2776
2262 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2777 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100; 2778 my $range = ($hi - $page - $lo) || 1e-100;
2264 2779
… …
2270 $value = ($value - $lo) / $range; 2785 $value = ($value - $lo) / $range;
2271 $value = $value * $self->{scale} + $self->{offset}; 2786 $value = $value * $self->{scale} + $self->{offset};
2272 2787
2273 $self->{knob_x} = $value - $knob_w * 0.5; 2788 $self->{knob_x} = $value - $knob_w * 0.5;
2274 $self->{knob_w} = $knob_w; 2789 $self->{knob_w} = $knob_w;
2275 }); 2790 }
2276
2277 $self->SUPER::update;
2278}
2279
2280sub _draw {
2281 my ($self) = @_;
2282 2791
2283 $self->SUPER::_draw (); 2792 $self->SUPER::_draw ();
2284 2793
2285 glScale $self->{w}, $self->{h}; 2794 glScale $self->{w}, $self->{h};
2286 2795
… …
2306 glDisable GL_TEXTURE_2D; 2815 glDisable GL_TEXTURE_2D;
2307} 2816}
2308 2817
2309############################################################################# 2818#############################################################################
2310 2819
2311package CFClient::UI::ValSlider; 2820package CFPlus::UI::ValSlider;
2312 2821
2313our @ISA = CFClient::UI::HBox::; 2822our @ISA = CFPlus::UI::HBox::;
2314 2823
2315sub new { 2824sub new {
2316 my ($class, %arg) = @_; 2825 my ($class, %arg) = @_;
2317 2826
2318 my $range = delete $arg{range}; 2827 my $range = delete $arg{range};
2319 2828
2320 my $self = $class->SUPER::new ( 2829 my $self = $class->SUPER::new (
2321 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2830 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2322 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2831 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2323 to_value => sub { shift }, 2832 to_value => sub { shift },
2324 from_value => sub { shift }, 2833 from_value => sub { shift },
2325 %arg, 2834 %arg,
2326 ); 2835 );
2327 2836
… …
2347sub set_range { shift->{slider}->set_range (@_) } 2856sub set_range { shift->{slider}->set_range (@_) }
2348sub set_value { shift->{slider}->set_value (@_) } 2857sub set_value { shift->{slider}->set_value (@_) }
2349 2858
2350############################################################################# 2859#############################################################################
2351 2860
2352package CFClient::UI::TextView; 2861package CFPlus::UI::TextScroller;
2353 2862
2354our @ISA = CFClient::UI::HBox::; 2863our @ISA = CFPlus::UI::HBox::;
2355 2864
2356use CFClient::OpenGL; 2865use CFPlus::OpenGL;
2357 2866
2358sub new { 2867sub new {
2359 my $class = shift; 2868 my $class = shift;
2360 2869
2361 my $self = $class->SUPER::new ( 2870 my $self = $class->SUPER::new (
2362 fontsize => 1, 2871 fontsize => 1,
2363 can_events => 0, 2872 can_events => 1,
2873 indent => 0,
2364 #font => default_font 2874 #font => default_font
2365 @_, 2875 @_,
2366 2876
2367 layout => (new CFClient::Layout 1), 2877 layout => (new CFPlus::Layout),
2368 par => [], 2878 par => [],
2879 max_par => 0,
2369 height => 0, 2880 height => 0,
2370 children => [ 2881 children => [
2371 (new CFClient::UI::Empty expand => 1), 2882 (new CFPlus::UI::Empty expand => 1),
2372 (new CFClient::UI::Slider vertical => 1), 2883 (new CFPlus::UI::Slider vertical => 1),
2373 ], 2884 ],
2374 ); 2885 );
2375 2886
2376 $self->{children}[1]->connect (changed => sub { $self->update }); 2887 $self->{children}[1]->connect (changed => sub { $self->update });
2377 2888
… …
2383 2894
2384 $self->{fontsize} = $fontsize; 2895 $self->{fontsize} = $fontsize;
2385 $self->reflow; 2896 $self->reflow;
2386} 2897}
2387 2898
2899sub size_request {
2900 my ($self) = @_;
2901
2902 my ($empty, $slider) = @{ $self->{children} };
2903
2904 local $self->{children} = [$empty, $slider];
2905 $self->SUPER::size_request
2906}
2907
2388sub size_allocate { 2908sub invoke_size_allocate {
2389 my ($self, $w, $h) = @_; 2909 my ($self, $w, $h) = @_;
2390 2910
2391 $self->SUPER::size_allocate ($w, $h); 2911 my ($empty, $slider, @other) = @{ $self->{children} };
2912 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2392 2913
2393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2914 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2915 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w}); 2916 $self->{layout}->set_width ($empty->{w});
2917 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396 2918
2397 $self->reflow; 2919 $self->reflow;
2398}
2399 2920
2400sub text_size { 2921 local $self->{children} = [$empty, $slider];
2922 $self->SUPER::invoke_size_allocate ($w, $h)
2923}
2924
2925sub invoke_mouse_wheel {
2401 my ($self, $text, $indent) = @_; 2926 my ($self, $ev) = @_;
2927
2928 return 0 unless $ev->{dy}; # only vertical movements
2929
2930 $self->{children}[1]->emit (mouse_wheel => $ev);
2931
2932 1
2933}
2934
2935sub get_layout {
2936 my ($self, $para) = @_;
2402 2937
2403 my $layout = $self->{layout}; 2938 my $layout = $self->{layout};
2404 2939
2940 $layout->set_font ($self->{font}) if $self->{font};
2941 $layout->set_foreground (@{$para->{fg}});
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2942 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent); 2943 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2944 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407 $layout->set_markup ($text); 2945 $layout->set_markup ($para->{markup});
2946
2947 $layout->set_shapes (
2948 map
2949 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2950 @{$para->{widget}}
2408 2951 );
2952
2409 $layout->size 2953 $layout
2410} 2954}
2411 2955
2412sub reflow { 2956sub reflow {
2413 my ($self) = @_; 2957 my ($self) = @_;
2414 2958
… …
2421 2965
2422 # todo: base offset on lines or so, not on pixels 2966 # todo: base offset on lines or so, not on pixels
2423 $self->{children}[1]->set_value ($offset); 2967 $self->{children}[1]->set_value ($offset);
2424} 2968}
2425 2969
2970sub current_paragraph {
2971 my ($self) = @_;
2972
2973 $self->{top_paragraph} - 1
2974}
2975
2976sub scroll_to {
2977 my ($self, $para) = @_;
2978
2979 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2980
2981 $self->{scroll_to} = $para;
2982 $self->update;
2983}
2984
2426sub clear { 2985sub clear {
2427 my ($self) = @_; 2986 my ($self) = @_;
2987
2988 my (undef, undef, @other) = @{ $self->{children} };
2989 $self->remove ($_) for @other;
2428 2990
2429 $self->{par} = []; 2991 $self->{par} = [];
2430 $self->{height} = 0; 2992 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2993 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432} 2994}
2433 2995
2434sub add_paragraph { 2996sub add_paragraph {
2435 my ($self, $color, $text, $indent) = @_; 2997 my $self = shift;
2436 2998
2437 for my $line (split /\n/, $text) { 2999 for my $para (@_) {
2438 my ($w, $h) = $self->text_size ($line); 3000 $para = {
3001 fg => [1, 1, 1, 1],
3002 indent => 0,
3003 markup => "",
3004 widget => [],
3005 ref $para ? %$para : (markup => $para),
3006 w => 1e10,
3007 wrapped => 1,
3008 };
3009
3010 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3011 push @{$self->{par}}, $para;
3012 }
3013
3014 if (my $max = $self->{max_par}) {
3015 shift @{$self->{par}} while @{$self->{par}} > $max;
3016 }
3017
3018 $self->{need_reflow}++;
3019 $self->update;
3020}
3021
3022sub scroll_to_bottom {
3023 my ($self) = @_;
3024
3025 $self->{scroll_to} = $#{$self->{par}};
3026 $self->update;
3027}
3028
3029sub force_uptodate {
3030 my ($self) = @_;
3031
3032 if (delete $self->{need_reflow}) {
3033 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3034
3035 my $height = 0;
3036
3037 for my $para (@{$self->{par}}) {
3038 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3039 my $layout = $self->get_layout ($para);
3040 my ($w, $h) = $layout->size;
3041
3042 $para->{w} = $w + $para->{indent};
3043 $para->{h} = $h;
3044 $para->{wrapped} = $layout->has_wrapped;
3045 }
3046
3047 $para->{y} = $height;
3048 $height += $para->{h};
3049 }
3050
2439 $self->{height} += $h; 3051 $self->{height} = $height;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3052 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2441 }
2442 3053
2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3054 delete $self->{texture};
3055 }
3056
3057 if (my $paridx = delete $self->{scroll_to}) {
3058 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3059 }
2444} 3060}
2445 3061
2446sub update { 3062sub update {
2447 my ($self) = @_; 3063 my ($self) = @_;
2448 3064
… …
2450 3066
2451 return unless $self->{h} > 0; 3067 return unless $self->{h} > 0;
2452 3068
2453 delete $self->{texture}; 3069 delete $self->{texture};
2454 3070
2455 $ROOT->on_post_alloc ($self, sub { 3071 $ROOT->on_post_alloc ($self => sub {
3072 $self->force_uptodate;
3073
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3074 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457 3075
2458 if (delete $self->{need_reflow}) {
2459 my $height = 0;
2460
2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2465 for (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467 $layout->set_width ($W - $_->[3]);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3];
2471 $_->[1] = $h;
2472 }
2473
2474 $height += $_->[1];
2475 }
2476
2477 $self->{height} = $height;
2478
2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2480
2481 delete $self->{texture};
2482 }
2483
2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3076 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2485 glClearColor 0.5, 0.5, 0.5, 0; 3077 glClearColor 0, 0, 0, 0;
2486 glClear GL_COLOR_BUFFER_BIT; 3078 glClear GL_COLOR_BUFFER_BIT;
2487 3079
3080 package CFPlus::UI::Base;
3081 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3082 (0, 0, $self->{w}, $self->{h});
3083
3084 my $top = int $self->{children}[1]{range}[0];
3085
3086 my $paridx = 0;
3087 my $top_paragraph;
2488 my $top = int $self->{children}[1]{range}[0]; 3088 my $top = int $self->{children}[1]{range}[0];
2489 3089
2490 my $y0 = $top; 3090 my $y0 = $top;
2491 my $y1 = $top + $H; 3091 my $y1 = $top + $H;
2492 3092
2493 my $y = 0;
2494
2495 my $layout = $self->{layout};
2496
2497 $layout->set_font ($self->{font}) if $self->{font};
2498
2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2502
2503 for my $par (@{$self->{par}}) { 3093 for my $para (@{$self->{par}}) {
2504 my $h = $par->[1]; 3094 my $h = $para->{h};
3095 my $y = $para->{y};
2505 3096
2506 if ($y0 < $y + $h && $y < $y1) { 3097 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] }); 3098 my $layout = $self->get_layout ($para);
2508 $layout->set_width ($W - $par->[3]);
2509 $layout->set_markup ($par->[4]);
2510 3099
2511 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3100 $layout->render ($para->{indent}, $y - $y0);
2512 3101
2513 glRasterPos $par->[3], $y - $y0; 3102 if (my @w = @{ $para->{widget} }) {
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3103 my @s = $layout->get_shapes;
3104
3105 for (@w) {
3106 my ($dx, $dy) = splice @s, 0, 2, ();
3107
3108 $_->{x} = $dx + $para->{indent};
3109 $_->{y} = $dy + $y - $y0;
3110
3111 $_->draw;
3112 }
3113 }
2515 } 3114 }
2516 3115
2517 $y += $h; 3116 $paridx++;
3117 $top_paragraph ||= $paridx if $y >= $top;
2518 } 3118 }
2519 3119
2520 glDisable GL_BLEND; 3120 $self->{top_paragraph} = $top_paragraph;
2521 }; 3121 };
2522 }); 3122 });
2523} 3123}
2524 3124
3125sub reconfigure {
3126 my ($self) = @_;
3127
3128 $self->SUPER::reconfigure;
3129
3130 $_->{w} = 1e10 for @{ $self->{par} };
3131 $self->reflow;
3132}
3133
2525sub _draw { 3134sub _draw {
2526 my ($self) = @_; 3135 my ($self) = @_;
2527 3136
2528 glEnable GL_TEXTURE_2D; 3137 glEnable GL_TEXTURE_2D;
2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3138 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1; 3139 glColor 0, 0, 0, 1;
2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3140 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532 glDisable GL_TEXTURE_2D; 3141 glDisable GL_TEXTURE_2D;
2533 3142
2534 $self->{children}[1]->draw; 3143 $self->{children}[1]->draw;
2535
2536} 3144}
2537 3145
2538############################################################################# 3146#############################################################################
2539 3147
2540package CFClient::UI::Animator; 3148package CFPlus::UI::Animator;
2541 3149
2542use CFClient::OpenGL; 3150use CFPlus::OpenGL;
2543 3151
2544our @ISA = CFClient::UI::Bin::; 3152our @ISA = CFPlus::UI::Bin::;
2545 3153
2546sub moveto { 3154sub moveto {
2547 my ($self, $x, $y) = @_; 3155 my ($self, $x, $y) = @_;
2548 3156
2549 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3157 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2577 glPopMatrix; 3185 glPopMatrix;
2578} 3186}
2579 3187
2580############################################################################# 3188#############################################################################
2581 3189
2582package CFClient::UI::Flopper; 3190package CFPlus::UI::Flopper;
2583 3191
2584our @ISA = CFClient::UI::Button::; 3192our @ISA = CFPlus::UI::Button::;
2585 3193
2586sub new { 3194sub new {
2587 my $class = shift; 3195 my $class = shift;
2588 3196
2589 my $self = $class->SUPER::new ( 3197 my $self = $class->SUPER::new (
… …
2601 $self->{other}->toggle_visibility; 3209 $self->{other}->toggle_visibility;
2602} 3210}
2603 3211
2604############################################################################# 3212#############################################################################
2605 3213
2606package CFClient::UI::Tooltip; 3214package CFPlus::UI::Tooltip;
2607 3215
2608our @ISA = CFClient::UI::Bin::; 3216our @ISA = CFPlus::UI::Bin::;
2609 3217
2610use CFClient::OpenGL; 3218use CFPlus::OpenGL;
2611 3219
2612sub new { 3220sub new {
2613 my $class = shift; 3221 my $class = shift;
2614 3222
2615 $class->SUPER::new ( 3223 $class->SUPER::new (
… …
2618 ) 3226 )
2619} 3227}
2620 3228
2621sub set_tooltip_from { 3229sub set_tooltip_from {
2622 my ($self, $widget) = @_; 3230 my ($self, $widget) = @_;
3231
3232 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3233 if $widget->{tooltip} =~ /^#(.*)$/;
2623 3234
2624 my $tooltip = $widget->{tooltip}; 3235 my $tooltip = $widget->{tooltip};
2625 3236
2626 if ($ENV{CFPLUS_DEBUG} & 2) { 3237 if ($ENV{CFPLUS_DEBUG} & 2) {
2627 $tooltip .= "\n\n" . (ref $widget) . "\n" 3238 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3239 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n" 3240 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}"; 3241 . "visible $widget->{visible}";
2631 } 3242 }
2632 3243
3244 $tooltip =~ s/^\n+//;
3245 $tooltip =~ s/\n+$//;
3246
2633 $self->add (new CFClient::UI::Label 3247 $self->add (new CFPlus::UI::Label
2634 markup => $tooltip, 3248 markup => $tooltip,
2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3249 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2636 fontsize => 0.8, 3250 fontsize => 0.8,
2637 fg => [0, 0, 0, 1], 3251 style => 1, # FLAG_INVERSE
2638 ellipsise => 0, 3252 ellipsise => 0,
2639 font => ($widget->{tooltip_font} || $::FONT_PROP), 3253 font => ($widget->{tooltip_font} || $::FONT_PROP),
2640 ); 3254 );
2641} 3255}
2642 3256
… …
2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3260 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2647 3261
2648 ($w + 4, $h + 4) 3262 ($w + 4, $h + 4)
2649} 3263}
2650 3264
2651sub size_allocate { 3265sub invoke_size_allocate {
2652 my ($self, $w, $h) = @_; 3266 my ($self, $w, $h) = @_;
2653 3267
2654 $self->SUPER::size_allocate ($w - 4, $h - 4); 3268 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2655} 3269}
2656 3270
2657sub visibility_change { 3271sub invoke_visibility_change {
2658 my ($self, $visible) = @_; 3272 my ($self, $visible) = @_;
2659 3273
2660 return unless $visible; 3274 return unless $visible;
2661 3275
2662 $self->{root}->on_post_alloc ("move_$self" => sub { 3276 $self->{root}->on_post_alloc ("move_$self" => sub {
2663 my $widget = $self->{owner} 3277 my $widget = $self->{owner}
2664 or return; 3278 or return;
2665 3279
3280 if ($widget->{visible}) {
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3281 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667 3282
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3283 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH; 3284 if $x + $self->{w} > $self->{root}{w};
2670 3285
2671 $self->move_abs ($x, $y); 3286 $self->move_abs ($x, $y);
3287 } else {
3288 $self->hide;
3289 }
2672 }); 3290 });
2673} 3291}
2674 3292
2675sub _draw { 3293sub _draw {
2676 my ($self) = @_; 3294 my ($self) = @_;
… …
2700 $self->SUPER::_draw; 3318 $self->SUPER::_draw;
2701} 3319}
2702 3320
2703############################################################################# 3321#############################################################################
2704 3322
2705package CFClient::UI::Face; 3323package CFPlus::UI::Face;
2706 3324
2707our @ISA = CFClient::UI::Base::; 3325our @ISA = CFPlus::UI::DrawBG::;
2708 3326
2709use CFClient::OpenGL; 3327use CFPlus::OpenGL;
2710 3328
2711sub new { 3329sub new {
2712 my $class = shift; 3330 my $class = shift;
2713 3331
2714 my $self = $class->SUPER::new ( 3332 my $self = $class->SUPER::new (
… …
2716 can_events => 0, 3334 can_events => 0,
2717 @_, 3335 @_,
2718 ); 3336 );
2719 3337
2720 if ($self->{anim} && $self->{animspeed}) { 3338 if ($self->{anim} && $self->{animspeed}) {
2721 Scalar::Util::weaken (my $widget = $self); 3339 CFPlus::weaken (my $widget = $self);
2722 3340
2723 $self->{timer} = Event->timer ( 3341 $self->{timer} = Event->timer (
2724 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3342 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2725 hard => 1, 3343 hard => 1,
2726 interval => $self->{animspeed}, 3344 interval => $self->{animspeed},
2727 cb => sub { 3345 cb => sub {
3346 delete $self->{wait_face};
2728 ++$widget->{frame}; 3347 ++$widget->{frame};
2729 $widget->update; 3348 $widget->update;
2730 }, 3349 },
2731 ); 3350 );
2732 } 3351 }
… …
2749sub _draw { 3368sub _draw {
2750 my ($self) = @_; 3369 my ($self) = @_;
2751 3370
2752 return unless $::CONN; 3371 return unless $::CONN;
2753 3372
3373 $self->SUPER::_draw;
3374
2754 my $face; 3375 my $face;
2755 3376
2756 if ($self->{frame}) { 3377 if ($self->{frame}) {
2757 my $anim = $::CONN->{anim}[$self->{anim}]; 3378 my $anim = $::CONN->{anim}[$self->{anim}];
2758 3379
2759 $face = $anim->[ $self->{frame} % @$anim ] 3380 $face = $anim->[ $self->{frame} % @$anim ]
2760 if $anim && @$anim; 3381 if $anim && @$anim;
2761 } 3382 }
3383
3384 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3385 or return;
2762 3386
2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3387 my $tex = $::CONN->{texture}[$faceid];
2764 3388
2765 if ($tex) { 3389 if ($tex) {
2766 glEnable GL_TEXTURE_2D; 3390 glEnable GL_TEXTURE_2D;
2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2768 glColor 1, 1, 1, 1; 3392 glColor 0, 0, 0, 1;
2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3393 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2770 glDisable GL_TEXTURE_2D; 3394 glDisable GL_TEXTURE_2D;
3395 } else {
3396 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3397 $self->update;
3398 });
2771 } 3399 }
2772} 3400}
2773 3401
2774sub DESTROY { 3402sub destroy {
2775 my ($self) = @_; 3403 my ($self) = @_;
2776 3404
2777 $self->{timer}->cancel 3405 $self->{timer}->cancel
2778 if $self->{timer}; 3406 if $self->{timer};
2779 3407
2780 $self->SUPER::DESTROY; 3408 $self->SUPER::destroy;
2781} 3409}
2782 3410
2783############################################################################# 3411#############################################################################
2784 3412
2785package CFClient::UI::Inventory; 3413package CFPlus::UI::Buttonbar;
2786 3414
2787our @ISA = CFClient::UI::ScrolledWindow::; 3415our @ISA = CFPlus::UI::HBox::;
2788 3416
2789sub new { 3417# TODO: should actually wrap buttons and other goodies.
2790 my $class = shift;
2791
2792 my $self = $class->SUPER::new (
2793 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2794 @_,
2795 );
2796
2797 $self
2798}
2799
2800sub set_items {
2801 my ($self, $items) = @_;
2802
2803 $self->{scrolled}->clear;
2804 return unless $items;
2805
2806 my @items = sort {
2807 ($a->{type} <=> $b->{type})
2808 or ($a->{name} cmp $b->{name})
2809 } @$items;
2810
2811 $self->{real_items} = \@items;
2812
2813 my $row = 0;
2814 for my $item (@items) {
2815 CFClient::Item::update_widgets $item;
2816
2817 $self->{scrolled}->add (0, $row, $item->{face_widget});
2818 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2819 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2820
2821 $row++;
2822 }
2823}
2824 3418
2825############################################################################# 3419#############################################################################
2826 3420
2827package CFClient::UI::Menu; 3421package CFPlus::UI::Menu;
2828 3422
2829our @ISA = CFClient::UI::FancyFrame::; 3423our @ISA = CFPlus::UI::Toplevel::;
2830 3424
2831use CFClient::OpenGL; 3425use CFPlus::OpenGL;
2832 3426
2833sub new { 3427sub new {
2834 my $class = shift; 3428 my $class = shift;
2835 3429
2836 my $self = $class->SUPER::new ( 3430 my $self = $class->SUPER::new (
2837 items => [], 3431 items => [],
2838 z => 100, 3432 z => 100,
2839 @_, 3433 @_,
2840 ); 3434 );
2841 3435
2842 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3436 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2843 3437
2844 for my $item (@{ $self->{items} }) { 3438 for my $item (@{ $self->{items} }) {
2845 my ($widget, $cb) = @$item; 3439 my ($widget, $cb, $tooltip) = @$item;
2846 3440
2847 # handle various types of items, only text for now 3441 # handle various types of items, only text for now
2848 if (!ref $widget) { 3442 if (!ref $widget) {
3443 if ($widget =~ /\t/) {
3444 my ($left, $right) = split /\t/, $widget, 2;
3445
2849 $widget = new CFClient::UI::Label 3446 $widget = new CFPlus::UI::HBox
2850 can_hover => 1, 3447 can_hover => 1,
2851 can_events => 1, 3448 can_events => 1,
3449 tooltip => $tooltip,
3450 children => [
3451 (new CFPlus::UI::Label markup => $left, expand => 1),
3452 (new CFPlus::UI::Label markup => $right, align => +1),
3453 ],
3454 ;
3455
3456 } else {
3457 $widget = new CFPlus::UI::Label
3458 can_hover => 1,
3459 can_events => 1,
2852 text => $widget; 3460 markup => $widget,
3461 tooltip => $tooltip;
3462 }
2853 } 3463 }
2854 3464
2855 $self->{item}{$widget} = $item; 3465 $self->{item}{$widget} = $item;
2856 3466
2857 $self->{vbox}->add ($widget); 3467 $self->{vbox}->add ($widget);
… …
2862 3472
2863# popup given the event (must be a mouse button down event currently) 3473# popup given the event (must be a mouse button down event currently)
2864sub popup { 3474sub popup {
2865 my ($self, $ev) = @_; 3475 my ($self, $ev) = @_;
2866 3476
2867 $self->_emit ("popdown"); 3477 $self->emit ("popdown");
2868 3478
2869 # maybe save $GRAB? must be careful about events... 3479 # maybe save $GRAB? must be careful about events...
2870 $GRAB = $self; 3480 $GRAB = $self;
2871 $self->{button} = $ev->{button}; 3481 $self->{button} = $ev->{button};
2872 3482
2873 $self->show; 3483 $self->show;
2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3484 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2875} 3485}
2876 3486
2877sub mouse_motion { 3487sub invoke_mouse_motion {
2878 my ($self, $ev, $x, $y) = @_; 3488 my ($self, $ev, $x, $y) = @_;
2879 3489
2880 # TODO: should use vbox->find_widget or so 3490 # TODO: should use vbox->find_widget or so
2881 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3491 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882 $self->{hover} = $self->{item}{$HOVER}; 3492 $self->{hover} = $self->{item}{$HOVER};
2883}
2884 3493
3494 0
3495}
3496
2885sub button_up { 3497sub invoke_button_up {
2886 my ($self, $ev, $x, $y) = @_; 3498 my ($self, $ev, $x, $y) = @_;
2887 3499
2888 if ($ev->{button} == $self->{button}) { 3500 if ($ev->{button} == $self->{button}) {
2889 undef $GRAB; 3501 undef $GRAB;
2890 $self->hide; 3502 $self->hide;
2891 3503
2892 $self->_emit ("popdown"); 3504 $self->emit ("popdown");
2893 $self->{hover}[1]->() if $self->{hover}; 3505 $self->{hover}[1]->() if $self->{hover};
3506 } else {
3507 return 0
3508 }
3509
2894 } 3510 1
2895} 3511}
2896 3512
2897############################################################################# 3513#############################################################################
2898 3514
2899package CFClient::UI::Statusbox; 3515package CFPlus::UI::Multiplexer;
2900 3516
2901our @ISA = CFClient::UI::VBox::; 3517our @ISA = CFPlus::UI::Container::;
2902 3518
2903sub new { 3519sub new {
2904 my $class = shift; 3520 my $class = shift;
2905 3521
2906 $class->SUPER::new ( 3522 my $self = $class->SUPER::new (
3523 @_,
3524 );
3525
3526 $self->{current} = $self->{children}[0]
3527 if @{ $self->{children} };
3528
3529 $self
3530}
3531
3532sub add {
3533 my ($self, @widgets) = @_;
3534
3535 $self->SUPER::add (@widgets);
3536
3537 $self->{current} = $self->{children}[0]
3538 if @{ $self->{children} };
3539}
3540
3541sub get_current_page {
3542 my ($self) = @_;
3543
3544 $self->{current}
3545}
3546
3547sub set_current_page {
3548 my ($self, $page_or_widget) = @_;
3549
3550 my $widget = ref $page_or_widget
3551 ? $page_or_widget
3552 : $self->{children}[$page_or_widget];
3553
3554 $self->{current} = $widget;
3555 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3556
3557 $self->emit (page_changed => $self->{current});
3558
3559 $self->realloc;
3560}
3561
3562sub visible_children {
3563 $_[0]{current}
3564}
3565
3566sub size_request {
3567 my ($self) = @_;
3568
3569 $self->{current}->size_request
3570}
3571
3572sub invoke_size_allocate {
3573 my ($self, $w, $h) = @_;
3574
3575 $self->{current}->configure (0, 0, $w, $h);
3576
3577 1
3578}
3579
3580sub _draw {
3581 my ($self) = @_;
3582
3583 $self->{current}->draw;
3584}
3585
3586#############################################################################
3587
3588package CFPlus::UI::Notebook;
3589
3590our @ISA = CFPlus::UI::VBox::;
3591
3592sub new {
3593 my $class = shift;
3594
3595 my $self = $class->SUPER::new (
3596 buttonbar => (new CFPlus::UI::Buttonbar),
3597 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3598 # filter => # will be put between multiplexer and $self
3599 @_,
3600 );
3601
3602 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3603 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3604
3605 $self
3606}
3607
3608sub add {
3609 my ($self, $title, $widget, $tooltip) = @_;
3610
3611 CFPlus::weaken $self;
3612
3613 $self->{buttonbar}->add (new CFPlus::UI::Button
3614 markup => $title,
3615 tooltip => $tooltip,
3616 on_activate => sub { $self->set_current_page ($widget) },
3617 );
3618
3619 $self->{multiplexer}->add ($widget);
3620}
3621
3622sub get_current_page {
3623 my ($self) = @_;
3624
3625 $self->{multiplexer}->get_current_page
3626}
3627
3628sub set_current_page {
3629 my ($self, $page) = @_;
3630
3631 $self->{multiplexer}->set_current_page ($page);
3632 $self->emit (page_changed => $self->{multiplexer}{current});
3633}
3634
3635#############################################################################
3636
3637package CFPlus::UI::Selector;
3638
3639use utf8;
3640
3641our @ISA = CFPlus::UI::Button::;
3642
3643sub new {
3644 my $class = shift;
3645
3646 my $self = $class->SUPER::new (
3647 options => [], # [value, title, longdesc], ...
3648 value => undef,
3649 @_,
3650 );
3651
3652 $self->_set_value ($self->{value});
3653
3654 $self
3655}
3656
3657sub invoke_button_down {
3658 my ($self, $ev) = @_;
3659
3660 my @menu_items;
3661
3662 for (@{ $self->{options} }) {
3663 my ($value, $title, $tooltip) = @$_;
3664
3665 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3666 }
3667
3668 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3669}
3670
3671sub _set_value {
3672 my ($self, $value) = @_;
3673
3674 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3675 or return;
3676
3677 $self->{value} = $item->[0];
3678 $self->set_markup ("$item->[1] ⇓");
3679 $self->set_tooltip ($item->[2]);
3680}
3681
3682sub set_value {
3683 my ($self, $value) = @_;
3684
3685 return unless $self->{value} ne $value;
3686
3687 $self->_set_value ($value);
3688 $self->emit (changed => $value);
3689}
3690
3691#############################################################################
3692
3693package CFPlus::UI::Statusbox;
3694
3695our @ISA = CFPlus::UI::VBox::;
3696
3697sub new {
3698 my $class = shift;
3699
3700 my $self = $class->SUPER::new (
2907 fontsize => 0.8, 3701 fontsize => 0.8,
2908 @_, 3702 @_,
2909 ) 3703 );
3704
3705 CFPlus::weaken (my $this = $self);
3706
3707 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3708
3709 $self
2910} 3710}
2911 3711
2912sub reorder { 3712sub reorder {
2913 my ($self) = @_; 3713 my ($self) = @_;
2914 my $NOW = time; 3714 my $NOW = Time::HiRes::time;
3715
3716 # freeze display when hovering over any label
3717 return if $CFPlus::UI::TOOLTIP->{owner}
3718 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3719 values %{ $self->{item} };
2915 3720
2916 while (my ($k, $v) = each %{ $self->{item} }) { 3721 while (my ($k, $v) = each %{ $self->{item} }) {
2917 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3722 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2918 } 3723 }
2919 3724
… …
2922 my @items = sort { 3727 my @items = sort {
2923 $a->{pri} <=> $b->{pri} 3728 $a->{pri} <=> $b->{pri}
2924 or $b->{id} <=> $a->{id} 3729 or $b->{id} <=> $a->{id}
2925 } values %{ $self->{item} }; 3730 } values %{ $self->{item} };
2926 3731
3732 $self->{timer}->interval (1);
3733
2927 my $count = 10 + 1; 3734 my $count = 10 + 1;
2928 for my $item (@items) { 3735 for my $item (@items) {
2929 last unless --$count; 3736 last unless --$count;
2930 3737
2931 push @widgets, $item->{label} ||= do { 3738 my $label = $item->{label} ||= do {
2932 # TODO: doesn't handle markup well (read as: at all) 3739 # TODO: doesn't handle markup well (read as: at all)
2933 my $short = $item->{count} > 1 3740 my $short = $item->{count} > 1
2934 ? "<b>$item->{count} ×</b> $item->{text}" 3741 ? "<b>$item->{count} ×</b> $item->{text}"
2935 : $item->{text}; 3742 : $item->{text};
2936 3743
2937 for ($short) { 3744 for ($short) {
2938 s/^\s+//; 3745 s/^\s+//;
2939 s/\s+/ /g; 3746 s/\s+/ /g;
2940 } 3747 }
2941 3748
2942 new CFClient::UI::Label 3749 new CFPlus::UI::Label
2943 markup => $short, 3750 markup => $short,
2944 tooltip => $item->{tooltip}, 3751 tooltip => $item->{tooltip},
2945 tooltip_font => $::FONT_PROP, 3752 tooltip_font => $::FONT_PROP,
2946 tooltip_width => 0.67, 3753 tooltip_width => 0.67,
2947 fontsize => $item->{fontsize} || $self->{fontsize}, 3754 fontsize => $item->{fontsize} || $self->{fontsize},
2948 max_w => $::WIDTH * 0.44, 3755 max_w => $::WIDTH * 0.44,
2949 fg => $item->{fg}, 3756 fg => [@{ $item->{fg} }],
2950 can_events => 1, 3757 can_events => 1,
2951 can_hover => 1 3758 can_hover => 1
2952 }; 3759 };
3760
3761 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3762 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3763 $label->update;
3764 $label->set_max_size (undef, $label->{req_h} * $diff)
3765 if $diff < 1;
3766 $self->{timer}->interval (1/30);
3767 } else {
3768 $label->{fg}[3] = $item->{fg}[3] || 1;
3769 }
3770
3771 push @widgets, $label;
2953 } 3772 }
2954 3773
2955 $self->clear; 3774 $self->clear;
2956 $self->SUPER::add (reverse @widgets); 3775 $self->SUPER::add (reverse @widgets);
2957} 3776}
… …
2962 $text =~ s/^\s+//; 3781 $text =~ s/^\s+//;
2963 $text =~ s/\s+$//; 3782 $text =~ s/\s+$//;
2964 3783
2965 return unless $text; 3784 return unless $text;
2966 3785
2967 my $timeout = time + ((delete $arg{timeout}) || 60); 3786 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2968 3787
2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3788 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2970 3789
2971 if (my $item = $self->{item}{$group}) { 3790 if (my $item = $self->{item}{$group}) {
2972 if ($item->{text} eq $text) { 3791 if ($item->{text} eq $text) {
2973 $item->{count}++; 3792 $item->{count}++;
2974 } else { 3793 } else {
2975 $item->{count} = 1; 3794 $item->{count} = 1;
2976 $item->{text} = $item->{tooltip} = $text; 3795 $item->{text} = $item->{tooltip} = $text;
2977 } 3796 }
2978 $item->{id} = ++$self->{id}; 3797 $item->{id} += 0.2;#d#
2979 $item->{timeout} = $timeout; 3798 $item->{timeout} = $timeout;
2980 delete $item->{label}; 3799 delete $item->{label};
2981 } else { 3800 } else {
2982 $self->{item}{$group} = { 3801 $self->{item}{$group} = {
2983 id => ++$self->{id}, 3802 id => ++$self->{id},
… …
2989 count => 1, 3808 count => 1,
2990 %arg, 3809 %arg,
2991 }; 3810 };
2992 } 3811 }
2993 3812
3813 $ROOT->on_refresh (reorder => sub {
2994 $self->reorder; 3814 $self->reorder;
3815 });
2995} 3816}
2996 3817
2997sub reconfigure { 3818sub reconfigure {
2998 my ($self) = @_; 3819 my ($self) = @_;
2999 3820
… …
3002 3823
3003 $self->reorder; 3824 $self->reorder;
3004 $self->SUPER::reconfigure; 3825 $self->SUPER::reconfigure;
3005} 3826}
3006 3827
3828sub destroy {
3829 my ($self) = @_;
3830
3831 $self->{timer}->cancel;
3832
3833 $self->SUPER::destroy;
3834}
3835
3007############################################################################# 3836#############################################################################
3008 3837
3009package CFClient::UI::Root; 3838package CFPlus::UI::Root;
3010 3839
3011our @ISA = CFClient::UI::Container::; 3840our @ISA = CFPlus::UI::Container::;
3012 3841
3842use List::Util qw(min max);
3843
3013use CFClient::OpenGL; 3844use CFPlus::OpenGL;
3014 3845
3015sub new { 3846sub new {
3016 my $class = shift; 3847 my $class = shift;
3017 3848
3018 my $self = $class->SUPER::new ( 3849 my $self = $class->SUPER::new (
3019 visible => 1, 3850 visible => 1,
3020 @_, 3851 @_,
3021 ); 3852 );
3022 3853
3023 Scalar::Util::weaken ($self->{root} = $self); 3854 CFPlus::weaken ($self->{root} = $self);
3024 3855
3025 $self 3856 $self
3026} 3857}
3027 3858
3028sub size_request { 3859sub size_request {
… …
3043 $coord = $max - $size if $coord > $max - $size; 3874 $coord = $max - $size if $coord > $max - $size;
3044 3875
3045 int $coord + 0.5 3876 int $coord + 0.5
3046} 3877}
3047 3878
3048sub size_allocate { 3879sub invoke_size_allocate {
3049 my ($self, $w, $h) = @_; 3880 my ($self, $w, $h) = @_;
3050 3881
3051 for my $child ($self->children) { 3882 for my $child ($self->children) {
3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3883 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3053 3884
… …
3057 $X = _to_pixel $X, $W, $self->{w}; 3888 $X = _to_pixel $X, $W, $self->{w};
3058 $Y = _to_pixel $Y, $H, $self->{h}; 3889 $Y = _to_pixel $Y, $H, $self->{h};
3059 3890
3060 $child->configure ($X, $Y, $W, $H); 3891 $child->configure ($X, $Y, $W, $H);
3061 } 3892 }
3893
3894 1
3062} 3895}
3063 3896
3064sub coord2local { 3897sub coord2local {
3065 my ($self, $x, $y) = @_; 3898 my ($self, $x, $y) = @_;
3066 3899
… …
3122 $_->() 3955 $_->()
3123 for values %{delete $self->{refresh_hook}}; 3956 for values %{delete $self->{refresh_hook}};
3124 } 3957 }
3125 3958
3126 if ($self->{realloc}) { 3959 if ($self->{realloc}) {
3960 my %queue;
3127 my @queue; 3961 my @queue;
3962 my $widget;
3128 3963
3964 outer:
3129 while () { 3965 while () {
3130 if ($self->{realloc}) { 3966 if (my $realloc = delete $self->{realloc}) {
3131 #TODO use array-of-depth approach 3967 for $widget (values %$realloc) {
3968 $widget->{visible} or next; # do not resize invisible widgets
3132 3969
3133 use sort 'stable'; 3970 $queue{$widget+0}++ and next; # duplicates are common
3134 3971
3135 @queue = sort { $a->{visible} <=> $b->{visible} } 3972 push @{ $queue[$widget->{visible}] }, $widget;
3136 @queue, values %{delete $self->{realloc}}; 3973 }
3137 } 3974 }
3138 3975
3976 while () {
3977 @queue or last outer;
3978
3139 my $widget = pop @queue || last; 3979 $widget = pop @{ $queue[-1] || [] }
3980 and last;
3981
3982 pop @queue;
3983 }
3140 3984
3141 $widget->{visible} or last; # do not resize invisible widgets 3985 delete $queue{$widget+0};
3142 3986
3143 my ($w, $h) = $widget->size_request; 3987 my ($w, $h) = $widget->size_request;
3144 3988
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3989 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3990 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3991
3992 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3993 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3147 3994
3148 $w = $widget->{force_w} if exists $widget->{force_w}; 3995 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h}; 3996 $h = $widget->{force_h} if exists $widget->{force_h};
3150 3997
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3998 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3154 $widget->{req_h} = $h; 4001 $widget->{req_h} = $h;
3155 4002
3156 $self->{size_alloc}{$widget+0} = $widget; 4003 $self->{size_alloc}{$widget+0} = $widget;
3157 4004
3158 if (my $parent = $widget->{parent}) { 4005 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent; 4006 $self->{realloc}{$parent+0} = $parent
3160 #unshift @queue, $parent; 4007 unless $queue{$parent+0};
4008
3161 $parent->{force_size_alloc} = 1; 4009 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent; 4010 $self->{size_alloc}{$parent+0} = $parent;
3163 } 4011 }
3164 } 4012 }
3165 4013
… …
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4025 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3178 4026
3179 $w = 0 if $w < 0; 4027 $w = 0 if $w < 0;
3180 $h = 0 if $h < 0; 4028 $h = 0 if $h < 0;
3181 4029
4030 $w = max $widget->{min_w}, $w;
4031 $h = max $widget->{min_h}, $h;
4032
4033# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4034# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4035
4036 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4037 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4038
3182 $w = int $w + 0.5; 4039 $w = int $w + 0.5;
3183 $h = int $h + 0.5; 4040 $h = int $h + 0.5;
3184 4041
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4042 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4043 $widget->{old_w} = $widget->{w};
4044 $widget->{old_h} = $widget->{h};
4045
3186 $widget->{w} = $w; 4046 $widget->{w} = $w;
3187 $widget->{h} = $h; 4047 $widget->{h} = $h;
3188 4048
3189 $widget->emit (size_allocate => $w, $h); 4049 $widget->emit (size_allocate => $w, $h);
3190 } 4050 }
… …
3205 glLoadIdentity; 4065 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4066 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW; 4067 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity; 4068 glLoadIdentity;
3209 4069
4070 {
4071 package CFPlus::UI::Base;
4072
4073 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4074 (0, 0, $self->{w}, $self->{h});
4075
3210 $self->_draw; 4076 $self->_draw;
4077 }
3211} 4078}
3212 4079
3213############################################################################# 4080#############################################################################
3214 4081
3215package CFClient::UI::BindEditor;
3216
3217our @ISA = CFClient::UI::FancyFrame::;
3218
3219sub new {
3220 my $class = shift;
3221
3222 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3223
3224 $self->add (my $vb = new CFClient::UI::VBox);
3225
3226 $vb->add (my $hb = new CFClient::UI::HBox);
3227 $hb->add (new CFClient::UI::Label text => "Key: ");
3228 $hb->add ($self->{keylbl} = new CFClient::UI::Label);
3229 $hb->add (new CFClient::UI::Button
3230 text => "bind",
3231 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3232 on_activate => sub {
3233 $self->ask_for_bind;
3234 });
3235
3236 $vb->add (new CFClient::UI::Label text => "Actions:");
3237 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3238 text => "start recording",
3239 tooltip => "Start/Stops recording of actions."
3240 ."All subsequent actions after the recording started will be captured."
3241 ."The actions are displayed after the record was stopped."
3242 ."To bind the action you have to click on the 'Bind' button",
3243 on_activate => sub {
3244 unless ($self->{recording}) {
3245 $self->start;
3246 } else {
3247 $self->stop;
3248 }
3249 });
3250
3251 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3252
3253 $vb->add (my $hb = new CFClient::UI::HBox);
3254 $hb->add (new CFClient::UI::Button
3255 text => "ok",
3256 tooltip => "This closes the binding editor and saves the binding",
3257 on_activate => sub {
3258 $self->hide;
3259 $self->commit;
3260 });
3261
3262 $hb->add (new CFClient::UI::Button
3263 text => "cancel",
3264 tooltip => "This closes the binding editor without saving",
3265 on_activate => sub {
3266 $self->hide;
3267 $self->{binding_cancel}->()
3268 if $self->{binding_cancel};
3269 });
3270
3271 $self->update_binding_widgets;
3272
3273 $self
3274}
3275
3276sub commit {
3277 my ($self) = @_;
3278 my ($mod, $sym, $cmds) = $self->get_binding;
3279 if ($sym != 0 && @$cmds > 0) {
3280 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3281 ."'. Don't forget 'Save Config'!");
3282 $self->{binding_change}->($mod, $sym, $cmds)
3283 if $self->{binding_change};
3284 } else {
3285 $::STATUSBOX->add ("No action bound, no keys specified!");
3286 $self->{binding_cancel}->()
3287 if $self->{binding_cancel};
3288 }
3289}
3290
3291sub start {
3292 my ($self) = @_;
3293
3294 $self->{rec_btn}->set_text ("stop recording");
3295 $self->{recording} = 1;
3296 $self->clear_command_list;
3297 $::CONN->start_record if $::CONN;
3298}
3299
3300sub stop {
3301 my ($self) = @_;
3302
3303 $self->{rec_btn}->set_text ("start recording");
3304 $self->{recording} = 0;
3305
3306 my $rec;
3307 $rec = $::CONN->stop_record if $::CONN;
3308 return unless ref $rec eq 'ARRAY';
3309 $self->set_command_list ($rec);
3310}
3311
3312sub ask_for_bind {
3313 my ($self, $commit) = @_;
3314
3315 CFClient::Binder::open_binding_dialog (sub {
3316 my ($mod, $sym) = @_;
3317 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3318 $self->update_binding_widgets;
3319 $self->commit if $commit;
3320 });
3321}
3322
3323sub set_binding {
3324 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3325
3326 $self->clear_command_list;
3327 $self->{recording} = 0;
3328 $self->{rec_btn}->set_text ("start recording");
3329
3330 $self->{binding} = [$mod, $sym];
3331 $self->{commands} = $cmds;
3332
3333 $self->{binding_change} = $cb;
3334 $self->{binding_cancel} = $ccb;
3335
3336 $self->update_binding_widgets;
3337}
3338
3339sub update_binding_widgets {
3340 my ($self) = @_;
3341 my ($mod, $sym, $cmds) = $self->get_binding;
3342 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3343 $self->set_command_list ($cmds);
3344}
3345
3346sub get_binding {
3347 my ($self) = @_;
3348 return (
3349 $self->{binding}->[0],
3350 $self->{binding}->[1],
3351 [ grep { defined $_ } @{$self->{commands}} ]
3352 );
3353}
3354
3355sub clear_command_list {
3356 my ($self) = @_;
3357 $self->{cmdbox}->clear ();
3358}
3359
3360sub set_command_list {
3361 my ($self, $cmds) = @_;
3362
3363 $self->{cmdbox}->clear ();
3364 $self->{commands} = $cmds;
3365
3366 my $idx = 0;
3367
3368 for (@$cmds) {
3369 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3370
3371 my $i = $idx;
3372 $hb->add (new CFClient::UI::Button
3373 text => "delete",
3374 tooltip => "Deletes the action from the record",
3375 on_activate => sub {
3376 $self->{cmdbox}->remove ($hb);
3377 $cmds->[$i] = undef;
3378 });
3379
3380 $hb->add (new CFClient::UI::Label text => $_);
3381
3382 $idx++
3383 }
3384}
3385
3386
3387#############################################################################
3388
3389package CFClient::UI; 4082package CFPlus::UI;
3390 4083
3391$ROOT = new CFClient::UI::Root; 4084$ROOT = new CFPlus::UI::Root;
3392$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4085$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3393 4086
33941 40871
3395 4088

Diff Legend

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