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.259 by root, Tue May 30 07:13:09 2006 UTC vs.
Revision 1.374 by root, Mon Jul 16 12:36:48 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
1084 $self->add ($child) if $child;
951 1085
952 $self 1086 $self
953} 1087}
954 1088
1089#TODO# update range on size_allocate depending on child
1090
1091sub add {
1092 my ($self, $widget) = @_;
1093
1094 $self->{vp}->add ($self->{child} = $widget);
1095}
1096
1097sub invoke_mouse_wheel {
1098 my ($self, $ev) = @_;
1099
1100 return 0 unless $ev->{dy}; # only vertical movements for now
1101
1102 $self->{vslider}->emit (mouse_wheel => $ev);
1103
1104 1
1105}
1106
1107sub update_slider {
1108 my ($self) = @_;
1109
1110 my $child = ($self->{vp} or return)->child;
1111
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114
1115 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) {
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1118 : $self->{hslider}->hide;
1119 }
1120
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) {
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1127 : $self->{vslider}->hide;
1128 }
1129}
1130
955sub update { 1131sub update {
956 my ($self) = @_; 1132 my ($self) = @_;
957 1133
958 $self->SUPER::update; 1134 $self->SUPER::update;
959 1135 $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} 1136}
964 1137
965sub size_allocate { 1138sub invoke_size_allocate {
966 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
967 1140
1141 $self->update_slider;
968 $self->SUPER::size_allocate ($w, $h); 1142 $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} 1143}
973
974#TODO# update range on size_allocate depending on child
975# update viewport offset on scroll
976 1144
977############################################################################# 1145#############################################################################
978 1146
979package CFClient::UI::Frame; 1147package CFPlus::UI::Frame;
980 1148
981our @ISA = CFClient::UI::Bin::; 1149our @ISA = CFPlus::UI::Bin::;
982 1150
983use CFClient::OpenGL; 1151use CFPlus::OpenGL;
984 1152
985sub new { 1153sub new {
986 my $class = shift; 1154 my $class = shift;
987 1155
988 $class->SUPER::new ( 1156 $class->SUPER::new (
… …
996 1164
997 if ($self->{bg}) { 1165 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)}; 1166 my ($w, $h) = @$self{qw(w h)};
999 1167
1000 glEnable GL_BLEND; 1168 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1169 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} }; 1170 glColor_premultiply @{ $self->{bg} };
1003 1171
1004 glBegin GL_QUADS; 1172 glBegin GL_QUADS;
1005 glVertex 0 , 0; 1173 glVertex 0 , 0;
1006 glVertex 0 , $h; 1174 glVertex 0 , $h;
1007 glVertex $w, $h; 1175 glVertex $w, $h;
… …
1014 $self->SUPER::_draw; 1182 $self->SUPER::_draw;
1015} 1183}
1016 1184
1017############################################################################# 1185#############################################################################
1018 1186
1019package CFClient::UI::FancyFrame; 1187package CFPlus::UI::FancyFrame;
1020 1188
1021our @ISA = CFClient::UI::Bin::; 1189our @ISA = CFPlus::UI::Bin::;
1022 1190
1023use CFClient::OpenGL; 1191use CFPlus::OpenGL;
1192
1193sub new {
1194 my ($class, %arg) = @_;
1195
1196 if ((exists $arg{label}) && !ref $arg{label}) {
1197 $arg{label} = new CFPlus::UI::Label
1198 align => 1,
1199 valign => 0,
1200 text => $arg{label},
1201 fontsize => ($arg{border} || 0.8) * 0.75;
1202 }
1203
1204 my $self = $class->SUPER::new (
1205 # label => "",
1206 fg => [0.6, 0.3, 0.1],
1207 border => 0.8,
1208 style => 'single',
1209 %arg,
1210 );
1211
1212 $self
1213}
1214
1215sub add {
1216 my ($self, @widgets) = @_;
1217
1218 $self->SUPER::add (@widgets);
1219 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1220}
1221
1222sub border {
1223 int $_[0]{border} * $::FONTSIZE
1224}
1225
1226sub size_request {
1227 my ($self) = @_;
1228
1229 ($self->{label_w}, undef) = $self->{label}->size_request
1230 if $self->{label};
1231
1232 my ($w, $h) = $self->SUPER::size_request;
1233
1234 (
1235 $w + $self->border * 2,
1236 $h + $self->border * 2,
1237 )
1238}
1239
1240sub invoke_size_allocate {
1241 my ($self, $w, $h) = @_;
1242
1243 my $border = $self->border;
1244
1245 $w -= List::Util::max 0, $border * 2;
1246 $h -= List::Util::max 0, $border * 2;
1247
1248 if (my $label = $self->{label}) {
1249 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1250 $label->{h} = List::Util::min $h, $border;
1251 $label->invoke_size_allocate ($label->{w}, $label->{h});
1252 }
1253
1254 $self->child->configure ($border, $border, $w, $h);
1255
1256 1
1257}
1258
1259sub _draw {
1260 my ($self) = @_;
1261
1262 my $child = $self->{children}[0];
1263
1264 my $border = $self->border;
1265 my ($w, $h) = ($self->{w}, $self->{h});
1266
1267 $child->draw;
1268
1269 glColor @{$self->{fg}};
1270 glBegin GL_LINE_STRIP;
1271 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1272 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1273 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1274 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1275 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1276 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1277 glEnd;
1278
1279 if ($self->{label}) {
1280 glTranslate $border * 2, 0;
1281 $self->{label}->_draw;
1282 }
1283}
1284
1285#############################################################################
1286
1287package CFPlus::UI::Toplevel;
1288
1289our @ISA = CFPlus::UI::Bin::;
1290
1291use CFPlus::OpenGL;
1024 1292
1025my $bg = 1293my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1294 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1; 1295 mipmap => 1, wrap => 1;
1028 1296
1029my @border = 1297my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1298 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); 1299 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032 1300
1033sub new { 1301sub new {
1034 my $class = shift; 1302 my ($class, %arg) = @_;
1035 1303
1036 my $self = $class->SUPER::new ( 1304 my $self = $class->SUPER::new (
1037 bg => [1, 1, 1, 1], 1305 bg => [1, 1, 1, 1],
1038 border_bg => [1, 1, 1, 1], 1306 border_bg => [1, 1, 1, 1],
1039 border => 0.6, 1307 border => 0.6,
1040 can_events => 1, 1308 can_events => 1,
1041 min_w => 16, 1309 min_w => 64,
1042 min_h => 16, 1310 min_h => 32,
1043 @_ 1311 %arg,
1044 ); 1312 );
1045 1313
1046 $self->{title} &&= new CFClient::UI::Label 1314 $self->{title_widget} = new CFPlus::UI::Label
1047 align => 0, 1315 align => 0,
1048 valign => 1, 1316 valign => 1,
1049 text => $self->{title}, 1317 text => $self->{title},
1050 fontsize => $self->{border}; 1318 fontsize => $self->{border},
1319 if exists $self->{title};
1320
1321 if ($self->{has_close_button}) {
1322 $self->{close_button} =
1323 new CFPlus::UI::ImageButton
1324 path => 'x1_close.png',
1325 on_activate => sub { $self->emit ("delete") };
1326
1327 $self->CFPlus::UI::Container::add ($self->{close_button});
1328 }
1051 1329
1052 $self 1330 $self
1331}
1332
1333sub add {
1334 my ($self, @widgets) = @_;
1335
1336 $self->SUPER::add (@widgets);
1337 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1338 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1053} 1339}
1054 1340
1055sub border { 1341sub border {
1056 int $_[0]{border} * $::FONTSIZE 1342 int $_[0]{border} * $::FONTSIZE
1057} 1343}
1058 1344
1059sub size_request { 1345sub size_request {
1060 my ($self) = @_; 1346 my ($self) = @_;
1347
1348 $self->{title_widget}->size_request
1349 if $self->{title_widget};
1350
1351 $self->{close_button}->size_request
1352 if $self->{close_button};
1061 1353
1062 my ($w, $h) = $self->SUPER::size_request; 1354 my ($w, $h) = $self->SUPER::size_request;
1063 1355
1064 ( 1356 (
1065 $w + $self->border * 2, 1357 $w + $self->border * 2,
1066 $h + $self->border * 2, 1358 $h + $self->border * 2,
1067 ) 1359 )
1068} 1360}
1069 1361
1070sub size_allocate { 1362sub invoke_size_allocate {
1071 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1072 1364
1365 if ($self->{title_widget}) {
1366 $self->{title_widget}{w} = $w;
1367 $self->{title_widget}{h} = $h;
1368 $self->{title_widget}->invoke_size_allocate ($w, $h);
1369 }
1370
1371 my $border = $self->border;
1372
1073 $h -= List::Util::max 0, $self->border * 2; 1373 $h -= List::Util::max 0, $border * 2;
1074 $w -= List::Util::max 0, $self->border * 2; 1374 $w -= List::Util::max 0, $border * 2;
1075 1375
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); 1376 $self->child->configure ($border, $border, $w, $h);
1080}
1081 1377
1378 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1379 if $self->{close_button};
1380
1381 1
1382}
1383
1384sub invoke_delete {
1385 my ($self) = @_;
1386
1387 $self->hide;
1388
1389 1
1390}
1391
1082sub button_down { 1392sub invoke_button_down {
1083 my ($self, $ev, $x, $y) = @_; 1393 my ($self, $ev, $x, $y) = @_;
1084 1394
1085 my ($w, $h) = @$self{qw(w h)}; 1395 my ($w, $h) = @$self{qw(w h)};
1086 my $border = $self->border; 1396 my $border = $self->border;
1087 1397
… …
1103 my $dy = $ev->{y} - $oy; 1413 my $dy = $ev->{y} - $oy;
1104 1414
1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1415 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1416 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107 1417
1418 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108 $self->realloc; 1419 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110 }; 1420 };
1111 1421
1112 } elsif ($lr ^ $td) { 1422 } elsif ($lr ^ $td) {
1113 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1423 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114 my ($bx, $by) = ($self->{x}, $self->{y}); 1424 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1117 my ($ev, $x, $y) = @_; 1427 my ($ev, $x, $y) = @_;
1118 1428
1119 ($x, $y) = ($ev->{x}, $ev->{y}); 1429 ($x, $y) = ($ev->{x}, $ev->{y});
1120 1430
1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1431 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1432 # HACK: the next line is required to enforce placement
1433 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122 }; 1434 };
1435 } else {
1436 return 0;
1437 }
1438
1123 } 1439 1
1124} 1440}
1125 1441
1126sub button_up { 1442sub invoke_button_up {
1127 my ($self, $ev, $x, $y) = @_; 1443 my ($self, $ev, $x, $y) = @_;
1128 1444
1129 delete $self->{motion}; 1445 ! ! delete $self->{motion}
1130} 1446}
1131 1447
1132sub mouse_motion { 1448sub invoke_mouse_motion {
1133 my ($self, $ev, $x, $y) = @_; 1449 my ($self, $ev, $x, $y) = @_;
1134 1450
1135 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1451 $self->{motion}->($ev, $x, $y) if $self->{motion};
1452
1453 ! ! $self->{motion}
1454}
1455
1456sub invoke_visibility_change {
1457 my ($self, $visible) = @_;
1458
1459 delete $self->{motion} unless $visible;
1460
1461 0
1136} 1462}
1137 1463
1138sub _draw { 1464sub _draw {
1139 my ($self) = @_; 1465 my ($self) = @_;
1140 1466
1467 my $child = $self->{children}[0];
1468
1141 my ($w, $h ) = ($self->{w}, $self->{h}); 1469 my ($w, $h ) = ($self->{w}, $self->{h});
1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1470 my ($cw, $ch) = ($child->{w}, $child->{h});
1143 1471
1144 glEnable GL_TEXTURE_2D; 1472 glEnable GL_TEXTURE_2D;
1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1473 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146 1474
1147 my $border = $self->border; 1475 my $border = $self->border;
… …
1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1490 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 } 1491 }
1164 1492
1165 glDisable GL_TEXTURE_2D; 1493 glDisable GL_TEXTURE_2D;
1166 1494
1167 $self->{title}->draw if $self->{title};
1168
1169 $self->child->draw; 1495 $child->draw;
1496
1497 if ($self->{title_widget}) {
1498 glTranslate 0, $border - $self->{h};
1499 $self->{title_widget}->_draw;
1500
1501 glTranslate 0, - ($border - $self->{h});
1502 }
1503
1504 $self->{close_button}->draw
1505 if $self->{close_button};
1170} 1506}
1171 1507
1172############################################################################# 1508#############################################################################
1173 1509
1174package CFClient::UI::Table; 1510package CFPlus::UI::Table;
1175 1511
1176our @ISA = CFClient::UI::Base::; 1512our @ISA = CFPlus::UI::Base::;
1177 1513
1178use List::Util qw(max sum); 1514use List::Util qw(max sum);
1179 1515
1180use CFClient::OpenGL; 1516use CFPlus::OpenGL;
1181 1517
1182sub new { 1518sub new {
1183 my $class = shift; 1519 my $class = shift;
1184 1520
1185 $class->SUPER::new ( 1521 $class->SUPER::new (
1522 children => [],
1186 col_expand => [], 1523 col_expand => [],
1524 row_expand => [],
1187 @_, 1525 @_,
1188 ) 1526 )
1189} 1527}
1190 1528
1191sub children { 1529sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1530 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1193} 1531}
1194 1532
1533# TODO: store row/col info in child widget and use standard add/del
1195sub add { 1534sub add {
1196 my ($self, $x, $y, $child) = @_; 1535 my ($self) = shift;
1197 1536
1537 while (@_) {
1538 my ($x, $y, $child) = splice @_, 0, 3, ();
1198 $child->set_parent ($self); 1539 $child->set_parent ($self);
1199 $self->{children}[$y][$x] = $child; 1540 $self->{children}[$y][$x] = $child;
1541 }
1200 1542
1543 $self->{force_realloc} = 1;
1544 $self->{force_size_alloc} = 1;
1201 $self->realloc; 1545 $self->realloc;
1546}
1547
1548sub remove {
1549 my ($self, $child) = @_;
1550
1551 for (@{ $self->{children} }) {
1552 for (@{ $_ || [] }) {
1553 $_ = undef if $_ == $child;
1554 }
1555 }
1202} 1556}
1203 1557
1204# TODO: move to container class maybe? send children a signal on removal? 1558# TODO: move to container class maybe? send children a signal on removal?
1205sub clear { 1559sub clear {
1206 my ($self) = @_; 1560 my ($self) = @_;
… …
1247 (sum @$ws), 1601 (sum @$ws),
1248 (sum @$hs), 1602 (sum @$hs),
1249 ) 1603 )
1250} 1604}
1251 1605
1252sub size_allocate { 1606sub invoke_size_allocate {
1253 my ($self, $w, $h) = @_; 1607 my ($self, $w, $h) = @_;
1254 1608
1255 my ($ws, $hs) = $self->get_wh; 1609 my ($ws, $hs) = $self->get_wh;
1256 1610
1257 my $req_w = (sum @$ws) || 1; 1611 my $req_w = (sum @$ws) || 1;
1258 my $req_h = (sum @$hs) || 1; 1612 my $req_h = (sum @$hs) || 1;
1259 1613
1260 # TODO: nicer code && do row_expand 1614 # TODO: nicer code
1261 my @col_expand = @{$self->{col_expand}}; 1615 my @col_expand = @{$self->{col_expand}};
1262 @col_expand = (1) x @$ws unless @col_expand; 1616 @col_expand = (1) x @$ws unless @col_expand;
1263 my $col_expand = (sum @col_expand) || 1; 1617 my $col_expand = (sum @col_expand) || 1;
1264 1618
1265 # linearly scale sizes
1266 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1619 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1267 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1268 1620
1269 CFClient::UI::harmonize $ws; 1621 CFPlus::UI::harmonize $ws;
1622
1623 my @row_expand = @{$self->{row_expand}};
1624 @row_expand = (1) x @$ws unless @row_expand;
1625 my $row_expand = (sum @row_expand) || 1;
1626
1627 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1628
1270 CFClient::UI::harmonize $hs; 1629 CFPlus::UI::harmonize $hs;
1271 1630
1272 my $y; 1631 my $y;
1273 1632
1274 for my $r (0 .. $#{$self->{children}}) { 1633 for my $r (0 .. $#{$self->{children}}) {
1275 my $row = $self->{children}[$r] 1634 my $row = $self->{children}[$r]
… …
1289 } 1648 }
1290 1649
1291 $y += $row_h; 1650 $y += $row_h;
1292 } 1651 }
1293 1652
1653 1
1294} 1654}
1295 1655
1296sub find_widget { 1656sub find_widget {
1297 my ($self, $x, $y) = @_; 1657 my ($self, $x, $y) = @_;
1298 1658
… …
1317 } 1677 }
1318} 1678}
1319 1679
1320############################################################################# 1680#############################################################################
1321 1681
1322package CFClient::UI::Box; 1682package CFPlus::UI::Fixed;
1323 1683
1684use List::Util qw(min max);
1685
1324our @ISA = CFClient::UI::Container::; 1686our @ISA = CFPlus::UI::Container::;
1687
1688sub add {
1689 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1690
1691 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1692 $self->SUPER::add ($child);
1693}
1694
1695sub _scale($$$) {
1696 my ($mode, $val, $max) = @_;
1697
1698 $mode eq "abs" ? $val
1699 : $mode eq "rel" ? $val * $max
1700 : 0
1701}
1702
1703sub size_request {
1704 my ($self) = @_;
1705
1706 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1707
1708 # determine overall size by querying abs widgets
1709 for my $child ($self->visible_children) {
1710 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1711
1712 if ($pos eq "abs") {
1713 $w = _scale $size, $w, $child->{req_w};
1714 $h = _scale $size, $h, $child->{req_h};
1715
1716 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1717 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1718 }
1719 }
1720
1721 my $W = $x2 - $x1;
1722 my $H = $y2 - $y1;
1723
1724 # now layout remaining widgets
1725 for my $child ($self->visible_children) {
1726 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1727
1728 if ($pos ne "abs") {
1729 $x = _scale $pos, $x, $W;
1730 $y = _scale $pos, $x, $H;
1731 $w = _scale $size, $w, $child->{req_w};
1732 $h = _scale $size, $h, $child->{req_h};
1733
1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1736 }
1737 }
1738
1739 my $W = $x2 - $x1;
1740 my $H = $y2 - $y1;
1741
1742 ($W, $H)
1743}
1744
1745sub invoke_size_allocate {
1746 my ($self, $W, $H) = @_;
1747
1748 for my $child ($self->visible_children) {
1749 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1750
1751 $x = _scale $pos, $x, $W;
1752 $y = _scale $pos, $x, $H;
1753 $w = _scale $size, $w, $child->{req_w};
1754 $h = _scale $size, $h, $child->{req_h};
1755
1756 $child->configure ($x, $y, $w, $h);
1757 }
1758
1759 1
1760}
1761
1762#############################################################################
1763
1764package CFPlus::UI::Box;
1765
1766our @ISA = CFPlus::UI::Container::;
1325 1767
1326sub size_request { 1768sub size_request {
1327 my ($self) = @_; 1769 my ($self) = @_;
1328 1770
1329 $self->{vertical} 1771 $self->{vertical}
… …
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1777 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1778 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 ) 1779 )
1338} 1780}
1339 1781
1340sub size_allocate { 1782sub invoke_size_allocate {
1341 my ($self, $w, $h) = @_; 1783 my ($self, $w, $h) = @_;
1342 1784
1343 my $space = $self->{vertical} ? $h : $w; 1785 my $space = $self->{vertical} ? $h : $w;
1344 my $children = $self->{children}; 1786 my @children = $self->visible_children;
1345 1787
1346 my @req; 1788 my @req;
1347 1789
1348 if ($self->{homogeneous}) { 1790 if ($self->{homogeneous}) {
1349 @req = ($space / (@$children || 1)) x @$children; 1791 @req = ($space / (@children || 1)) x @children;
1350 } else { 1792 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1793 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1352 my $req = List::Util::sum @req; 1794 my $req = List::Util::sum @req;
1353 1795
1354 if ($req > $space) { 1796 if ($req > $space) {
1355 # ah well, not enough space 1797 # ah well, not enough space
1356 $_ *= $space / $req for @req; 1798 $_ *= $space / $req for @req;
1357 } else { 1799 } else {
1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1800 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1359 1801
1360 $space = ($space - $req) / $expand; # remaining space to give away 1802 $space = ($space - $req) / $expand; # remaining space to give away
1361 1803
1362 $req[$_] += $space * $children->[$_]{expand} 1804 $req[$_] += $space * $children[$_]{expand}
1363 for 0 .. $#$children; 1805 for 0 .. $#children;
1364 } 1806 }
1365 } 1807 }
1366 1808
1367 CFClient::UI::harmonize \@req; 1809 CFPlus::UI::harmonize \@req;
1368 1810
1369 my $pos = 0; 1811 my $pos = 0;
1370 for (0 .. $#$children) { 1812 for (0 .. $#children) {
1371 my $alloc = $req[$_]; 1813 my $alloc = $req[$_];
1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1814 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1373 1815
1374 $pos += $alloc; 1816 $pos += $alloc;
1375 } 1817 }
1376 1818
1377 1 1819 1
1378} 1820}
1379 1821
1380############################################################################# 1822#############################################################################
1381 1823
1382package CFClient::UI::HBox; 1824package CFPlus::UI::HBox;
1383 1825
1384our @ISA = CFClient::UI::Box::; 1826our @ISA = CFPlus::UI::Box::;
1385 1827
1386sub new { 1828sub new {
1387 my $class = shift; 1829 my $class = shift;
1388 1830
1389 $class->SUPER::new ( 1831 $class->SUPER::new (
… …
1392 ) 1834 )
1393} 1835}
1394 1836
1395############################################################################# 1837#############################################################################
1396 1838
1397package CFClient::UI::VBox; 1839package CFPlus::UI::VBox;
1398 1840
1399our @ISA = CFClient::UI::Box::; 1841our @ISA = CFPlus::UI::Box::;
1400 1842
1401sub new { 1843sub new {
1402 my $class = shift; 1844 my $class = shift;
1403 1845
1404 $class->SUPER::new ( 1846 $class->SUPER::new (
… …
1407 ) 1849 )
1408} 1850}
1409 1851
1410############################################################################# 1852#############################################################################
1411 1853
1412package CFClient::UI::Label; 1854package CFPlus::UI::Label;
1413 1855
1414our @ISA = CFClient::UI::DrawBG::; 1856our @ISA = CFPlus::UI::DrawBG::;
1415 1857
1416use CFClient::OpenGL; 1858use CFPlus::OpenGL;
1417 1859
1418sub new { 1860sub new {
1419 my ($class, %arg) = @_; 1861 my ($class, %arg) = @_;
1420 1862
1421 my $self = $class->SUPER::new ( 1863 my $self = $class->SUPER::new (
… …
1424 #active_bg => none 1866 #active_bg => none
1425 #font => default_font 1867 #font => default_font
1426 #text => initial text 1868 #text => initial text
1427 #markup => initial narkup 1869 #markup => initial narkup
1428 #max_w => maximum pixel width 1870 #max_w => maximum pixel width
1871 #style => 0, # render flags
1429 ellipsise => 3, # end 1872 ellipsise => 3, # end
1430 layout => (new CFClient::Layout), 1873 layout => (new CFPlus::Layout),
1431 fontsize => 1, 1874 fontsize => 1,
1432 align => -1, 1875 align => -1,
1433 valign => -1, 1876 valign => -1,
1434 padding_x => 2, 1877 padding_x => 2,
1435 padding_y => 2, 1878 padding_y => 2,
1436 can_events => 0, 1879 can_events => 0,
1437 %arg 1880 %arg
1438 ); 1881 );
1439 1882
1440 if (exists $self->{template}) { 1883 if (exists $self->{template}) {
1441 my $layout = new CFClient::Layout; 1884 my $layout = new CFPlus::Layout;
1442 $layout->set_text (delete $self->{template}); 1885 $layout->set_text (delete $self->{template});
1443 $self->{template} = $layout; 1886 $self->{template} = $layout;
1444 } 1887 }
1445 1888
1446 if (exists $self->{markup}) { 1889 if (exists $self->{markup}) {
… …
1450 } 1893 }
1451 1894
1452 $self 1895 $self
1453} 1896}
1454 1897
1455sub escape($) {
1456 local $_ = $_[0];
1457
1458 s/&/&amp;/g;
1459 s/>/&gt;/g;
1460 s/</&lt;/g;
1461
1462 $_
1463}
1464
1465sub update { 1898sub update {
1466 my ($self) = @_; 1899 my ($self) = @_;
1467 1900
1468 delete $self->{texture}; 1901 delete $self->{texture};
1469 $self->SUPER::update; 1902 $self->SUPER::update;
1470} 1903}
1471 1904
1905sub realloc {
1906 my ($self) = @_;
1907
1908 delete $self->{ox};
1909 $self->SUPER::realloc;
1910}
1911
1472sub set_text { 1912sub set_text {
1473 my ($self, $text) = @_; 1913 my ($self, $text) = @_;
1474 1914
1475 return if $self->{text} eq "T$text"; 1915 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text"; 1916 $self->{text} = "T$text";
1477 1917
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479 $self->{layout}->set_text ($text); 1918 $self->{layout}->set_text ($text);
1480 1919
1920 delete $self->{size_req};
1481 $self->realloc; 1921 $self->realloc;
1482 $self->update; 1922 $self->update;
1483} 1923}
1484 1924
1485sub set_markup { 1925sub set_markup {
… …
1488 return if $self->{text} eq "M$markup"; 1928 return if $self->{text} eq "M$markup";
1489 $self->{text} = "M$markup"; 1929 $self->{text} = "M$markup";
1490 1930
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1931 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492 1932
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1494 $self->{layout}->set_markup ($markup); 1933 $self->{layout}->set_markup ($markup);
1495 1934
1935 delete $self->{size_req};
1496 $self->realloc; 1936 $self->realloc;
1497 $self->update; 1937 $self->update;
1498} 1938}
1499 1939
1500sub size_request { 1940sub size_request {
1501 my ($self) = @_; 1941 my ($self) = @_;
1502 1942
1943 $self->{size_req} ||= do {
1503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1944 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1); 1945 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1946 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1947 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1948 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508 1949
1509 my ($w, $h) = $self->{layout}->size; 1950 my ($w, $h) = $self->{layout}->size;
1510 1951
1511 if (exists $self->{template}) { 1952 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font}; 1953 $self->{template}->set_font ($self->{font}) if $self->{font};
1954 $self->{template}->set_width ($self->{max_w} || -1);
1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1955 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514 1956
1515 my ($w2, $h2) = $self->{template}->size; 1957 my ($w2, $h2) = $self->{template}->size;
1516 1958
1517 $w = List::Util::max $w, $w2; 1959 $w = List::Util::max $w, $w2;
1518 $h = List::Util::max $h, $h2; 1960 $h = List::Util::max $h, $h2;
1961 }
1962
1963 [$w, $h]
1519 } 1964 };
1520 1965
1521 ($w, $h) 1966 @{ $self->{size_req} }
1522} 1967}
1523 1968
1969sub baseline_shift {
1970 $_[0]{layout}->descent
1971}
1972
1524sub size_allocate { 1973sub invoke_size_allocate {
1525 my ($self, $w, $h) = @_; 1974 my ($self, $w, $h) = @_;
1526 1975
1976 delete $self->{ox};
1977
1527 delete $self->{texture}; 1978 delete $self->{texture}
1979 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1980
1981 1
1528} 1982}
1529 1983
1530sub set_fontsize { 1984sub set_fontsize {
1531 my ($self, $fontsize) = @_; 1985 my ($self, $fontsize) = @_;
1532 1986
1533 $self->{fontsize} = $fontsize; 1987 $self->{fontsize} = $fontsize;
1988 delete $self->{size_req};
1534 delete $self->{texture}; 1989 delete $self->{texture};
1535 1990
1536 $self->realloc; 1991 $self->realloc;
1537} 1992}
1538 1993
1994sub reconfigure {
1995 my ($self) = @_;
1996
1997 delete $self->{size_req};
1998 delete $self->{texture};
1999
2000 $self->SUPER::reconfigure;
2001}
2002
1539sub _draw { 2003sub _draw {
1540 my ($self) = @_; 2004 my ($self) = @_;
1541 2005
1542 $self->SUPER::_draw; # draw background, if applicable 2006 $self->SUPER::_draw; # draw background, if applicable
1543 2007
1544 my $tex = $self->{texture} ||= do { 2008 my $size = $self->{texture} ||= do {
1545 $self->{layout}->set_foreground (@{$self->{fg}}); 2009 $self->{layout}->set_foreground (@{$self->{fg}});
1546 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2010 $self->{layout}->set_font ($self->{font}) if $self->{font};
1547 $self->{layout}->set_width ($self->{w}); 2011 $self->{layout}->set_width ($self->{w});
1548 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2012 $self->{layout}->set_ellipsise ($self->{ellipsise});
1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2013 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2014 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551 2015
1552 my $tex = new_from_layout CFClient::Texture $self->{layout}; 2016 [$self->{layout}->size]
2017 };
1553 2018
2019 unless (exists $self->{ox}) {
1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2020 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2021 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1556 : ($self->{w} - $tex->{w}) * 0.5); 2022 : ($self->{w} - $size->[0]) * 0.5);
1557 2023
1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2024 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2025 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1560 : ($self->{h} - $tex->{h}) * 0.5); 2026 : ($self->{h} - $size->[1]) * 0.5);
1561
1562 $tex
1563 }; 2027 };
1564 2028
1565 glEnable GL_TEXTURE_2D; 2029 my $w = List::Util::min $self->{w} + 4, $size->[0];
1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2030 my $h = List::Util::min $self->{h} + 2, $size->[1];
1567 2031
1568 if ($tex->{format} == GL_ALPHA) { 2032 $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} 2033}
1577 2034
1578############################################################################# 2035#############################################################################
1579 2036
1580package CFClient::UI::EntryBase; 2037package CFPlus::UI::EntryBase;
1581 2038
1582our @ISA = CFClient::UI::Label::; 2039our @ISA = CFPlus::UI::Label::;
1583 2040
1584use CFClient::OpenGL; 2041use CFPlus::OpenGL;
1585 2042
1586sub new { 2043sub new {
1587 my $class = shift; 2044 my $class = shift;
1588 2045
1589 $class->SUPER::new ( 2046 $class->SUPER::new (
… …
1593 active_fg => [0, 0, 0], 2050 active_fg => [0, 0, 0],
1594 can_hover => 1, 2051 can_hover => 1,
1595 can_focus => 1, 2052 can_focus => 1,
1596 valign => 0, 2053 valign => 0,
1597 can_events => 1, 2054 can_events => 1,
2055 ellipsise => 0,
1598 #text => ... 2056 #text => ...
2057 #hidden => "*",
1599 @_ 2058 @_
1600 ) 2059 )
1601} 2060}
1602 2061
1603sub _set_text { 2062sub _set_text {
… …
1605 2064
1606 delete $self->{cur_h}; 2065 delete $self->{cur_h};
1607 2066
1608 return if $self->{text} eq $text; 2067 return if $self->{text} eq $text;
1609 2068
1610 delete $self->{texture};
1611
1612 $self->{last_activity} = $::NOW; 2069 $self->{last_activity} = $::NOW;
1613 $self->{text} = $text; 2070 $self->{text} = $text;
1614 2071
1615 $text =~ s/./*/g if $self->{hidden}; 2072 $text =~ s/./*/g if $self->{hidden};
1616 $self->{layout}->set_text ("$text "); 2073 $self->{layout}->set_text ("$text ");
2074 delete $self->{size_req};
1617 2075
1618 $self->_emit (changed => $self->{text}); 2076 $self->emit (changed => $self->{text});
2077
2078 $self->realloc;
2079 $self->update;
1619} 2080}
1620 2081
1621sub set_text { 2082sub set_text {
1622 my ($self, $text) = @_; 2083 my ($self, $text) = @_;
1623 2084
1624 $self->{cursor} = length $text; 2085 $self->{cursor} = length $text;
1625 $self->_set_text ($text); 2086 $self->_set_text ($text);
1626
1627 $self->realloc;
1628} 2087}
1629 2088
1630sub get_text { 2089sub get_text {
1631 $_[0]{text} 2090 $_[0]{text}
1632} 2091}
… …
1637 my ($w, $h) = $self->SUPER::size_request; 2096 my ($w, $h) = $self->SUPER::size_request;
1638 2097
1639 ($w + 1, $h) # add 1 for cursor 2098 ($w + 1, $h) # add 1 for cursor
1640} 2099}
1641 2100
1642sub key_down { 2101sub invoke_key_down {
1643 my ($self, $ev) = @_; 2102 my ($self, $ev) = @_;
1644 2103
1645 my $mod = $ev->{mod}; 2104 my $mod = $ev->{mod};
1646 my $sym = $ev->{sym}; 2105 my $sym = $ev->{sym};
1647 my $uni = $ev->{unicode}; 2106 my $uni = $ev->{unicode};
1648 2107
1649 my $text = $self->get_text; 2108 my $text = $self->get_text;
2109
2110 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1650 2111
1651 if ($uni == 8) { 2112 if ($uni == 8) {
1652 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2113 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1653 } elsif ($uni == 127) { 2114 } elsif ($uni == 127) {
1654 substr $text, $self->{cursor}, 1, ""; 2115 substr $text, $self->{cursor}, 1, "";
1655 } elsif ($sym == CFClient::SDLK_LEFT) { 2116 } elsif ($sym == CFPlus::SDLK_LEFT) {
1656 --$self->{cursor} if $self->{cursor}; 2117 --$self->{cursor} if $self->{cursor};
1657 } elsif ($sym == CFClient::SDLK_RIGHT) { 2118 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1658 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2119 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1659 } elsif ($sym == CFClient::SDLK_HOME) { 2120 } elsif ($sym == CFPlus::SDLK_HOME) {
2121 # what a hack
2122 $self->{cursor} =
2123 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2124 ? length $1
2125 : 0;
2126 } elsif ($sym == CFPlus::SDLK_END) {
2127 # uh, again
2128 $self->{cursor} =
2129 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2130 ? $self->{cursor} + length $1
2131 : length $self->{text};
2132 } elsif ($uni == 21) { # ctrl-u
2133 $text = "";
1660 $self->{cursor} = 0; 2134 $self->{cursor} = 0;
1661 } elsif ($sym == CFClient::SDLK_END) {
1662 $self->{cursor} = length $text;
1663 } elsif ($uni == 27) { 2135 } elsif ($uni == 27) {
1664 $self->_emit ('escape'); 2136 $self->emit ('escape');
1665 } elsif ($uni) { 2137 } elsif ($uni == 0x0d) {
2138 substr $text, $self->{cursor}++, 0, "\012";
2139 } elsif ($uni >= 0x20) {
1666 substr $text, $self->{cursor}++, 0, chr $uni; 2140 substr $text, $self->{cursor}++, 0, chr $uni;
2141 } else {
2142 return 0;
1667 } 2143 }
1668 2144
1669 $self->_set_text ($text); 2145 $self->_set_text ($text);
1670 2146
1671 $self->realloc; 2147 $self->realloc;
1672} 2148 $self->update;
1673 2149
2150 1
2151}
2152
1674sub focus_in { 2153sub invoke_focus_in {
1675 my ($self) = @_; 2154 my ($self) = @_;
1676 2155
1677 $self->{last_activity} = $::NOW; 2156 $self->{last_activity} = $::NOW;
1678 2157
1679 $self->SUPER::focus_in; 2158 $self->SUPER::invoke_focus_in
1680} 2159}
1681 2160
1682sub button_down { 2161sub invoke_button_down {
1683 my ($self, $ev, $x, $y) = @_; 2162 my ($self, $ev, $x, $y) = @_;
1684 2163
1685 $self->SUPER::button_down ($ev, $x, $y); 2164 $self->SUPER::invoke_button_down ($ev, $x, $y);
1686 2165
1687 my $idx = $self->{layout}->xy_to_index ($x, $y); 2166 my $idx = $self->{layout}->xy_to_index ($x, $y);
1688 2167
1689 # byte-index to char-index 2168 # byte-index to char-index
1690 my $text = $self->{text}; 2169 my $text = $self->{text};
1691 utf8::encode $text; 2170 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1692 $self->{cursor} = length substr $text, 0, $idx; 2171 $self->{cursor} = length $text;
1693 2172
1694 $self->_set_text ($self->{text}); 2173 $self->_set_text ($self->{text});
1695 $self->update; 2174 $self->update;
2175
2176 1
1696} 2177}
1697 2178
1698sub mouse_motion { 2179sub invoke_mouse_motion {
1699 my ($self, $ev, $x, $y) = @_; 2180 my ($self, $ev, $x, $y) = @_;
1700# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2181# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2182
2183 1
1701} 2184}
1702 2185
1703sub _draw { 2186sub _draw {
1704 my ($self) = @_; 2187 my ($self) = @_;
1705 2188
1706 local $self->{fg} = $self->{fg}; 2189 local $self->{fg} = $self->{fg};
1707 2190
1708 if ($FOCUS == $self) { 2191 if ($FOCUS == $self) {
1709 glColor @{$self->{active_bg}}; 2192 glColor_premultiply @{$self->{active_bg}};
1710 $self->{fg} = $self->{active_fg}; 2193 $self->{fg} = $self->{active_fg};
1711 } else { 2194 } else {
1712 glColor @{$self->{bg}}; 2195 glColor_premultiply @{$self->{bg}};
1713 } 2196 }
1714 2197
1715 glEnable GL_BLEND; 2198 glEnable GL_BLEND;
1716 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2199 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1717 glBegin GL_QUADS; 2200 glBegin GL_QUADS;
1718 glVertex 0 , 0; 2201 glVertex 0 , 0;
1719 glVertex 0 , $self->{h}; 2202 glVertex 0 , $self->{h};
1720 glVertex $self->{w}, $self->{h}; 2203 glVertex $self->{w}, $self->{h};
1721 glVertex $self->{w}, 0; 2204 glVertex $self->{w}, 0;
… …
1732 utf8::encode $text; 2215 utf8::encode $text;
1733 2216
1734 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2217 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1735 } 2218 }
1736 2219
1737 glColor @{$self->{fg}};
1738 glBegin GL_LINES; 2220 glBegin GL_LINES;
1739 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2221 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}; 2222 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1741 glEnd; 2223 glEnd;
1742 } 2224 }
1743} 2225}
1744 2226
2227#############################################################################
2228
1745package CFClient::UI::Entry; 2229package CFPlus::UI::Entry;
1746 2230
1747our @ISA = CFClient::UI::EntryBase::; 2231our @ISA = CFPlus::UI::EntryBase::;
1748 2232
1749use CFClient::OpenGL; 2233use CFPlus::OpenGL;
1750 2234
1751sub key_down { 2235sub invoke_key_down {
1752 my ($self, $ev) = @_; 2236 my ($self, $ev) = @_;
1753 2237
1754 my $sym = $ev->{sym}; 2238 my $sym = $ev->{sym};
1755 2239
1756 if ($sym == 13) { 2240 if ($ev->{uni} == 0x0d || $sym == 13) {
1757 unshift @{$self->{history}}, 2241 unshift @{$self->{history}},
1758 my $txt = $self->get_text; 2242 my $txt = $self->get_text;
2243
1759 $self->{history_pointer} = -1; 2244 $self->{history_pointer} = -1;
1760 $self->{history_saveback} = ''; 2245 $self->{history_saveback} = '';
1761 $self->_emit (activate => $txt); 2246 $self->emit (activate => $txt);
1762 $self->update; 2247 $self->update;
1763 2248
1764 } elsif ($sym == CFClient::SDLK_UP) { 2249 } elsif ($sym == CFPlus::SDLK_UP) {
1765 if ($self->{history_pointer} < 0) { 2250 if ($self->{history_pointer} < 0) {
1766 $self->{history_saveback} = $self->get_text; 2251 $self->{history_saveback} = $self->get_text;
1767 } 2252 }
1768 if (@{$self->{history} || []} > 0) { 2253 if (@{$self->{history} || []} > 0) {
1769 $self->{history_pointer}++; 2254 $self->{history_pointer}++;
… …
1771 $self->{history_pointer} = @{$self->{history} || []} - 1; 2256 $self->{history_pointer} = @{$self->{history} || []} - 1;
1772 } 2257 }
1773 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2258 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1774 } 2259 }
1775 2260
1776 } elsif ($sym == CFClient::SDLK_DOWN) { 2261 } elsif ($sym == CFPlus::SDLK_DOWN) {
1777 $self->{history_pointer}--; 2262 $self->{history_pointer}--;
1778 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2263 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1779 2264
1780 if ($self->{history_pointer} >= 0) { 2265 if ($self->{history_pointer} >= 0) {
1781 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2266 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1782 } else { 2267 } else {
1783 $self->set_text ($self->{history_saveback}); 2268 $self->set_text ($self->{history_saveback});
1784 } 2269 }
1785 2270
1786 } else { 2271 } else {
1787 $self->SUPER::key_down ($ev); 2272 return $self->SUPER::invoke_key_down ($ev)
2273 }
2274
1788 } 2275 1
1789
1790} 2276}
1791 2277
1792############################################################################# 2278#############################################################################
1793 2279
2280package CFPlus::UI::TextEdit;
2281
2282our @ISA = CFPlus::UI::EntryBase::;
2283
2284use CFPlus::OpenGL;
2285
2286sub move_cursor_ver {
2287 my ($self, $dy) = @_;
2288
2289 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2290
2291 $y += $dy;
2292
2293 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2294 $self->{cursor} = $index;
2295 delete $self->{cur_h};
2296 $self->update;
2297 return;
2298 }
2299}
2300
2301sub invoke_key_down {
2302 my ($self, $ev) = @_;
2303
2304 my $sym = $ev->{sym};
2305
2306 if ($sym == CFPlus::SDLK_UP) {
2307 $self->move_cursor_ver (-1);
2308 } elsif ($sym == CFPlus::SDLK_DOWN) {
2309 $self->move_cursor_ver (+1);
2310 } else {
2311 return $self->SUPER::invoke_key_down ($ev)
2312 }
2313
2314 1
2315}
2316
2317#############################################################################
2318
1794package CFClient::UI::Button; 2319package CFPlus::UI::Button;
1795 2320
1796our @ISA = CFClient::UI::Label::; 2321our @ISA = CFPlus::UI::Label::;
1797 2322
1798use CFClient::OpenGL; 2323use CFPlus::OpenGL;
1799 2324
1800my @tex = 2325my @tex =
1801 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2326 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1802 qw(b1_button_active.png); 2327 qw(b1_button_active.png);
1803 2328
1804sub new { 2329sub new {
1805 my $class = shift; 2330 my $class = shift;
1806 2331
… …
1815 can_events => 1, 2340 can_events => 1,
1816 @_ 2341 @_
1817 ) 2342 )
1818} 2343}
1819 2344
1820sub activate { }
1821
1822sub button_up { 2345sub invoke_button_up {
1823 my ($self, $ev, $x, $y) = @_; 2346 my ($self, $ev, $x, $y) = @_;
1824 2347
1825 $self->emit ("activate") 2348 $self->emit ("activate")
1826 if $x >= 0 && $x < $self->{w} 2349 if $x >= 0 && $x < $self->{w}
1827 && $y >= 0 && $y < $self->{h}; 2350 && $y >= 0 && $y < $self->{h};
2351
2352 1
1828} 2353}
1829 2354
1830sub _draw { 2355sub _draw {
1831 my ($self) = @_; 2356 my ($self) = @_;
1832 2357
1833 local $self->{fg} = $self->{fg}; 2358 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1834
1835 if ($GRAB == $self) {
1836 $self->{fg} = $self->{active_fg};
1837 }
1838 2359
1839 glEnable GL_TEXTURE_2D; 2360 glEnable GL_TEXTURE_2D;
1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2361 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841 glColor 0, 0, 0, 1; 2362 glColor 0, 0, 0, 1;
1842 2363
… …
1847 $self->SUPER::_draw; 2368 $self->SUPER::_draw;
1848} 2369}
1849 2370
1850############################################################################# 2371#############################################################################
1851 2372
1852package CFClient::UI::CheckBox; 2373package CFPlus::UI::CheckBox;
1853 2374
1854our @ISA = CFClient::UI::DrawBG::; 2375our @ISA = CFPlus::UI::DrawBG::;
1855 2376
1856my @tex = 2377my @tex =
1857 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2378 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1858 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2379 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1859 2380
1860use CFClient::OpenGL; 2381use CFPlus::OpenGL;
1861 2382
1862sub new { 2383sub new {
1863 my $class = shift; 2384 my $class = shift;
1864 2385
1865 $class->SUPER::new ( 2386 $class->SUPER::new (
… …
1879 my ($self) = @_; 2400 my ($self) = @_;
1880 2401
1881 (6) x 2 2402 (6) x 2
1882} 2403}
1883 2404
2405sub toggle {
2406 my ($self) = @_;
2407
2408 $self->{state} = !$self->{state};
2409 $self->emit (changed => $self->{state});
2410 $self->update;
2411}
2412
1884sub button_down { 2413sub invoke_button_down {
1885 my ($self, $ev, $x, $y) = @_; 2414 my ($self, $ev, $x, $y) = @_;
1886 2415
1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2416 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2417 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1889 $self->{state} = !$self->{state}; 2418 $self->toggle;
1890 $self->_emit (changed => $self->{state}); 2419 } else {
2420 return 0
2421 }
2422
1891 } 2423 1
1892} 2424}
1893 2425
1894sub _draw { 2426sub _draw {
1895 my ($self) = @_; 2427 my ($self) = @_;
1896 2428
… …
1911 glDisable GL_TEXTURE_2D; 2443 glDisable GL_TEXTURE_2D;
1912} 2444}
1913 2445
1914############################################################################# 2446#############################################################################
1915 2447
1916package CFClient::UI::Image; 2448package CFPlus::UI::Image;
1917 2449
1918our @ISA = CFClient::UI::Base::; 2450our @ISA = CFPlus::UI::Base::;
1919 2451
1920use CFClient::OpenGL; 2452use CFPlus::OpenGL;
1921use Carp qw/confess/;
1922 2453
1923our %loaded_images; 2454our %texture_cache;
1924 2455
1925sub new { 2456sub new {
1926 my $class = shift; 2457 my $class = shift;
1927 2458
1928 my $self = $class->SUPER::new (can_events => 0, @_); 2459 my $self = $class->SUPER::new (
2460 can_events => 0,
2461 @_,
2462 );
1929 2463
1930 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2464 $self->{path} || $self->{tex}
2465 or Carp::croak "'path' or 'tex' attributes required";
1931 2466
1932 $loaded_images{$self->{image}} ||= 2467 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1933 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2468 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1934 2469
1935 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2470 CFPlus::weaken $texture_cache{$self->{path}};
1936 2471
1937 Scalar::Util::weaken $loaded_images{$self->{image}}; 2472 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1938
1939 $self->{aspect} = $tex->{w} / $tex->{h};
1940 2473
1941 $self 2474 $self
1942} 2475}
1943 2476
2477sub STORABLE_freeze {
2478 my ($self, $cloning) = @_;
2479
2480 $self->{path}
2481 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2482
2483 $self->{path}
2484}
2485
2486sub STORABLE_attach {
2487 my ($self, $cloning, $path) = @_;
2488
2489 $self->new (path => $path)
2490}
2491
1944sub size_request { 2492sub size_request {
1945 my ($self) = @_; 2493 my ($self) = @_;
1946 2494
1947 ($self->{tex}->{w}, $self->{tex}->{h}) 2495 ($self->{tex}{w}, $self->{tex}{h})
1948} 2496}
1949 2497
1950sub _draw { 2498sub _draw {
1951 my ($self) = @_; 2499 my ($self) = @_;
1952 2500
… …
1962 } 2510 }
1963 2511
1964 glEnable GL_TEXTURE_2D; 2512 glEnable GL_TEXTURE_2D;
1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1966 2514
1967 $tex->draw_quad_alpha (0, 0, $w, $h); 2515 $tex->draw_quad (0, 0, $w, $h);
1968 2516
1969 glDisable GL_TEXTURE_2D; 2517 glDisable GL_TEXTURE_2D;
1970} 2518}
1971 2519
1972############################################################################# 2520#############################################################################
1973 2521
2522package CFPlus::UI::ImageButton;
2523
2524our @ISA = CFPlus::UI::Image::;
2525
2526use CFPlus::OpenGL;
2527
2528my %textures;
2529
2530sub new {
2531 my $class = shift;
2532
2533 my $self = $class->SUPER::new (
2534 padding_x => 4,
2535 padding_y => 4,
2536 fg => [1, 1, 1],
2537 active_fg => [0, 0, 1],
2538 can_hover => 1,
2539 align => 0,
2540 valign => 0,
2541 can_events => 1,
2542 @_
2543 );
2544}
2545
2546sub invoke_button_up {
2547 my ($self, $ev, $x, $y) = @_;
2548
2549 $self->emit ("activate")
2550 if $x >= 0 && $x < $self->{w}
2551 && $y >= 0 && $y < $self->{h};
2552
2553 1
2554}
2555
2556#############################################################################
2557
1974package CFClient::UI::VGauge; 2558package CFPlus::UI::VGauge;
1975 2559
1976our @ISA = CFClient::UI::Base::; 2560our @ISA = CFPlus::UI::Base::;
1977 2561
1978use List::Util qw(min max); 2562use List::Util qw(min max);
1979 2563
1980use CFClient::OpenGL; 2564use CFPlus::OpenGL;
1981 2565
1982my %tex = ( 2566my %tex = (
1983 food => [ 2567 food => [
1984 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2568 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1985 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2569 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1986 ], 2570 ],
1987 grace => [ 2571 grace => [
1988 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2572 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/ 2573 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1990 ], 2574 ],
1991 hp => [ 2575 hp => [
1992 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2576 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1993 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2577 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1994 ], 2578 ],
1995 mana => [ 2579 mana => [
1996 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2580 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/ 2581 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1998 ], 2582 ],
1999); 2583);
2000 2584
2001# eg. VGauge->new (gauge => 'food'), default gauge: food 2585# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2061 my $ycut1 = max 0, min 1, $ycut; 2645 my $ycut1 = max 0, min 1, $ycut;
2062 my $ycut2 = max 0, min 1, $ycut - 1; 2646 my $ycut2 = max 0, min 1, $ycut - 1;
2063 2647
2064 my $h1 = $self->{h} * (1 - $ycut1); 2648 my $h1 = $self->{h} * (1 - $ycut1);
2065 my $h2 = $self->{h} * (1 - $ycut2); 2649 my $h2 = $self->{h} * (1 - $ycut2);
2650 my $h3 = $self->{h};
2651
2652 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2066 2653
2067 glEnable GL_BLEND; 2654 glEnable GL_BLEND;
2068 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2655 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2656 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2069 glEnable GL_TEXTURE_2D; 2657 glEnable GL_TEXTURE_2D;
2070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2658 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2071 2659
2072 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2660 glBindTexture GL_TEXTURE_2D, $t1->{name};
2073 glBegin GL_QUADS; 2661 glBegin GL_QUADS;
… …
2088 2676
2089 if ($t3) { 2677 if ($t3) {
2090 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2678 glBindTexture GL_TEXTURE_2D, $t3->{name};
2091 glBegin GL_QUADS; 2679 glBegin GL_QUADS;
2092 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2680 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2093 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2681 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2094 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2682 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2095 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2683 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2096 glEnd; 2684 glEnd;
2097 } 2685 }
2098 2686
2099 glDisable GL_BLEND; 2687 glDisable GL_BLEND;
2100 glDisable GL_TEXTURE_2D; 2688 glDisable GL_TEXTURE_2D;
2101} 2689}
2102 2690
2103############################################################################# 2691#############################################################################
2104 2692
2105package CFClient::UI::Gauge; 2693package CFPlus::UI::Gauge;
2106 2694
2107our @ISA = CFClient::UI::VBox::; 2695our @ISA = CFPlus::UI::VBox::;
2108 2696
2109sub new { 2697sub new {
2110 my ($class, %arg) = @_; 2698 my ($class, %arg) = @_;
2111 2699
2112 my $self = $class->SUPER::new ( 2700 my $self = $class->SUPER::new (
… …
2114 can_hover => 1, 2702 can_hover => 1,
2115 can_events => 1, 2703 can_events => 1,
2116 %arg, 2704 %arg,
2117 ); 2705 );
2118 2706
2119 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2707 $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); 2708 $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"); 2709 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2122 2710
2123 $self 2711 $self
2124} 2712}
2125 2713
2126sub set_fontsize { 2714sub set_fontsize {
… …
2147 $self->{value}->set_text ($val); 2735 $self->{value}->set_text ($val);
2148} 2736}
2149 2737
2150############################################################################# 2738#############################################################################
2151 2739
2152package CFClient::UI::Slider; 2740package CFPlus::UI::Slider;
2153 2741
2154use strict; 2742use strict;
2155 2743
2156use CFClient::OpenGL; 2744use CFPlus::OpenGL;
2157 2745
2158our @ISA = CFClient::UI::DrawBG::; 2746our @ISA = CFPlus::UI::DrawBG::;
2159 2747
2160my @tex = 2748my @tex =
2161 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2749 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2162 qw(s1_slider.png s1_slider_bg.png); 2750 qw(s1_slider.png s1_slider_bg.png);
2163 2751
2164sub new { 2752sub new {
2165 my $class = shift; 2753 my $class = shift;
2166 2754
… …
2187 $self->update; 2775 $self->update;
2188 2776
2189 $self 2777 $self
2190} 2778}
2191 2779
2192sub changed { }
2193
2194sub set_range { 2780sub set_range {
2195 my ($self, $range) = @_; 2781 my ($self, $range) = @_;
2196 2782
2197 ($range, $self->{range}) = ($self->{range}, $range); 2783 ($range, $self->{range}) = ($self->{range}, $range);
2198 2784
2199 $self->update
2200 if "@$range" ne "@{$self->{range}}"; 2785 if ("@$range" ne "@{$self->{range}}") {
2786 $self->update;
2787 $self->set_value ($self->{range}[0]);
2788 }
2201} 2789}
2202 2790
2203sub set_value { 2791sub set_value {
2204 my ($self, $value) = @_; 2792 my ($self, $value) = @_;
2205 2793
… …
2216 if $unit; 2804 if $unit;
2217 2805
2218 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2806 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2219 2807
2220 if ($value != $old_value) { 2808 if ($value != $old_value) {
2221 $self->_emit (changed => $value); 2809 $self->emit (changed => $value);
2222 $self->update; 2810 $self->update;
2223 } 2811 }
2224} 2812}
2225 2813
2226sub size_request { 2814sub size_request {
2227 my ($self) = @_; 2815 my ($self) = @_;
2228 2816
2229 ($self->{req_w}, $self->{req_h}) 2817 ($self->{req_w}, $self->{req_h})
2230} 2818}
2231 2819
2232sub button_down { 2820sub invoke_button_down {
2233 my ($self, $ev, $x, $y) = @_; 2821 my ($self, $ev, $x, $y) = @_;
2234 2822
2235 $self->SUPER::button_down ($ev, $x, $y); 2823 $self->SUPER::invoke_button_down ($ev, $x, $y);
2236 2824
2237 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2825 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238 2826
2239 $self->mouse_motion ($ev, $x, $y); 2827 $self->invoke_mouse_motion ($ev, $x, $y)
2240} 2828}
2241 2829
2242sub mouse_motion { 2830sub invoke_mouse_motion {
2243 my ($self, $ev, $x, $y) = @_; 2831 my ($self, $ev, $x, $y) = @_;
2244 2832
2245 if ($GRAB == $self) { 2833 if ($GRAB == $self) {
2246 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2834 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2247 2835
2248 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2836 my (undef, $lo, $hi, $page) = @{$self->{range}};
2249 2837
2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2838 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251 2839
2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2840 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2841 } else {
2842 return 0;
2843 }
2844
2253 } 2845 1
2846}
2847
2848sub invoke_mouse_wheel {
2849 my ($self, $ev) = @_;
2850
2851 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2852
2853 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2854
2855 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2856
2857 ! ! $delta
2254} 2858}
2255 2859
2256sub update { 2860sub update {
2257 my ($self) = @_; 2861 my ($self) = @_;
2258 2862
2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2863 delete $self->{knob_w};
2864 $self->SUPER::update;
2865}
2866
2867sub _draw {
2868 my ($self) = @_;
2869
2870 unless ($self->{knob_w}) {
2260 $self->set_value ($self->{range}[0]); 2871 $self->set_value ($self->{range}[0]);
2261 2872
2262 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2873 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100; 2874 my $range = ($hi - $page - $lo) || 1e-100;
2264 2875
… …
2270 $value = ($value - $lo) / $range; 2881 $value = ($value - $lo) / $range;
2271 $value = $value * $self->{scale} + $self->{offset}; 2882 $value = $value * $self->{scale} + $self->{offset};
2272 2883
2273 $self->{knob_x} = $value - $knob_w * 0.5; 2884 $self->{knob_x} = $value - $knob_w * 0.5;
2274 $self->{knob_w} = $knob_w; 2885 $self->{knob_w} = $knob_w;
2275 }); 2886 }
2276
2277 $self->SUPER::update;
2278}
2279
2280sub _draw {
2281 my ($self) = @_;
2282 2887
2283 $self->SUPER::_draw (); 2888 $self->SUPER::_draw ();
2284 2889
2285 glScale $self->{w}, $self->{h}; 2890 glScale $self->{w}, $self->{h};
2286 2891
… …
2306 glDisable GL_TEXTURE_2D; 2911 glDisable GL_TEXTURE_2D;
2307} 2912}
2308 2913
2309############################################################################# 2914#############################################################################
2310 2915
2311package CFClient::UI::ValSlider; 2916package CFPlus::UI::ValSlider;
2312 2917
2313our @ISA = CFClient::UI::HBox::; 2918our @ISA = CFPlus::UI::HBox::;
2314 2919
2315sub new { 2920sub new {
2316 my ($class, %arg) = @_; 2921 my ($class, %arg) = @_;
2317 2922
2318 my $range = delete $arg{range}; 2923 my $range = delete $arg{range};
2319 2924
2320 my $self = $class->SUPER::new ( 2925 my $self = $class->SUPER::new (
2321 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2926 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2322 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2927 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2323 to_value => sub { shift }, 2928 to_value => sub { shift },
2324 from_value => sub { shift }, 2929 from_value => sub { shift },
2325 %arg, 2930 %arg,
2326 ); 2931 );
2327 2932
… …
2347sub set_range { shift->{slider}->set_range (@_) } 2952sub set_range { shift->{slider}->set_range (@_) }
2348sub set_value { shift->{slider}->set_value (@_) } 2953sub set_value { shift->{slider}->set_value (@_) }
2349 2954
2350############################################################################# 2955#############################################################################
2351 2956
2352package CFClient::UI::TextView; 2957package CFPlus::UI::TextScroller;
2353 2958
2354our @ISA = CFClient::UI::HBox::; 2959our @ISA = CFPlus::UI::HBox::;
2355 2960
2356use CFClient::OpenGL; 2961use CFPlus::OpenGL;
2357 2962
2358sub new { 2963sub new {
2359 my $class = shift; 2964 my $class = shift;
2360 2965
2361 my $self = $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2362 fontsize => 1, 2967 fontsize => 1,
2363 can_events => 0, 2968 can_events => 1,
2969 indent => 0,
2364 #font => default_font 2970 #font => default_font
2365 @_, 2971 @_,
2366 2972
2367 layout => (new CFClient::Layout 1), 2973 layout => (new CFPlus::Layout),
2368 par => [], 2974 par => [],
2975 max_par => 0,
2369 height => 0, 2976 height => 0,
2370 children => [ 2977 children => [
2371 (new CFClient::UI::Empty expand => 1), 2978 (new CFPlus::UI::Empty expand => 1),
2372 (new CFClient::UI::Slider vertical => 1), 2979 (new CFPlus::UI::Slider vertical => 1),
2373 ], 2980 ],
2374 ); 2981 );
2375 2982
2376 $self->{children}[1]->connect (changed => sub { $self->update }); 2983 $self->{children}[1]->connect (changed => sub { $self->update });
2377 2984
… …
2383 2990
2384 $self->{fontsize} = $fontsize; 2991 $self->{fontsize} = $fontsize;
2385 $self->reflow; 2992 $self->reflow;
2386} 2993}
2387 2994
2995sub size_request {
2996 my ($self) = @_;
2997
2998 my ($empty, $slider) = @{ $self->{children} };
2999
3000 local $self->{children} = [$empty, $slider];
3001 $self->SUPER::size_request
3002}
3003
2388sub size_allocate { 3004sub invoke_size_allocate {
2389 my ($self, $w, $h) = @_; 3005 my ($self, $w, $h) = @_;
2390 3006
2391 $self->SUPER::size_allocate ($w, $h); 3007 my ($empty, $slider, @other) = @{ $self->{children} };
3008 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2392 3009
2393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3010 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3011 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w}); 3012 $self->{layout}->set_width ($empty->{w});
3013 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396 3014
2397 $self->reflow; 3015 $self->reflow;
2398}
2399 3016
2400sub text_size { 3017 local $self->{children} = [$empty, $slider];
3018 $self->SUPER::invoke_size_allocate ($w, $h)
3019}
3020
3021sub invoke_mouse_wheel {
2401 my ($self, $text, $indent) = @_; 3022 my ($self, $ev) = @_;
3023
3024 return 0 unless $ev->{dy}; # only vertical movements
3025
3026 $self->{children}[1]->emit (mouse_wheel => $ev);
3027
3028 1
3029}
3030
3031sub get_layout {
3032 my ($self, $para) = @_;
2402 3033
2403 my $layout = $self->{layout}; 3034 my $layout = $self->{layout};
2404 3035
3036 $layout->set_font ($self->{font}) if $self->{font};
3037 $layout->set_foreground (@{$para->{fg}});
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3038 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent); 3039 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3040 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407 $layout->set_markup ($text); 3041 $layout->set_markup ($para->{markup});
3042
3043 $layout->set_shapes (
3044 map
3045 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3046 @{$para->{widget}}
2408 3047 );
3048
2409 $layout->size 3049 $layout
2410} 3050}
2411 3051
2412sub reflow { 3052sub reflow {
2413 my ($self) = @_; 3053 my ($self) = @_;
2414 3054
… …
2421 3061
2422 # todo: base offset on lines or so, not on pixels 3062 # todo: base offset on lines or so, not on pixels
2423 $self->{children}[1]->set_value ($offset); 3063 $self->{children}[1]->set_value ($offset);
2424} 3064}
2425 3065
3066sub current_paragraph {
3067 my ($self) = @_;
3068
3069 $self->{top_paragraph} - 1
3070}
3071
3072sub scroll_to {
3073 my ($self, $para) = @_;
3074
3075 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3076
3077 $self->{scroll_to} = $para;
3078 $self->update;
3079}
3080
2426sub clear { 3081sub clear {
2427 my ($self) = @_; 3082 my ($self) = @_;
3083
3084 my (undef, undef, @other) = @{ $self->{children} };
3085 $self->remove ($_) for @other;
2428 3086
2429 $self->{par} = []; 3087 $self->{par} = [];
2430 $self->{height} = 0; 3088 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3089 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432} 3090}
2433 3091
2434sub add_paragraph { 3092sub add_paragraph {
2435 my ($self, $color, $text, $indent) = @_; 3093 my $self = shift;
2436 3094
2437 for my $line (split /\n/, $text) { 3095 for my $para (@_) {
2438 my ($w, $h) = $self->text_size ($line); 3096 $para = {
3097 fg => [1, 1, 1, 1],
3098 indent => 0,
3099 markup => "",
3100 widget => [],
3101 ref $para ? %$para : (markup => $para),
3102 w => 1e10,
3103 wrapped => 1,
3104 };
3105
3106 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3107 push @{$self->{par}}, $para;
3108 }
3109
3110 if (my $max = $self->{max_par}) {
3111 shift @{$self->{par}} while @{$self->{par}} > $max;
3112 }
3113
3114 $self->{need_reflow}++;
3115 $self->update;
3116}
3117
3118sub scroll_to_bottom {
3119 my ($self) = @_;
3120
3121 $self->{scroll_to} = $#{$self->{par}};
3122 $self->update;
3123}
3124
3125sub force_uptodate {
3126 my ($self) = @_;
3127
3128 if (delete $self->{need_reflow}) {
3129 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3130
3131 my $height = 0;
3132
3133 for my $para (@{$self->{par}}) {
3134 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3135 my $layout = $self->get_layout ($para);
3136 my ($w, $h) = $layout->size;
3137
3138 $para->{w} = $w + $para->{indent};
3139 $para->{h} = $h;
3140 $para->{wrapped} = $layout->has_wrapped;
3141 }
3142
3143 $para->{y} = $height;
3144 $height += $para->{h};
3145 }
3146
2439 $self->{height} += $h; 3147 $self->{height} = $height;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3148 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2441 }
2442 3149
2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3150 delete $self->{texture};
3151 }
3152
3153 if (my $paridx = delete $self->{scroll_to}) {
3154 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3155 }
2444} 3156}
2445 3157
2446sub update { 3158sub update {
2447 my ($self) = @_; 3159 my ($self) = @_;
2448 3160
… …
2450 3162
2451 return unless $self->{h} > 0; 3163 return unless $self->{h} > 0;
2452 3164
2453 delete $self->{texture}; 3165 delete $self->{texture};
2454 3166
2455 $ROOT->on_post_alloc ($self, sub { 3167 $ROOT->on_post_alloc ($self => sub {
3168 $self->force_uptodate;
3169
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3170 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457 3171
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 { 3172 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2485 glClearColor 0.5, 0.5, 0.5, 0; 3173 glClearColor 0, 0, 0, 0;
2486 glClear GL_COLOR_BUFFER_BIT; 3174 glClear GL_COLOR_BUFFER_BIT;
2487 3175
3176 package CFPlus::UI::Base;
3177 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3178 (0, 0, $self->{w}, $self->{h});
3179
3180 my $top = int $self->{children}[1]{range}[0];
3181
3182 my $paridx = 0;
3183 my $top_paragraph;
2488 my $top = int $self->{children}[1]{range}[0]; 3184 my $top = int $self->{children}[1]{range}[0];
2489 3185
2490 my $y0 = $top; 3186 my $y0 = $top;
2491 my $y1 = $top + $H; 3187 my $y1 = $top + $H;
2492 3188
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}}) { 3189 for my $para (@{$self->{par}}) {
2504 my $h = $par->[1]; 3190 my $h = $para->{h};
3191 my $y = $para->{y};
2505 3192
2506 if ($y0 < $y + $h && $y < $y1) { 3193 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] }); 3194 my $layout = $self->get_layout ($para);
2508 $layout->set_width ($W - $par->[3]);
2509 $layout->set_markup ($par->[4]);
2510 3195
2511 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3196 $layout->render ($para->{indent}, $y - $y0);
2512 3197
2513 glRasterPos $par->[3], $y - $y0; 3198 if (my @w = @{ $para->{widget} }) {
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3199 my @s = $layout->get_shapes;
3200
3201 for (@w) {
3202 my ($dx, $dy) = splice @s, 0, 2, ();
3203
3204 $_->{x} = $dx + $para->{indent};
3205 $_->{y} = $dy + $y - $y0;
3206
3207 $_->draw;
3208 }
3209 }
2515 } 3210 }
2516 3211
2517 $y += $h; 3212 $paridx++;
3213 $top_paragraph ||= $paridx if $y >= $top;
2518 } 3214 }
2519 3215
2520 glDisable GL_BLEND; 3216 $self->{top_paragraph} = $top_paragraph;
2521 }; 3217 };
2522 }); 3218 });
2523} 3219}
2524 3220
3221sub reconfigure {
3222 my ($self) = @_;
3223
3224 $self->SUPER::reconfigure;
3225
3226 $_->{w} = 1e10 for @{ $self->{par} };
3227 $self->reflow;
3228}
3229
2525sub _draw { 3230sub _draw {
2526 my ($self) = @_; 3231 my ($self) = @_;
2527 3232
2528 glEnable GL_TEXTURE_2D; 3233 glEnable GL_TEXTURE_2D;
2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3234 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1; 3235 glColor 0, 0, 0, 1;
2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3236 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532 glDisable GL_TEXTURE_2D; 3237 glDisable GL_TEXTURE_2D;
2533 3238
2534 $self->{children}[1]->draw; 3239 $self->{children}[1]->draw;
2535
2536} 3240}
2537 3241
2538############################################################################# 3242#############################################################################
2539 3243
2540package CFClient::UI::Animator; 3244package CFPlus::UI::Animator;
2541 3245
2542use CFClient::OpenGL; 3246use CFPlus::OpenGL;
2543 3247
2544our @ISA = CFClient::UI::Bin::; 3248our @ISA = CFPlus::UI::Bin::;
2545 3249
2546sub moveto { 3250sub moveto {
2547 my ($self, $x, $y) = @_; 3251 my ($self, $x, $y) = @_;
2548 3252
2549 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3253 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2577 glPopMatrix; 3281 glPopMatrix;
2578} 3282}
2579 3283
2580############################################################################# 3284#############################################################################
2581 3285
2582package CFClient::UI::Flopper; 3286package CFPlus::UI::Flopper;
2583 3287
2584our @ISA = CFClient::UI::Button::; 3288our @ISA = CFPlus::UI::Button::;
2585 3289
2586sub new { 3290sub new {
2587 my $class = shift; 3291 my $class = shift;
2588 3292
2589 my $self = $class->SUPER::new ( 3293 my $self = $class->SUPER::new (
… …
2601 $self->{other}->toggle_visibility; 3305 $self->{other}->toggle_visibility;
2602} 3306}
2603 3307
2604############################################################################# 3308#############################################################################
2605 3309
2606package CFClient::UI::Tooltip; 3310package CFPlus::UI::Tooltip;
2607 3311
2608our @ISA = CFClient::UI::Bin::; 3312our @ISA = CFPlus::UI::Bin::;
2609 3313
2610use CFClient::OpenGL; 3314use CFPlus::OpenGL;
2611 3315
2612sub new { 3316sub new {
2613 my $class = shift; 3317 my $class = shift;
2614 3318
2615 $class->SUPER::new ( 3319 $class->SUPER::new (
… …
2618 ) 3322 )
2619} 3323}
2620 3324
2621sub set_tooltip_from { 3325sub set_tooltip_from {
2622 my ($self, $widget) = @_; 3326 my ($self, $widget) = @_;
3327
3328 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3329 if $widget->{tooltip} =~ /^#(.*)$/;
2623 3330
2624 my $tooltip = $widget->{tooltip}; 3331 my $tooltip = $widget->{tooltip};
2625 3332
2626 if ($ENV{CFPLUS_DEBUG} & 2) { 3333 if ($ENV{CFPLUS_DEBUG} & 2) {
2627 $tooltip .= "\n\n" . (ref $widget) . "\n" 3334 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3335 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n" 3336 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}"; 3337 . "visible $widget->{visible}";
2631 } 3338 }
2632 3339
3340 $tooltip =~ s/^\n+//;
3341 $tooltip =~ s/\n+$//;
3342
2633 $self->add (new CFClient::UI::Label 3343 $self->add (new CFPlus::UI::Label
2634 markup => $tooltip, 3344 markup => $tooltip,
2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3345 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2636 fontsize => 0.8, 3346 fontsize => 0.8,
2637 fg => [0, 0, 0, 1], 3347 style => 1, # FLAG_INVERSE
2638 ellipsise => 0, 3348 ellipsise => 0,
2639 font => ($widget->{tooltip_font} || $::FONT_PROP), 3349 font => ($widget->{tooltip_font} || $::FONT_PROP),
2640 ); 3350 );
2641} 3351}
2642 3352
… …
2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3356 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2647 3357
2648 ($w + 4, $h + 4) 3358 ($w + 4, $h + 4)
2649} 3359}
2650 3360
2651sub size_allocate { 3361sub invoke_size_allocate {
2652 my ($self, $w, $h) = @_; 3362 my ($self, $w, $h) = @_;
2653 3363
2654 $self->SUPER::size_allocate ($w - 4, $h - 4); 3364 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2655} 3365}
2656 3366
2657sub visibility_change { 3367sub invoke_visibility_change {
2658 my ($self, $visible) = @_; 3368 my ($self, $visible) = @_;
2659 3369
2660 return unless $visible; 3370 return unless $visible;
2661 3371
2662 $self->{root}->on_post_alloc ("move_$self" => sub { 3372 $self->{root}->on_post_alloc ("move_$self" => sub {
2663 my $widget = $self->{owner} 3373 my $widget = $self->{owner}
2664 or return; 3374 or return;
2665 3375
3376 if ($widget->{visible}) {
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3377 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667 3378
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3379 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH; 3380 if $x + $self->{w} > $self->{root}{w};
2670 3381
2671 $self->move_abs ($x, $y); 3382 $self->move_abs ($x, $y);
3383 } else {
3384 $self->hide;
3385 }
2672 }); 3386 });
2673} 3387}
2674 3388
2675sub _draw { 3389sub _draw {
2676 my ($self) = @_; 3390 my ($self) = @_;
… …
2700 $self->SUPER::_draw; 3414 $self->SUPER::_draw;
2701} 3415}
2702 3416
2703############################################################################# 3417#############################################################################
2704 3418
2705package CFClient::UI::Face; 3419package CFPlus::UI::Face;
2706 3420
2707our @ISA = CFClient::UI::Base::; 3421our @ISA = CFPlus::UI::DrawBG::;
2708 3422
2709use CFClient::OpenGL; 3423use CFPlus::OpenGL;
2710 3424
2711sub new { 3425sub new {
2712 my $class = shift; 3426 my $class = shift;
2713 3427
2714 my $self = $class->SUPER::new ( 3428 my $self = $class->SUPER::new (
3429 size_w => 32,
3430 size_h => 8,
2715 aspect => 1, 3431 aspect => 1,
2716 can_events => 0, 3432 can_events => 0,
2717 @_, 3433 @_,
2718 ); 3434 );
2719 3435
2720 if ($self->{anim} && $self->{animspeed}) { 3436 if ($self->{anim} && $self->{animspeed}) {
2721 Scalar::Util::weaken (my $widget = $self); 3437 CFPlus::weaken (my $widget = $self);
2722 3438
2723 $self->{timer} = Event->timer ( 3439 $self->{timer} = Event->timer (
2724 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3440 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2725 hard => 1, 3441 hard => 1,
2726 interval => $self->{animspeed}, 3442 interval => $self->{animspeed},
2727 cb => sub { 3443 cb => sub {
3444 return unless $::CONN;
3445
2728 ++$widget->{frame}; 3446 ++$widget->{frame};
3447 $self->update_face;
2729 $widget->update; 3448 $self->update;
2730 }, 3449 },
2731 ); 3450 );
3451
3452 $self->update_face;
2732 } 3453 }
2733 3454
2734 $self 3455 $self
2735} 3456}
2736 3457
3458sub update_face {
3459 my ($self) = @_;
3460
3461 return unless $::CONN;
3462
3463 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3464 if ($anim && @$anim) {
3465 delete $self->{wait_face};
3466 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3467 }
3468 }
3469}
3470
2737sub size_request { 3471sub size_request {
2738 (32, 8) 3472 my ($self) = @_;
3473
3474 if ($::CONN) {
3475 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3476 if (my $tex = $::CONN->{texture}[$faceid]) {
3477 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3478 } else {
3479 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3480 $self->realloc;
3481 });
3482 }
3483 }
3484 }
3485
3486 ($self->{size_w} || 8, $self->{size_h} || 8)
2739} 3487}
2740 3488
2741sub update { 3489sub update {
2742 my ($self) = @_; 3490 my ($self) = @_;
2743 3491
… …
2749sub _draw { 3497sub _draw {
2750 my ($self) = @_; 3498 my ($self) = @_;
2751 3499
2752 return unless $::CONN; 3500 return unless $::CONN;
2753 3501
2754 my $face; 3502 $self->SUPER::_draw;
2755 3503
2756 if ($self->{frame}) {
2757 my $anim = $::CONN->{anim}[$self->{anim}]; 3504 my $faceid = $::CONN->{faceid}[$self->{face}]
2758 3505 or return;
2759 $face = $anim->[ $self->{frame} % @$anim ]
2760 if $anim && @$anim;
2761 }
2762 3506
2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3507 my $tex = $::CONN->{texture}[$faceid];
2764 3508
2765 if ($tex) { 3509 if ($tex) {
2766 glEnable GL_TEXTURE_2D; 3510 glEnable GL_TEXTURE_2D;
2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2768 glColor 1, 1, 1, 1; 3512 glColor 0, 0, 0, 1;
2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3513 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2770 glDisable GL_TEXTURE_2D; 3514 glDisable GL_TEXTURE_2D;
2771 } 3515 }
2772} 3516}
2773 3517
2774sub DESTROY { 3518sub destroy {
2775 my ($self) = @_; 3519 my ($self) = @_;
2776 3520
2777 $self->{timer}->cancel 3521 $self->{timer}->cancel
2778 if $self->{timer}; 3522 if $self->{timer};
2779 3523
2780 $self->SUPER::DESTROY; 3524 $self->SUPER::destroy;
2781} 3525}
2782 3526
2783############################################################################# 3527#############################################################################
2784 3528
2785package CFClient::UI::Inventory; 3529package CFPlus::UI::Buttonbar;
2786 3530
2787our @ISA = CFClient::UI::ScrolledWindow::; 3531our @ISA = CFPlus::UI::HBox::;
2788 3532
2789sub new { 3533# 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 3534
2825############################################################################# 3535#############################################################################
2826 3536
2827package CFClient::UI::Menu; 3537package CFPlus::UI::Menu;
2828 3538
2829our @ISA = CFClient::UI::FancyFrame::; 3539our @ISA = CFPlus::UI::Toplevel::;
2830 3540
2831use CFClient::OpenGL; 3541use CFPlus::OpenGL;
2832 3542
2833sub new { 3543sub new {
2834 my $class = shift; 3544 my $class = shift;
2835 3545
2836 my $self = $class->SUPER::new ( 3546 my $self = $class->SUPER::new (
2837 items => [], 3547 items => [],
2838 z => 100, 3548 z => 100,
2839 @_, 3549 @_,
2840 ); 3550 );
2841 3551
2842 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3552 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2843 3553
2844 for my $item (@{ $self->{items} }) { 3554 for my $item (@{ $self->{items} }) {
2845 my ($widget, $cb) = @$item; 3555 my ($widget, $cb, $tooltip) = @$item;
2846 3556
2847 # handle various types of items, only text for now 3557 # handle various types of items, only text for now
2848 if (!ref $widget) { 3558 if (!ref $widget) {
3559 if ($widget =~ /\t/) {
3560 my ($left, $right) = split /\t/, $widget, 2;
3561
2849 $widget = new CFClient::UI::Label 3562 $widget = new CFPlus::UI::HBox
2850 can_hover => 1, 3563 can_hover => 1,
2851 can_events => 1, 3564 can_events => 1,
3565 tooltip => $tooltip,
3566 children => [
3567 (new CFPlus::UI::Label markup => $left, expand => 1),
3568 (new CFPlus::UI::Label markup => $right, align => +1),
3569 ],
3570 ;
3571
3572 } else {
3573 $widget = new CFPlus::UI::Label
3574 can_hover => 1,
3575 can_events => 1,
2852 text => $widget; 3576 markup => $widget,
3577 tooltip => $tooltip;
3578 }
2853 } 3579 }
2854 3580
2855 $self->{item}{$widget} = $item; 3581 $self->{item}{$widget} = $item;
2856 3582
2857 $self->{vbox}->add ($widget); 3583 $self->{vbox}->add ($widget);
… …
2862 3588
2863# popup given the event (must be a mouse button down event currently) 3589# popup given the event (must be a mouse button down event currently)
2864sub popup { 3590sub popup {
2865 my ($self, $ev) = @_; 3591 my ($self, $ev) = @_;
2866 3592
2867 $self->_emit ("popdown"); 3593 $self->emit ("popdown");
2868 3594
2869 # maybe save $GRAB? must be careful about events... 3595 # maybe save $GRAB? must be careful about events...
2870 $GRAB = $self; 3596 $GRAB = $self;
2871 $self->{button} = $ev->{button}; 3597 $self->{button} = $ev->{button};
2872 3598
2873 $self->show; 3599 $self->show;
2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3600 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2875} 3601}
2876 3602
2877sub mouse_motion { 3603sub invoke_mouse_motion {
2878 my ($self, $ev, $x, $y) = @_; 3604 my ($self, $ev, $x, $y) = @_;
2879 3605
2880 # TODO: should use vbox->find_widget or so 3606 # TODO: should use vbox->find_widget or so
2881 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3607 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882 $self->{hover} = $self->{item}{$HOVER}; 3608 $self->{hover} = $self->{item}{$HOVER};
2883}
2884 3609
3610 0
3611}
3612
2885sub button_up { 3613sub invoke_button_up {
2886 my ($self, $ev, $x, $y) = @_; 3614 my ($self, $ev, $x, $y) = @_;
2887 3615
2888 if ($ev->{button} == $self->{button}) { 3616 if ($ev->{button} == $self->{button}) {
2889 undef $GRAB; 3617 undef $GRAB;
2890 $self->hide; 3618 $self->hide;
2891 3619
2892 $self->_emit ("popdown"); 3620 $self->emit ("popdown");
2893 $self->{hover}[1]->() if $self->{hover}; 3621 $self->{hover}[1]->() if $self->{hover};
3622 } else {
3623 return 0
3624 }
3625
2894 } 3626 1
2895} 3627}
2896 3628
2897############################################################################# 3629#############################################################################
2898 3630
2899package CFClient::UI::Statusbox; 3631package CFPlus::UI::Multiplexer;
2900 3632
2901our @ISA = CFClient::UI::VBox::; 3633our @ISA = CFPlus::UI::Container::;
2902 3634
2903sub new { 3635sub new {
2904 my $class = shift; 3636 my $class = shift;
2905 3637
2906 $class->SUPER::new ( 3638 my $self = $class->SUPER::new (
3639 @_,
3640 );
3641
3642 $self->{current} = $self->{children}[0]
3643 if @{ $self->{children} };
3644
3645 $self
3646}
3647
3648sub add {
3649 my ($self, @widgets) = @_;
3650
3651 $self->SUPER::add (@widgets);
3652
3653 $self->{current} = $self->{children}[0]
3654 if @{ $self->{children} };
3655}
3656
3657sub get_current_page {
3658 my ($self) = @_;
3659
3660 $self->{current}
3661}
3662
3663sub set_current_page {
3664 my ($self, $page_or_widget) = @_;
3665
3666 my $widget = ref $page_or_widget
3667 ? $page_or_widget
3668 : $self->{children}[$page_or_widget];
3669
3670 $self->{current} = $widget;
3671 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3672
3673 $self->emit (page_changed => $self->{current});
3674
3675 $self->realloc;
3676}
3677
3678sub visible_children {
3679 $_[0]{current}
3680}
3681
3682sub size_request {
3683 my ($self) = @_;
3684
3685 $self->{current}->size_request
3686}
3687
3688sub invoke_size_allocate {
3689 my ($self, $w, $h) = @_;
3690
3691 $self->{current}->configure (0, 0, $w, $h);
3692
3693 1
3694}
3695
3696sub _draw {
3697 my ($self) = @_;
3698
3699 $self->{current}->draw;
3700}
3701
3702#############################################################################
3703
3704package CFPlus::UI::Notebook;
3705
3706our @ISA = CFPlus::UI::VBox::;
3707
3708sub new {
3709 my $class = shift;
3710
3711 my $self = $class->SUPER::new (
3712 buttonbar => (new CFPlus::UI::Buttonbar),
3713 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3714 # filter => # will be put between multiplexer and $self
3715 @_,
3716 );
3717
3718 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3719 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3720
3721 $self
3722}
3723
3724sub add {
3725 my ($self, $title, $widget, $tooltip) = @_;
3726
3727 CFPlus::weaken $self;
3728
3729 $self->{buttonbar}->add (new CFPlus::UI::Button
3730 markup => $title,
3731 tooltip => $tooltip,
3732 on_activate => sub { $self->set_current_page ($widget) },
3733 );
3734
3735 $self->{multiplexer}->add ($widget);
3736}
3737
3738sub get_current_page {
3739 my ($self) = @_;
3740
3741 $self->{multiplexer}->get_current_page
3742}
3743
3744sub set_current_page {
3745 my ($self, $page) = @_;
3746
3747 $self->{multiplexer}->set_current_page ($page);
3748 $self->emit (page_changed => $self->{multiplexer}{current});
3749}
3750
3751#############################################################################
3752
3753package CFPlus::UI::Selector;
3754
3755use utf8;
3756
3757our @ISA = CFPlus::UI::Button::;
3758
3759sub new {
3760 my $class = shift;
3761
3762 my $self = $class->SUPER::new (
3763 options => [], # [value, title, longdesc], ...
3764 value => undef,
3765 @_,
3766 );
3767
3768 $self->_set_value ($self->{value});
3769
3770 $self
3771}
3772
3773sub invoke_button_down {
3774 my ($self, $ev) = @_;
3775
3776 my @menu_items;
3777
3778 for (@{ $self->{options} }) {
3779 my ($value, $title, $tooltip) = @$_;
3780
3781 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3782 }
3783
3784 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3785}
3786
3787sub _set_value {
3788 my ($self, $value) = @_;
3789
3790 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3791 or return;
3792
3793 $self->{value} = $item->[0];
3794 $self->set_markup ("$item->[1] ⇓");
3795 $self->set_tooltip ($item->[2]);
3796}
3797
3798sub set_value {
3799 my ($self, $value) = @_;
3800
3801 return unless $self->{value} ne $value;
3802
3803 $self->_set_value ($value);
3804 $self->emit (changed => $value);
3805}
3806
3807#############################################################################
3808
3809package CFPlus::UI::Statusbox;
3810
3811our @ISA = CFPlus::UI::VBox::;
3812
3813sub new {
3814 my $class = shift;
3815
3816 my $self = $class->SUPER::new (
2907 fontsize => 0.8, 3817 fontsize => 0.8,
2908 @_, 3818 @_,
2909 ) 3819 );
3820
3821 CFPlus::weaken (my $this = $self);
3822
3823 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3824
3825 $self
2910} 3826}
2911 3827
2912sub reorder { 3828sub reorder {
2913 my ($self) = @_; 3829 my ($self) = @_;
2914 my $NOW = time; 3830 my $NOW = Time::HiRes::time;
3831
3832 # freeze display when hovering over any label
3833 return if $CFPlus::UI::TOOLTIP->{owner}
3834 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3835 values %{ $self->{item} };
2915 3836
2916 while (my ($k, $v) = each %{ $self->{item} }) { 3837 while (my ($k, $v) = each %{ $self->{item} }) {
2917 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3838 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2918 } 3839 }
2919 3840
… …
2922 my @items = sort { 3843 my @items = sort {
2923 $a->{pri} <=> $b->{pri} 3844 $a->{pri} <=> $b->{pri}
2924 or $b->{id} <=> $a->{id} 3845 or $b->{id} <=> $a->{id}
2925 } values %{ $self->{item} }; 3846 } values %{ $self->{item} };
2926 3847
3848 $self->{timer}->interval (1);
3849
2927 my $count = 10 + 1; 3850 my $count = 10 + 1;
2928 for my $item (@items) { 3851 for my $item (@items) {
2929 last unless --$count; 3852 last unless --$count;
2930 3853
2931 push @widgets, $item->{label} ||= do { 3854 my $label = $item->{label} ||= do {
2932 # TODO: doesn't handle markup well (read as: at all) 3855 # TODO: doesn't handle markup well (read as: at all)
2933 my $short = $item->{count} > 1 3856 my $short = $item->{count} > 1
2934 ? "<b>$item->{count} ×</b> $item->{text}" 3857 ? "<b>$item->{count} ×</b> $item->{text}"
2935 : $item->{text}; 3858 : $item->{text};
2936 3859
2937 for ($short) { 3860 for ($short) {
2938 s/^\s+//; 3861 s/^\s+//;
2939 s/\s+/ /g; 3862 s/\s+/ /g;
2940 } 3863 }
2941 3864
2942 new CFClient::UI::Label 3865 new CFPlus::UI::Label
2943 markup => $short, 3866 markup => $short,
2944 tooltip => $item->{tooltip}, 3867 tooltip => $item->{tooltip},
2945 tooltip_font => $::FONT_PROP, 3868 tooltip_font => $::FONT_PROP,
2946 tooltip_width => 0.67, 3869 tooltip_width => 0.67,
2947 fontsize => $item->{fontsize} || $self->{fontsize}, 3870 fontsize => $item->{fontsize} || $self->{fontsize},
2948 max_w => $::WIDTH * 0.44, 3871 max_w => $::WIDTH * 0.44,
2949 fg => $item->{fg}, 3872 fg => [@{ $item->{fg} }],
2950 can_events => 1, 3873 can_events => 1,
2951 can_hover => 1 3874 can_hover => 1
2952 }; 3875 };
3876
3877 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3878 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3879 $label->update;
3880 $label->set_max_size (undef, $label->{req_h} * $diff)
3881 if $diff < 1;
3882 $self->{timer}->interval (1/30);
3883 } else {
3884 $label->{fg}[3] = $item->{fg}[3] || 1;
3885 }
3886
3887 push @widgets, $label;
2953 } 3888 }
2954 3889
2955 $self->clear; 3890 $self->clear;
2956 $self->SUPER::add (reverse @widgets); 3891 $self->SUPER::add (reverse @widgets);
2957} 3892}
… …
2962 $text =~ s/^\s+//; 3897 $text =~ s/^\s+//;
2963 $text =~ s/\s+$//; 3898 $text =~ s/\s+$//;
2964 3899
2965 return unless $text; 3900 return unless $text;
2966 3901
2967 my $timeout = time + ((delete $arg{timeout}) || 60); 3902 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2968 3903
2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3904 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2970 3905
2971 if (my $item = $self->{item}{$group}) { 3906 if (my $item = $self->{item}{$group}) {
2972 if ($item->{text} eq $text) { 3907 if ($item->{text} eq $text) {
2973 $item->{count}++; 3908 $item->{count}++;
2974 } else { 3909 } else {
2975 $item->{count} = 1; 3910 $item->{count} = 1;
2976 $item->{text} = $item->{tooltip} = $text; 3911 $item->{text} = $item->{tooltip} = $text;
2977 } 3912 }
2978 $item->{id} = ++$self->{id}; 3913 $item->{id} += 0.2;#d#
2979 $item->{timeout} = $timeout; 3914 $item->{timeout} = $timeout;
2980 delete $item->{label}; 3915 delete $item->{label};
2981 } else { 3916 } else {
2982 $self->{item}{$group} = { 3917 $self->{item}{$group} = {
2983 id => ++$self->{id}, 3918 id => ++$self->{id},
… …
2989 count => 1, 3924 count => 1,
2990 %arg, 3925 %arg,
2991 }; 3926 };
2992 } 3927 }
2993 3928
3929 $ROOT->on_refresh (reorder => sub {
2994 $self->reorder; 3930 $self->reorder;
3931 });
2995} 3932}
2996 3933
2997sub reconfigure { 3934sub reconfigure {
2998 my ($self) = @_; 3935 my ($self) = @_;
2999 3936
… …
3002 3939
3003 $self->reorder; 3940 $self->reorder;
3004 $self->SUPER::reconfigure; 3941 $self->SUPER::reconfigure;
3005} 3942}
3006 3943
3944sub destroy {
3945 my ($self) = @_;
3946
3947 $self->{timer}->cancel;
3948
3949 $self->SUPER::destroy;
3950}
3951
3007############################################################################# 3952#############################################################################
3008 3953
3009package CFClient::UI::Root; 3954package CFPlus::UI::Root;
3010 3955
3011our @ISA = CFClient::UI::Container::; 3956our @ISA = CFPlus::UI::Container::;
3012 3957
3958use List::Util qw(min max);
3959
3013use CFClient::OpenGL; 3960use CFPlus::OpenGL;
3014 3961
3015sub new { 3962sub new {
3016 my $class = shift; 3963 my $class = shift;
3017 3964
3018 my $self = $class->SUPER::new ( 3965 my $self = $class->SUPER::new (
3019 visible => 1, 3966 visible => 1,
3020 @_, 3967 @_,
3021 ); 3968 );
3022 3969
3023 Scalar::Util::weaken ($self->{root} = $self); 3970 CFPlus::weaken ($self->{root} = $self);
3024 3971
3025 $self 3972 $self
3026} 3973}
3027 3974
3028sub size_request { 3975sub size_request {
… …
3043 $coord = $max - $size if $coord > $max - $size; 3990 $coord = $max - $size if $coord > $max - $size;
3044 3991
3045 int $coord + 0.5 3992 int $coord + 0.5
3046} 3993}
3047 3994
3048sub size_allocate { 3995sub invoke_size_allocate {
3049 my ($self, $w, $h) = @_; 3996 my ($self, $w, $h) = @_;
3050 3997
3051 for my $child ($self->children) { 3998 for my $child ($self->children) {
3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3999 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3053 4000
… …
3057 $X = _to_pixel $X, $W, $self->{w}; 4004 $X = _to_pixel $X, $W, $self->{w};
3058 $Y = _to_pixel $Y, $H, $self->{h}; 4005 $Y = _to_pixel $Y, $H, $self->{h};
3059 4006
3060 $child->configure ($X, $Y, $W, $H); 4007 $child->configure ($X, $Y, $W, $H);
3061 } 4008 }
4009
4010 1
3062} 4011}
3063 4012
3064sub coord2local { 4013sub coord2local {
3065 my ($self, $x, $y) = @_; 4014 my ($self, $x, $y) = @_;
3066 4015
… …
3122 $_->() 4071 $_->()
3123 for values %{delete $self->{refresh_hook}}; 4072 for values %{delete $self->{refresh_hook}};
3124 } 4073 }
3125 4074
3126 if ($self->{realloc}) { 4075 if ($self->{realloc}) {
4076 my %queue;
3127 my @queue; 4077 my @queue;
4078 my $widget;
3128 4079
4080 outer:
3129 while () { 4081 while () {
3130 if ($self->{realloc}) { 4082 if (my $realloc = delete $self->{realloc}) {
3131 #TODO use array-of-depth approach 4083 for $widget (values %$realloc) {
4084 $widget->{visible} or next; # do not resize invisible widgets
3132 4085
3133 use sort 'stable'; 4086 $queue{$widget+0}++ and next; # duplicates are common
3134 4087
3135 @queue = sort { $a->{visible} <=> $b->{visible} } 4088 push @{ $queue[$widget->{visible}] }, $widget;
3136 @queue, values %{delete $self->{realloc}}; 4089 }
3137 } 4090 }
3138 4091
4092 while () {
4093 @queue or last outer;
4094
3139 my $widget = pop @queue || last; 4095 $widget = pop @{ $queue[-1] || [] }
4096 and last;
4097
4098 pop @queue;
4099 }
3140 4100
3141 $widget->{visible} or last; # do not resize invisible widgets 4101 delete $queue{$widget+0};
3142 4102
3143 my ($w, $h) = $widget->size_request; 4103 my ($w, $h) = $widget->size_request;
3144 4104
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4105 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4106 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4107
4108 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4109 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3147 4110
3148 $w = $widget->{force_w} if exists $widget->{force_w}; 4111 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h}; 4112 $h = $widget->{force_h} if exists $widget->{force_h};
3150 4113
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4114 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3154 $widget->{req_h} = $h; 4117 $widget->{req_h} = $h;
3155 4118
3156 $self->{size_alloc}{$widget+0} = $widget; 4119 $self->{size_alloc}{$widget+0} = $widget;
3157 4120
3158 if (my $parent = $widget->{parent}) { 4121 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent; 4122 $self->{realloc}{$parent+0} = $parent
3160 #unshift @queue, $parent; 4123 unless $queue{$parent+0};
4124
3161 $parent->{force_size_alloc} = 1; 4125 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent; 4126 $self->{size_alloc}{$parent+0} = $parent;
3163 } 4127 }
3164 } 4128 }
3165 4129
… …
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4141 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3178 4142
3179 $w = 0 if $w < 0; 4143 $w = 0 if $w < 0;
3180 $h = 0 if $h < 0; 4144 $h = 0 if $h < 0;
3181 4145
4146 $w = max $widget->{min_w}, $w;
4147 $h = max $widget->{min_h}, $h;
4148
4149# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4150# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4151
4152 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4153 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4154
3182 $w = int $w + 0.5; 4155 $w = int $w + 0.5;
3183 $h = int $h + 0.5; 4156 $h = int $h + 0.5;
3184 4157
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4158 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4159 $widget->{old_w} = $widget->{w};
4160 $widget->{old_h} = $widget->{h};
4161
3186 $widget->{w} = $w; 4162 $widget->{w} = $w;
3187 $widget->{h} = $h; 4163 $widget->{h} = $h;
3188 4164
3189 $widget->emit (size_allocate => $w, $h); 4165 $widget->emit (size_allocate => $w, $h);
3190 } 4166 }
… …
3205 glLoadIdentity; 4181 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4182 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW; 4183 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity; 4184 glLoadIdentity;
3209 4185
4186 {
4187 package CFPlus::UI::Base;
4188
4189 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4190 (0, 0, $self->{w}, $self->{h});
4191
3210 $self->_draw; 4192 $self->_draw;
4193 }
3211} 4194}
3212 4195
3213############################################################################# 4196#############################################################################
3214 4197
3215package CFClient::UI; 4198package CFPlus::UI;
3216 4199
3217$ROOT = new CFClient::UI::Root; 4200$ROOT = new CFPlus::UI::Root;
3218$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4201$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3219 4202
32201 42031
3221 4204

Diff Legend

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