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.258 by root, Tue May 30 02:55:45 2006 UTC vs.
Revision 1.387 by root, Fri Jul 20 18:19:45 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->{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->{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->{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->{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);
… …
355 $self->{x} = $x; 390 $self->{x} = $x;
356 $self->{y} = $y; 391 $self->{y} = $y;
357 $self->update; 392 $self->update;
358 } 393 }
359 394
360 if ($self->{w} != $w || $self->{h} != $h) { 395 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361 return unless $self->{visible}; 396 return unless $self->{visible};
362 397
398 $self->{alloc_w} = $w;
399 $self->{alloc_h} = $h;
400
363 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 401 $self->{root}{size_alloc}{$self+0} = $self;
364 } 402 }
365}
366
367sub size_allocate {
368 # nothing to be done
369} 403}
370 404
371sub children { 405sub children {
406 # nop
407}
408
409sub visible_children {
410 $_[0]->children
372} 411}
373 412
374sub set_max_size { 413sub set_max_size {
375 my ($self, $w, $h) = @_; 414 my ($self, $w, $h) = @_;
376 415
377 delete $self->{max_w}; $self->{max_w} = $w if $w; 416 $self->{max_w} = int $w if defined $w;
378 delete $self->{max_h}; $self->{max_h} = $h if $h; 417 $self->{max_h} = int $h if defined $h;
418
419 $self->realloc;
379} 420}
380 421
381sub set_tooltip { 422sub set_tooltip {
382 my ($self, $tooltip) = @_; 423 my ($self, $tooltip) = @_;
383 424
… …
386 427
387 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
388 429
389 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
390 431
391 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
392 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
393 CFClient::UI::check_tooltip; 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
394 } 435 }
395} 436}
396 437
397# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
398sub coord2local { 439sub coord2local {
399 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
400 441
442 Carp::confess unless $self->{parent};#d#
443
401 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
402} 445}
403 446
404# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
405sub coord2global { 448sub coord2global {
406 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
407 450
451 Carp::confess unless $self->{parent};#d#
452
408 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
409} 454}
410 455
411sub focus_in { 456sub invoke_focus_in {
412 my ($self) = @_; 457 my ($self) = @_;
413 458
414 return if $FOCUS == $self; 459 return if $FOCUS == $self;
415 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
416 461
417 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
418 463
419 $self->_emit (focus_in => $focus); 464 $self->update;
420 465
421 $focus->update if $focus; 466 0
422 $FOCUS->update;
423} 467}
424 468
425sub focus_out { 469sub invoke_focus_out {
426 my ($self) = @_; 470 my ($self) = @_;
427 471
428 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
429 473
430 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
431 475
432 $self->_emit (focus_out => $focus); 476 $self->update;
433 477
434 $focus->update if $focus; #?
435
436 $::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
437 unless $FOCUS; 479 unless $FOCUS;
438}
439 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
440sub mouse_motion { } 491sub invoke_mouse_motion { 0 }
441sub button_up { } 492sub invoke_button_up { 0 }
442sub key_down { } 493sub invoke_key_down { 0 }
443sub key_up { } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
444 496
445sub button_down { 497sub invoke_button_down {
446 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
447 499
448 $self->focus_in; 500 $self->grab_focus;
449}
450 501
451sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 502 0
452sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 503}
453sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
454sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
455sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
456 504
505sub connect {
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}
551
457sub find_widget { 552#sub find_widget {
458 my ($self, $x, $y) = @_; 553# in .xs
459
460 return () unless $self->{can_events};
461
462 return $self
463 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
464 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
465
466 ()
467}
468 554
469sub set_parent { 555sub set_parent {
470 my ($self, $parent) = @_; 556 my ($self, $parent) = @_;
471 557
472 Scalar::Util::weaken ($self->{parent} = $parent); 558 CFPlus::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible}; 559 $self->set_visible if $parent->{visible};
474} 560}
475 561
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493}
494
495sub visibility_change {
496 #my ($self, $visible) = @_;
497}
498
499sub realloc { 562sub realloc {
500 my ($self) = @_; 563 my ($self) = @_;
501 564
502 if ($self->{visible}) { 565 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self}; 566 return if $self->{root}{realloc}{$self+0};
504 567
505 $self->{root}{realloc}{$self} = $self; 568 $self->{root}{realloc}{$self+0} = $self;
506 $self->{root}->update; 569 $self->{root}->update;
507 } else { 570 } else {
508 delete $self->{req_w}; 571 delete $self->{req_w};
572 delete $self->{req_h};
509 } 573 }
510} 574}
511 575
512sub update { 576sub update {
513 my ($self) = @_; 577 my ($self) = @_;
… …
521 585
522 $self->realloc; 586 $self->realloc;
523 $self->update; 587 $self->update;
524} 588}
525 589
590# using global variables seems a bit hacky, but passing through all drawing
591# functions seems pointless.
592our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
593
526sub draw { 594sub draw {
527 my ($self) = @_; 595 my ($self) = @_;
528 596
529 return unless $self->{h} && $self->{w}; 597 return unless $self->{h} && $self->{w};
598
599 # update screen rectangle
600 local $draw_x = $draw_x + $self->{x};
601 local $draw_y = $draw_y + $self->{y};
602
603 # skip widgets that are entirely outside the drawing area
604 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
605 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
530 606
531 glPushMatrix; 607 glPushMatrix;
532 glTranslate $self->{x}, $self->{y}, 0; 608 glTranslate $self->{x}, $self->{y}, 0;
533 $self->_draw;
534 glPopMatrix;
535 609
536 if ($self == $HOVER && $self->{can_hover}) { 610 if ($self == $HOVER && $self->{can_hover}) {
537 my ($x, $y) = @$self{qw(x y)};
538
539 glColor 1, 0.8, 0.5, 0.2; 611 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
540 glEnable GL_BLEND; 612 glEnable GL_BLEND;
541 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 613 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
542 glBegin GL_QUADS; 614 glBegin GL_QUADS;
543 glVertex $x , $y; 615 glVertex 0 , 0;
544 glVertex $x + $self->{w}, $y; 616 glVertex $self->{w}, 0;
545 glVertex $x + $self->{w}, $y + $self->{h}; 617 glVertex $self->{w}, $self->{h};
546 glVertex $x , $y + $self->{h}; 618 glVertex 0 , $self->{h};
547 glEnd; 619 glEnd;
548 glDisable GL_BLEND; 620 glDisable GL_BLEND;
549 } 621 }
550 622
551 if ($ENV{CFPLUS_DEBUG}) { 623 if ($ENV{CFPLUS_DEBUG} & 1) {
552 glPushMatrix; 624 glPushMatrix;
553 glColor 1, 1, 0, 1; 625 glColor 1, 1, 0, 1;
554 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 626 glTranslate 0.375, 0.375;
555 glBegin GL_LINE_LOOP; 627 glBegin GL_LINE_LOOP;
556 glVertex 0 , 0; 628 glVertex 0 , 0;
557 glVertex $self->{w} - 1, 0; 629 glVertex $self->{w} - 1, 0;
558 glVertex $self->{w} - 1, $self->{h} - 1; 630 glVertex $self->{w} - 1, $self->{h} - 1;
559 glVertex 0 , $self->{h} - 1; 631 glVertex 0 , $self->{h} - 1;
560 glEnd; 632 glEnd;
561 glPopMatrix; 633 glPopMatrix;
562 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 634 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
563 } 635 }
636
637 $self->_draw;
638 glPopMatrix;
564} 639}
565 640
566sub _draw { 641sub _draw {
567 my ($self) = @_; 642 my ($self) = @_;
568 643
569 warn "no draw defined for $self\n"; 644 warn "no draw defined for $self\n";
570} 645}
571 646
647my $cntx;#d#
572sub DESTROY { 648sub DESTROY {
573 my ($self) = @_; 649 my ($self) = @_;
574 650
651 return if CFPlus::in_destruct;
652
653 eval { $self->destroy };
654 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
655
575 delete $WIDGET{$self+0}; 656 delete $WIDGET{$self+0};
576 #$self->deactivate;
577} 657}
578 658
579############################################################################# 659#############################################################################
580 660
581package CFClient::UI::DrawBG; 661package CFPlus::UI::DrawBG;
582 662
583our @ISA = CFClient::UI::Base::; 663our @ISA = CFPlus::UI::Base::;
584 664
585use strict; 665use strict;
586use CFClient::OpenGL; 666use CFPlus::OpenGL;
587 667
588sub new { 668sub new {
589 my $class = shift; 669 my $class = shift;
590 670
591 # range [value, low, high, page] 671 # range [value, low, high, page]
… …
606 686
607 if ($color && (@$color < 4 || $color->[3])) { 687 if ($color && (@$color < 4 || $color->[3])) {
608 my ($w, $h) = @$self{qw(w h)}; 688 my ($w, $h) = @$self{qw(w h)};
609 689
610 glEnable GL_BLEND; 690 glEnable GL_BLEND;
611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 691 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
612 glColor @$color; 692 glColor_premultiply @$color;
613 693
614 glBegin GL_QUADS; 694 glBegin GL_QUADS;
615 glVertex 0 , 0; 695 glVertex 0 , 0;
616 glVertex 0 , $h; 696 glVertex 0 , $h;
617 glVertex $w, $h; 697 glVertex $w, $h;
… …
622 } 702 }
623} 703}
624 704
625############################################################################# 705#############################################################################
626 706
627package CFClient::UI::Empty; 707package CFPlus::UI::Empty;
628 708
629our @ISA = CFClient::UI::Base::; 709our @ISA = CFPlus::UI::Base::;
630 710
631sub new { 711sub new {
632 my ($class, %arg) = @_; 712 my ($class, %arg) = @_;
633 $class->SUPER::new (can_events => 0, %arg); 713 $class->SUPER::new (can_events => 0, %arg);
634} 714}
… …
641 721
642sub draw { } 722sub draw { }
643 723
644############################################################################# 724#############################################################################
645 725
646package CFClient::UI::Container; 726package CFPlus::UI::Container;
647 727
648our @ISA = CFClient::UI::Base::; 728our @ISA = CFPlus::UI::Base::;
649 729
650sub new { 730sub new {
651 my ($class, %arg) = @_; 731 my ($class, %arg) = @_;
652 732
653 my $children = delete $arg{children} || []; 733 my $children = delete $arg{children};
654 734
655 my $self = $class->SUPER::new ( 735 my $self = $class->SUPER::new (
656 children => [], 736 children => [],
657 can_events => 0, 737 can_events => 0,
658 %arg, 738 %arg,
659 ); 739 );
740
660 $self->add ($_) for @$children; 741 $self->add (@$children)
742 if $children;
661 743
662 $self 744 $self
745}
746
747sub realloc {
748 my ($self) = @_;
749
750 $self->{force_realloc} = 1;
751 $self->{force_size_alloc} = 1;
752 $self->SUPER::realloc;
663} 753}
664 754
665sub add { 755sub add {
666 my ($self, @widgets) = @_; 756 my ($self, @widgets) = @_;
667 757
… …
713 $x -= $self->{x}; 803 $x -= $self->{x};
714 $y -= $self->{y}; 804 $y -= $self->{y};
715 805
716 my $res; 806 my $res;
717 807
718 for (reverse @{ $self->{children} }) { 808 for (reverse $self->visible_children) {
719 $res = $_->find_widget ($x, $y) 809 $res = $_->find_widget ($x, $y)
720 and return $res; 810 and return $res;
721 } 811 }
722 812
723 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 813 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
729 $_->draw for @{$self->{children}}; 819 $_->draw for @{$self->{children}};
730} 820}
731 821
732############################################################################# 822#############################################################################
733 823
734package CFClient::UI::Bin; 824package CFPlus::UI::Bin;
735 825
736our @ISA = CFClient::UI::Container::; 826our @ISA = CFPlus::UI::Container::;
737 827
738sub new { 828sub new {
739 my ($class, %arg) = @_; 829 my ($class, %arg) = @_;
740 830
741 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 831 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
742 832
743 $class->SUPER::new (children => [$child], %arg) 833 $class->SUPER::new (children => [$child], %arg)
744} 834}
745 835
746sub add { 836sub add {
747 my ($self, $child) = @_; 837 my ($self, $child) = @_;
748 838
749 $self->{children} = []; 839 $self->SUPER::remove ($_) for @{ $self->{children} };
750
751 $self->SUPER::add ($child); 840 $self->SUPER::add ($child);
752} 841}
753 842
754sub remove { 843sub remove {
755 my ($self, $widget) = @_; 844 my ($self, $widget) = @_;
756 845
757 $self->SUPER::remove ($widget); 846 $self->SUPER::remove ($widget);
758 847
759 $self->{children} = [new CFClient::UI::Empty] 848 $self->{children} = [new CFPlus::UI::Empty]
760 unless @{$self->{children}}; 849 unless @{$self->{children}};
761} 850}
762 851
763sub child { $_[0]->{children}[0] } 852sub child { $_[0]->{children}[0] }
764 853
765sub size_request { 854sub size_request {
766 $_[0]{children}[0]->size_request 855 $_[0]{children}[0]->size_request
767} 856}
768 857
769sub size_allocate { 858sub invoke_size_allocate {
770 my ($self, $w, $h, $changed) = @_; 859 my ($self, $w, $h) = @_;
771 860
772 $self->{children}[0]->configure (0, 0, $w, $h); 861 $self->{children}[0]->configure (0, 0, $w, $h);
862
863 1
773} 864}
774 865
775############################################################################# 866#############################################################################
776 867
868# back-buffered drawing area
869
777package CFClient::UI::Window; 870package CFPlus::UI::Window;
778 871
779our @ISA = CFClient::UI::Bin::; 872our @ISA = CFPlus::UI::Bin::;
780 873
781use CFClient::OpenGL; 874use CFPlus::OpenGL;
782 875
783sub new { 876sub new {
784 my ($class, %arg) = @_; 877 my ($class, %arg) = @_;
785 878
786 my $self = $class->SUPER::new (%arg); 879 my $self = $class->SUPER::new (%arg);
… …
791 884
792 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 885 $ROOT->on_post_alloc ($self => sub { $self->render_child });
793 $self->SUPER::update; 886 $self->SUPER::update;
794} 887}
795 888
796sub size_allocate { 889sub invoke_size_allocate {
797 my ($self, $w, $h, $changed) = @_; 890 my ($self, $w, $h) = @_;
798 891
799 $self->SUPER::size_allocate ($w, $h, $changed);
800 $self->update 892 $self->update;
801 if $changed; 893
894 $self->SUPER::invoke_size_allocate ($w, $h)
802} 895}
803 896
804sub _render { 897sub _render {
898 my ($self) = @_;
899
805 $_[0]{children}[0]->draw; 900 $self->{children}[0]->draw;
806} 901}
807 902
808sub render_child { 903sub render_child {
809 my ($self) = @_; 904 my ($self) = @_;
810 905
811 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 906 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
812 glClearColor 0, 0, 0, 0; 907 glClearColor 0, 0, 0, 0;
813 glClear GL_COLOR_BUFFER_BIT; 908 glClear GL_COLOR_BUFFER_BIT;
814 909
910 {
911 package CFPlus::UI::Base;
912
913 local ($draw_x, $draw_y, $draw_w, $draw_h) =
914 (0, 0, $self->{w}, $self->{h});
915
815 $self->_render; 916 $self->_render;
917 }
816 }; 918 };
817} 919}
818 920
819sub _draw { 921sub _draw {
820 my ($self) = @_; 922 my ($self) = @_;
821
822 my ($w, $h) = ($self->w, $self->h);
823 923
824 my $tex = $self->{texture} 924 my $tex = $self->{texture}
825 or return; 925 or return;
826 926
827 glEnable GL_TEXTURE_2D; 927 glEnable GL_TEXTURE_2D;
828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 928 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
829 glColor 1, 1, 1, 1; 929 glColor 0, 0, 0, 1;
830 930
831 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 931 $tex->draw_quad_alpha_premultiplied (0, 0);
832 932
833 glDisable GL_TEXTURE_2D; 933 glDisable GL_TEXTURE_2D;
834} 934}
835 935
836############################################################################# 936#############################################################################
837 937
838package CFClient::UI::ViewPort; 938package CFPlus::UI::ViewPort;
839 939
940use List::Util qw(min max);
941
840our @ISA = CFClient::UI::Window::; 942our @ISA = CFPlus::UI::Window::;
841 943
842sub new { 944sub new {
843 my $class = shift; 945 my $class = shift;
844 946
845 $class->SUPER::new ( 947 $class->SUPER::new (
… …
850} 952}
851 953
852sub size_request { 954sub size_request {
853 my ($self) = @_; 955 my ($self) = @_;
854 956
855 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 957 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
856 958
857 $w = 10 if $self->{scroll_x}; 959 $w = 10 if $self->{scroll_x};
858 $h = 10 if $self->{scroll_y}; 960 $h = 10 if $self->{scroll_y};
859 961
860 ($w, $h) 962 ($w, $h)
861} 963}
862 964
863sub size_allocate { 965sub invoke_size_allocate {
864 my ($self, $w, $h, $changed) = @_; 966 my ($self, $w, $h) = @_;
865 967
968 my $child = $self->child;
969
866 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 970 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
867 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 971 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
868 972
869 $self->child->configure (0, 0, $w, $h); 973 $self->child->configure (0, 0, $w, $h);
870 $self->update; 974 $self->update;
975
976 1
871} 977}
872 978
873sub set_offset { 979sub set_offset {
874 my ($self, $x, $y) = @_; 980 my ($self, $x, $y) = @_;
875 981
982 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
983 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
984
985 if ($x != $self->{view_x} or $y != $self->{view_y}) {
876 $self->{view_x} = int $x; 986 $self->{view_x} = $x;
877 $self->{view_y} = int $y; 987 $self->{view_y} = $y;
878 988
989 $self->emit (changed => $x, $y);
879 $self->update; 990 $self->update;
991 }
880} 992}
881 993
882# hmm, this does not work for topleft of $self... but we should not ask for that 994# hmm, this does not work for topleft of $self... but we should not ask for that
883sub coord2local { 995sub coord2local {
884 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
… …
899 my ($self, $x, $y) = @_; 1011 my ($self, $x, $y) = @_;
900 1012
901 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1013 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
902 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1014 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
903 ) { 1015 ) {
904 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1016 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
905 } else { 1017 } else {
906 $self->CFClient::UI::Base::find_widget ($x, $y) 1018 $self->CFPlus::UI::Base::find_widget ($x, $y)
907 } 1019 }
908} 1020}
909 1021
910sub _render { 1022sub _render {
911 my ($self) = @_; 1023 my ($self) = @_;
912 1024
1025 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1026 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1027
913 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1028 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
914 1029
915 $self->SUPER::_render; 1030 $self->SUPER::_render;
916} 1031}
917 1032
918############################################################################# 1033#############################################################################
919 1034
920package CFClient::UI::ScrolledWindow; 1035package CFPlus::UI::ScrolledWindow;
921 1036
922our @ISA = CFClient::UI::HBox::; 1037our @ISA = CFPlus::UI::Table::;
923 1038
924sub new { 1039sub new {
925 my $class = shift; 1040 my ($class, %arg) = @_;
1041
1042 my $child = delete $arg{child};
926 1043
927 my $self; 1044 my $self;
928 1045
929 my $slider = new CFClient::UI::Slider 1046 my $hslider = new CFPlus::UI::Slider
1047 vertical => 0,
1048 range => [0, 0, 1, 0.01], # HACK fix
1049 on_changed => sub {
1050 $self->{hpos} = $_[1];
1051 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1052 },
1053 ;
1054
1055 my $vslider = new CFPlus::UI::Slider
930 vertical => 1, 1056 vertical => 1,
931 range => [0, 0, 1, 0.01], # HACK fix 1057 range => [0, 0, 1, 0.01], # HACK fix
932 on_changed => sub { 1058 on_changed => sub {
933 $self->{vp}->set_offset (0, $_[1]); 1059 $self->{vpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
934 }, 1061 },
935 ; 1062 ;
936 1063
937 $self = $class->SUPER::new ( 1064 $self = $class->SUPER::new (
938 vp => (new CFClient::UI::ViewPort expand => 1), 1065 scroll_x => 0,
1066 scroll_y => 1,
1067 can_events => 1,
939 slider => $slider, 1068 hslider => $hslider,
940 @_, 1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
1072 %arg,
941 ); 1073 );
942 1074
943 $self->{vp}->add ($self->{scrolled}); 1075 $self->{vp} = new CFPlus::UI::ViewPort
1076 expand => 1,
1077 scroll_x => $self->{scroll_x},
1078 scroll_y => $self->{scroll_y},
1079 on_changed => sub {
1080 my ($vp, $x, $y) = @_;
1081
1082 $vp->{parent}{hslider}->set_value ($x);
1083 $vp->{parent}{vslider}->set_value ($y);
1084
1085 0
1086 },
1087 ;
1088
944 $self->add ($self->{vp}); 1089 $self->SUPER::add_at (0, 0, $self->{vp});
945 $self->add ($self->{slider}); 1090
1091 $self->add ($child) if $child;
946 1092
947 $self 1093 $self
948} 1094}
949 1095
1096#TODO# update range on size_allocate depending on child
1097
1098sub add {
1099 my ($self, $widget) = @_;
1100
1101 $self->{vp}->add ($self->{child} = $widget);
1102}
1103
1104sub update_slider {
1105 my ($self) = @_;
1106
1107 my $child = ($self->{vp} or return)->child;
1108
1109 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1110 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1111
1112 my $visible = $w1 > $w2;
1113 if ($visible != $self->{hslider}{visible}) {
1114 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1115 : $self->{hslider}->hide;
1116 }
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120
1121 my $visible = $h1 > $h2;
1122 if ($visible != $self->{vslider}{visible}) {
1123 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1124 : $self->{vslider}->hide;
1125 }
1126}
1127
950sub update { 1128sub update {
951 my ($self) = @_; 1129 my ($self) = @_;
952 1130
1131 $self->update_slider;
953 $self->SUPER::update; 1132 $self->SUPER::update;
954
955 # todo: overwrite size_allocate of child
956 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958} 1133}
959 1134
1135sub invoke_mouse_wheel {
1136 my ($self, $ev) = @_;
1137
1138 return 0 unless $ev->{dy}; # only vertical movements for now
1139
1140 $self->{vslider}->emit (mouse_wheel => $ev);
1141
1142 1
1143}
1144
1145sub invoke_button_down {
1146 my ($self, $ev, $x, $y) = @_;
1147
1148 if ($ev->{button} == 2) {
1149 $self->grab_focus;
1150
1151 my $ox = $self->{vp}{view_x} + $ev->{x};
1152 my $oy = $self->{vp}{view_y} + $ev->{y};
1153
1154 $self->{motion} = sub {
1155 my ($ev, $x, $y) = @_;
1156
1157 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1158 $self->update;
1159 };
1160
1161 return 1;
1162 }
1163
1164 0
1165}
1166
1167sub invoke_button_up {
1168 my ($self, $ev, $x, $y) = @_;
1169
1170 if (delete $self->{motion}) {
1171 return 1;
1172 }
1173
1174 0
1175}
1176
1177sub invoke_mouse_motion {
1178 my ($self, $ev, $x, $y) = @_;
1179
1180 if ($self->{motion}) {
1181 $self->{motion}->($ev, $x, $y);
1182 return 1;
1183 }
1184
1185 0
1186}
1187
960sub size_allocate { 1188sub invoke_size_allocate {
961 my ($self, $w, $h, $changed) = @_; 1189 my ($self, $w, $h) = @_;
962 1190
1191 $self->update_slider;
963 $self->SUPER::size_allocate ($w, $h, $changed); 1192 $self->SUPER::invoke_size_allocate ($w, $h)
964
965 my $child = $self->{vp}->child;
966 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
967} 1193}
968
969#TODO# update range on size_allocate depending on child
970# update viewport offset on scroll
971 1194
972############################################################################# 1195#############################################################################
973 1196
974package CFClient::UI::Frame; 1197package CFPlus::UI::Frame;
975 1198
976our @ISA = CFClient::UI::Bin::; 1199our @ISA = CFPlus::UI::Bin::;
977 1200
978use CFClient::OpenGL; 1201use CFPlus::OpenGL;
979 1202
980sub new { 1203sub new {
981 my $class = shift; 1204 my $class = shift;
982 1205
983 $class->SUPER::new ( 1206 $class->SUPER::new (
… …
991 1214
992 if ($self->{bg}) { 1215 if ($self->{bg}) {
993 my ($w, $h) = @$self{qw(w h)}; 1216 my ($w, $h) = @$self{qw(w h)};
994 1217
995 glEnable GL_BLEND; 1218 glEnable GL_BLEND;
996 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1219 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
997 glColor @{ $self->{bg} }; 1220 glColor_premultiply @{ $self->{bg} };
998 1221
999 glBegin GL_QUADS; 1222 glBegin GL_QUADS;
1000 glVertex 0 , 0; 1223 glVertex 0 , 0;
1001 glVertex 0 , $h; 1224 glVertex 0 , $h;
1002 glVertex $w, $h; 1225 glVertex $w, $h;
… …
1009 $self->SUPER::_draw; 1232 $self->SUPER::_draw;
1010} 1233}
1011 1234
1012############################################################################# 1235#############################################################################
1013 1236
1014package CFClient::UI::FancyFrame; 1237package CFPlus::UI::FancyFrame;
1015 1238
1016our @ISA = CFClient::UI::Bin::; 1239our @ISA = CFPlus::UI::Bin::;
1017 1240
1018use CFClient::OpenGL; 1241use CFPlus::OpenGL;
1242
1243sub new {
1244 my ($class, %arg) = @_;
1245
1246 if ((exists $arg{label}) && !ref $arg{label}) {
1247 $arg{label} = new CFPlus::UI::Label
1248 align => 1,
1249 valign => 0,
1250 text => $arg{label},
1251 fontsize => ($arg{border} || 0.8) * 0.75;
1252 }
1253
1254 my $self = $class->SUPER::new (
1255 # label => "",
1256 fg => [0.6, 0.3, 0.1],
1257 border => 0.8,
1258 style => 'single',
1259 %arg,
1260 );
1261
1262 $self
1263}
1264
1265sub add {
1266 my ($self, @widgets) = @_;
1267
1268 $self->SUPER::add (@widgets);
1269 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1270}
1271
1272sub border {
1273 int $_[0]{border} * $::FONTSIZE
1274}
1275
1276sub size_request {
1277 my ($self) = @_;
1278
1279 ($self->{label_w}, undef) = $self->{label}->size_request
1280 if $self->{label};
1281
1282 my ($w, $h) = $self->SUPER::size_request;
1283
1284 (
1285 $w + $self->border * 2,
1286 $h + $self->border * 2,
1287 )
1288}
1289
1290sub invoke_size_allocate {
1291 my ($self, $w, $h) = @_;
1292
1293 my $border = $self->border;
1294
1295 $w -= List::Util::max 0, $border * 2;
1296 $h -= List::Util::max 0, $border * 2;
1297
1298 if (my $label = $self->{label}) {
1299 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1300 $label->{h} = List::Util::min $h, $border;
1301 $label->invoke_size_allocate ($label->{w}, $label->{h});
1302 }
1303
1304 $self->child->configure ($border, $border, $w, $h);
1305
1306 1
1307}
1308
1309sub _draw {
1310 my ($self) = @_;
1311
1312 my $child = $self->{children}[0];
1313
1314 my $border = $self->border;
1315 my ($w, $h) = ($self->{w}, $self->{h});
1316
1317 $child->draw;
1318
1319 glColor @{$self->{fg}};
1320 glBegin GL_LINE_STRIP;
1321 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1322 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1323 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1324 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1325 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1327 glEnd;
1328
1329 if ($self->{label}) {
1330 glTranslate $border * 2, 0;
1331 $self->{label}->_draw;
1332 }
1333}
1334
1335#############################################################################
1336
1337package CFPlus::UI::Toplevel;
1338
1339our @ISA = CFPlus::UI::Bin::;
1340
1341use CFPlus::OpenGL;
1019 1342
1020my $bg = 1343my $bg =
1021 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1344 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1022 mipmap => 1, wrap => 1; 1345 mipmap => 1, wrap => 1;
1023 1346
1024my @border = 1347my @border =
1025 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1348 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1026 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1349 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1027 1350
1351my @icon =
1352 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1353 qw(x1_move.png x1_resize.png);
1354
1028sub new { 1355sub new {
1029 my $class = shift; 1356 my ($class, %arg) = @_;
1030 1357
1031 my $self = $class->SUPER::new ( 1358 my $self = $class->SUPER::new (
1032 bg => [1, 1, 1, 1], 1359 bg => [1, 1, 1, 1],
1033 border_bg => [1, 1, 1, 1], 1360 border_bg => [1, 1, 1, 1],
1034 border => 0.6, 1361 border => 0.6,
1035 can_events => 1, 1362 can_events => 1,
1036 min_w => 16, 1363 min_w => 64,
1037 min_h => 16, 1364 min_h => 32,
1038 @_ 1365 %arg,
1039 ); 1366 );
1040 1367
1041 $self->{title} &&= new CFClient::UI::Label 1368 $self->{title_widget} = new CFPlus::UI::Label
1042 align => 0, 1369 align => 0,
1043 valign => 1, 1370 valign => 1,
1044 text => $self->{title}, 1371 text => $self->{title},
1045 fontsize => $self->{border}; 1372 fontsize => $self->{border},
1373 if exists $self->{title};
1374
1375 if ($self->{has_close_button}) {
1376 $self->{close_button} =
1377 new CFPlus::UI::ImageButton
1378 path => 'x1_close.png',
1379 on_activate => sub { $self->emit ("delete") };
1380
1381 $self->CFPlus::UI::Container::add ($self->{close_button});
1382 }
1046 1383
1047 $self 1384 $self
1385}
1386
1387sub add {
1388 my ($self, @widgets) = @_;
1389
1390 $self->SUPER::add (@widgets);
1391 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1392 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1048} 1393}
1049 1394
1050sub border { 1395sub border {
1051 int $_[0]{border} * $::FONTSIZE 1396 int $_[0]{border} * $::FONTSIZE
1052} 1397}
1053 1398
1054sub size_request { 1399sub size_request {
1055 my ($self) = @_; 1400 my ($self) = @_;
1401
1402 $self->{title_widget}->size_request
1403 if $self->{title_widget};
1404
1405 $self->{close_button}->size_request
1406 if $self->{close_button};
1056 1407
1057 my ($w, $h) = $self->SUPER::size_request; 1408 my ($w, $h) = $self->SUPER::size_request;
1058 1409
1059 ( 1410 (
1060 $w + $self->border * 2, 1411 $w + $self->border * 2,
1061 $h + $self->border * 2, 1412 $h + $self->border * 2,
1062 ) 1413 )
1063} 1414}
1064 1415
1065sub size_allocate { 1416sub invoke_size_allocate {
1066 my ($self, $w, $h, $changed) = @_; 1417 my ($self, $w, $h) = @_;
1067 1418
1068 return unless $changed; 1419 if ($self->{title_widget}) {
1420 $self->{title_widget}{w} = $w;
1421 $self->{title_widget}{h} = $h;
1422 $self->{title_widget}->invoke_size_allocate ($w, $h);
1423 }
1069 1424
1425 my $border = $self->border;
1426
1070 $h -= List::Util::max 0, $self->border * 2; 1427 $h -= List::Util::max 0, $border * 2;
1071 $w -= List::Util::max 0, $self->border * 2; 1428 $w -= List::Util::max 0, $border * 2;
1072 1429
1073 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1074 if $self->{title};
1075
1076 $self->child->configure ($self->border, $self->border, $w, $h); 1430 $self->child->configure ($border, $border, $w, $h);
1077}
1078 1431
1432 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1433 if $self->{close_button};
1434
1435 1
1436}
1437
1438sub invoke_delete {
1439 my ($self) = @_;
1440
1441 $self->hide;
1442
1443 1
1444}
1445
1079sub button_down { 1446sub invoke_button_down {
1080 my ($self, $ev, $x, $y) = @_; 1447 my ($self, $ev, $x, $y) = @_;
1081 1448
1082 my ($w, $h) = @$self{qw(w h)}; 1449 my ($w, $h) = @$self{qw(w h)};
1083 my $border = $self->border; 1450 my $border = $self->border;
1084 1451
… …
1100 my $dy = $ev->{y} - $oy; 1467 my $dy = $ev->{y} - $oy;
1101 1468
1102 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1469 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1103 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1470 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1104 1471
1472 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1105 $self->realloc; 1473 $self->realloc;
1106 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1107 }; 1474 };
1108 1475
1109 } elsif ($lr ^ $td) { 1476 } elsif ($lr ^ $td) {
1110 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1477 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1111 my ($bx, $by) = ($self->{x}, $self->{y}); 1478 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1114 my ($ev, $x, $y) = @_; 1481 my ($ev, $x, $y) = @_;
1115 1482
1116 ($x, $y) = ($ev->{x}, $ev->{y}); 1483 ($x, $y) = ($ev->{x}, $ev->{y});
1117 1484
1118 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1485 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1486 # HACK: the next line is required to enforce placement
1487 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1119 }; 1488 };
1489 } else {
1490 return 0;
1491 }
1492
1120 } 1493 1
1121} 1494}
1122 1495
1123sub button_up { 1496sub invoke_button_up {
1124 my ($self, $ev, $x, $y) = @_; 1497 my ($self, $ev, $x, $y) = @_;
1125 1498
1126 delete $self->{motion}; 1499 ! ! delete $self->{motion}
1127} 1500}
1128 1501
1129sub mouse_motion { 1502sub invoke_mouse_motion {
1130 my ($self, $ev, $x, $y) = @_; 1503 my ($self, $ev, $x, $y) = @_;
1131 1504
1132 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1505 $self->{motion}->($ev, $x, $y) if $self->{motion};
1506
1507 ! ! $self->{motion}
1508}
1509
1510sub invoke_visibility_change {
1511 my ($self, $visible) = @_;
1512
1513 delete $self->{motion} unless $visible;
1514
1515 0
1133} 1516}
1134 1517
1135sub _draw { 1518sub _draw {
1136 my ($self) = @_; 1519 my ($self) = @_;
1137 1520
1521 my $child = $self->{children}[0];
1522
1138 my ($w, $h ) = ($self->{w}, $self->{h}); 1523 my ($w, $h ) = ($self->{w}, $self->{h});
1139 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1524 my ($cw, $ch) = ($child->{w}, $child->{h});
1140 1525
1141 glEnable GL_TEXTURE_2D; 1526 glEnable GL_TEXTURE_2D;
1142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1143 1528
1144 my $border = $self->border; 1529 my $border = $self->border;
1145 1530
1146 glColor @{ $self->{border_bg} }; 1531 glColor @{ $self->{border_bg} };
1147 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1532 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1148 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1533 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1149 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1534 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1150 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1535 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1536
1537 # move
1538 my $w2 = ($w - $border) * .5;
1539 my $h2 = ($h - $border) * .5;
1540 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1541 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1542 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1543
1544 # resize
1545 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1546 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1547 unless $self->{has_close_button};
1548 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1151 1550
1152 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1551 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1153 glColor @{ $self->{bg} }; 1552 glColor @{ $self->{bg} };
1154 1553
1155 # TODO: repeat texture not scale 1554 # TODO: repeat texture not scale
… …
1159 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1558 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1160 } 1559 }
1161 1560
1162 glDisable GL_TEXTURE_2D; 1561 glDisable GL_TEXTURE_2D;
1163 1562
1164 $self->{title}->draw if $self->{title};
1165
1166 $self->child->draw; 1563 $child->draw;
1564
1565 if ($self->{title_widget}) {
1566 glTranslate 0, $border - $self->{h};
1567 $self->{title_widget}->_draw;
1568
1569 glTranslate 0, - ($border - $self->{h});
1570 }
1571
1572 $self->{close_button}->draw
1573 if $self->{close_button};
1167} 1574}
1168 1575
1169############################################################################# 1576#############################################################################
1170 1577
1171package CFClient::UI::Table; 1578package CFPlus::UI::Table;
1172 1579
1173our @ISA = CFClient::UI::Base::; 1580our @ISA = CFPlus::UI::Base::;
1174 1581
1175use List::Util qw(max sum); 1582use List::Util qw(max sum);
1176 1583
1177use CFClient::OpenGL; 1584use CFPlus::OpenGL;
1178 1585
1179sub new { 1586sub new {
1180 my $class = shift; 1587 my $class = shift;
1181 1588
1182 $class->SUPER::new ( 1589 $class->SUPER::new (
1590 children => [],
1183 col_expand => [], 1591 col_expand => [],
1592 row_expand => [],
1184 @_, 1593 @_,
1185 ) 1594 )
1186} 1595}
1187 1596
1188sub children { 1597sub children {
1189 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1598 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1190} 1599}
1191 1600
1601# TODO: store row/col info in child widget and use standard add/del
1192sub add { 1602sub add {
1193 my ($self, $x, $y, $child) = @_; 1603 my $self = shift;
1194 1604
1605 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1606 $self->add_at (@_);
1607}
1608
1609sub add_at {
1610 my $self = shift;
1611
1612 while (@_) {
1613 my ($col, $row, $child) = splice @_, 0, 3, ();
1614
1195 $child->set_parent ($self); 1615 $child->set_parent ($self);
1196 $self->{children}[$y][$x] = $child; 1616 $self->{children}[$row][$col] = $child;
1617 }
1197 1618
1619 $self->{force_realloc} = 1;
1620 $self->{force_size_alloc} = 1;
1198 $self->realloc; 1621 $self->realloc;
1622}
1623
1624sub remove {
1625 my ($self, $child) = @_;
1626
1627 for (@{ $self->{children} }) {
1628 for (@{ $_ || [] }) {
1629 $_ = undef if $_ == $child;
1630 }
1631 }
1199} 1632}
1200 1633
1201# TODO: move to container class maybe? send children a signal on removal? 1634# TODO: move to container class maybe? send children a signal on removal?
1202sub clear { 1635sub clear {
1203 my ($self) = @_; 1636 my ($self) = @_;
… …
1244 (sum @$ws), 1677 (sum @$ws),
1245 (sum @$hs), 1678 (sum @$hs),
1246 ) 1679 )
1247} 1680}
1248 1681
1249sub size_allocate { 1682sub invoke_size_allocate {
1250 my ($self, $w, $h, $changed) = @_; 1683 my ($self, $w, $h) = @_;
1251 1684
1252 my ($ws, $hs) = $self->get_wh; 1685 my ($ws, $hs) = $self->get_wh;
1253 1686
1254 my $req_w = (sum @$ws) || 1; 1687 my $req_w = (sum @$ws) || 1;
1255 my $req_h = (sum @$hs) || 1; 1688 my $req_h = (sum @$hs) || 1;
1256 1689
1257 # TODO: nicer code && do row_expand 1690 # TODO: nicer code
1258 my @col_expand = @{$self->{col_expand}}; 1691 my @col_expand = @{$self->{col_expand}};
1259 @col_expand = (1) x @$ws unless @col_expand; 1692 @col_expand = (1) x @$ws unless @col_expand;
1260 my $col_expand = (sum @col_expand) || 1; 1693 my $col_expand = (sum @col_expand) || 1;
1261 1694
1262 # linearly scale sizes
1263 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1695 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1264 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1265 1696
1266 CFClient::UI::harmonize $ws; 1697 CFPlus::UI::harmonize $ws;
1698
1699 my @row_expand = @{$self->{row_expand}};
1700 @row_expand = (1) x @$ws unless @row_expand;
1701 my $row_expand = (sum @row_expand) || 1;
1702
1703 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1704
1267 CFClient::UI::harmonize $hs; 1705 CFPlus::UI::harmonize $hs;
1268 1706
1269 my $y; 1707 my $y;
1270 1708
1271 for my $r (0 .. $#{$self->{children}}) { 1709 for my $r (0 .. $#{$self->{children}}) {
1272 my $row = $self->{children}[$r] 1710 my $row = $self->{children}[$r]
… …
1286 } 1724 }
1287 1725
1288 $y += $row_h; 1726 $y += $row_h;
1289 } 1727 }
1290 1728
1729 1
1291} 1730}
1292 1731
1293sub find_widget { 1732sub find_widget {
1294 my ($self, $x, $y) = @_; 1733 my ($self, $x, $y) = @_;
1295 1734
… …
1314 } 1753 }
1315} 1754}
1316 1755
1317############################################################################# 1756#############################################################################
1318 1757
1319package CFClient::UI::Box; 1758package CFPlus::UI::Fixed;
1320 1759
1760use List::Util qw(min max);
1761
1321our @ISA = CFClient::UI::Container::; 1762our @ISA = CFPlus::UI::Container::;
1763
1764sub add {
1765 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1766
1767 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1768 $self->SUPER::add ($child);
1769}
1770
1771sub _scale($$$) {
1772 my ($mode, $val, $max) = @_;
1773
1774 $mode eq "abs" ? $val
1775 : $mode eq "rel" ? $val * $max
1776 : 0
1777}
1778
1779sub size_request {
1780 my ($self) = @_;
1781
1782 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1783
1784 # determine overall size by querying abs widgets
1785 for my $child ($self->visible_children) {
1786 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1787
1788 if ($pos eq "abs") {
1789 $w = _scale $size, $w, $child->{req_w};
1790 $h = _scale $size, $h, $child->{req_h};
1791
1792 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1793 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1794 }
1795 }
1796
1797 my $W = $x2 - $x1;
1798 my $H = $y2 - $y1;
1799
1800 # now layout remaining widgets
1801 for my $child ($self->visible_children) {
1802 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1803
1804 if ($pos ne "abs") {
1805 $x = _scale $pos, $x, $W;
1806 $y = _scale $pos, $x, $H;
1807 $w = _scale $size, $w, $child->{req_w};
1808 $h = _scale $size, $h, $child->{req_h};
1809
1810 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1811 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1812 }
1813 }
1814
1815 my $W = $x2 - $x1;
1816 my $H = $y2 - $y1;
1817
1818 ($W, $H)
1819}
1820
1821sub invoke_size_allocate {
1822 my ($self, $W, $H) = @_;
1823
1824 for my $child ($self->visible_children) {
1825 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1826
1827 $x = _scale $pos, $x, $W;
1828 $y = _scale $pos, $x, $H;
1829 $w = _scale $size, $w, $child->{req_w};
1830 $h = _scale $size, $h, $child->{req_h};
1831
1832 $child->configure ($x, $y, $w, $h);
1833 }
1834
1835 1
1836}
1837
1838#############################################################################
1839
1840package CFPlus::UI::Box;
1841
1842our @ISA = CFPlus::UI::Container::;
1322 1843
1323sub size_request { 1844sub size_request {
1324 my ($self) = @_; 1845 my ($self) = @_;
1325 1846
1326 $self->{vertical} 1847 $self->{vertical}
… …
1332 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1853 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1333 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1854 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1334 ) 1855 )
1335} 1856}
1336 1857
1337sub size_allocate { 1858sub invoke_size_allocate {
1338 my ($self, $w, $h, $changed) = @_; 1859 my ($self, $w, $h) = @_;
1339 1860
1340 my $space = $self->{vertical} ? $h : $w; 1861 my $space = $self->{vertical} ? $h : $w;
1341 my $children = $self->{children}; 1862 my @children = $self->visible_children;
1342 1863
1343 my @req; 1864 my @req;
1344 1865
1345 if ($self->{homogeneous}) { 1866 if ($self->{homogeneous}) {
1346 @req = ($space / (@$children || 1)) x @$children; 1867 @req = ($space / (@children || 1)) x @children;
1347 } else { 1868 } else {
1348 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1869 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1349 my $req = List::Util::sum @req; 1870 my $req = List::Util::sum @req;
1350 1871
1351 if ($req > $space) { 1872 if ($req > $space) {
1352 # ah well, not enough space 1873 # ah well, not enough space
1353 $_ *= $space / $req for @req; 1874 $_ *= $space / $req for @req;
1354 } else { 1875 } else {
1355 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1876 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1356 1877
1357 $space = ($space - $req) / $expand; # remaining space to give away 1878 $space = ($space - $req) / $expand; # remaining space to give away
1358 1879
1359 $req[$_] += $space * $children->[$_]{expand} 1880 $req[$_] += $space * $children[$_]{expand}
1360 for 0 .. $#$children; 1881 for 0 .. $#children;
1361 } 1882 }
1362 } 1883 }
1363 1884
1364 CFClient::UI::harmonize \@req; 1885 CFPlus::UI::harmonize \@req;
1365 1886
1366 my $pos = 0; 1887 my $pos = 0;
1367 for (0 .. $#$children) { 1888 for (0 .. $#children) {
1368 my $alloc = $req[$_]; 1889 my $alloc = $req[$_];
1369 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1890 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1370 1891
1371 $pos += $alloc; 1892 $pos += $alloc;
1372 } 1893 }
1373 1894
1374 1 1895 1
1375} 1896}
1376 1897
1377############################################################################# 1898#############################################################################
1378 1899
1379package CFClient::UI::HBox; 1900package CFPlus::UI::HBox;
1380 1901
1381our @ISA = CFClient::UI::Box::; 1902our @ISA = CFPlus::UI::Box::;
1382 1903
1383sub new { 1904sub new {
1384 my $class = shift; 1905 my $class = shift;
1385 1906
1386 $class->SUPER::new ( 1907 $class->SUPER::new (
… …
1389 ) 1910 )
1390} 1911}
1391 1912
1392############################################################################# 1913#############################################################################
1393 1914
1394package CFClient::UI::VBox; 1915package CFPlus::UI::VBox;
1395 1916
1396our @ISA = CFClient::UI::Box::; 1917our @ISA = CFPlus::UI::Box::;
1397 1918
1398sub new { 1919sub new {
1399 my $class = shift; 1920 my $class = shift;
1400 1921
1401 $class->SUPER::new ( 1922 $class->SUPER::new (
… …
1404 ) 1925 )
1405} 1926}
1406 1927
1407############################################################################# 1928#############################################################################
1408 1929
1409package CFClient::UI::Label; 1930package CFPlus::UI::Label;
1410 1931
1411our @ISA = CFClient::UI::DrawBG::; 1932our @ISA = CFPlus::UI::DrawBG::;
1412 1933
1413use CFClient::OpenGL; 1934use CFPlus::OpenGL;
1414 1935
1415sub new { 1936sub new {
1416 my ($class, %arg) = @_; 1937 my ($class, %arg) = @_;
1417 1938
1418 my $self = $class->SUPER::new ( 1939 my $self = $class->SUPER::new (
… …
1421 #active_bg => none 1942 #active_bg => none
1422 #font => default_font 1943 #font => default_font
1423 #text => initial text 1944 #text => initial text
1424 #markup => initial narkup 1945 #markup => initial narkup
1425 #max_w => maximum pixel width 1946 #max_w => maximum pixel width
1947 #style => 0, # render flags
1426 ellipsise => 3, # end 1948 ellipsise => 3, # end
1427 layout => (new CFClient::Layout), 1949 layout => (new CFPlus::Layout),
1428 fontsize => 1, 1950 fontsize => 1,
1429 align => -1, 1951 align => -1,
1430 valign => -1, 1952 valign => -1,
1431 padding_x => 2, 1953 padding_x => 2,
1432 padding_y => 2, 1954 padding_y => 2,
1433 can_events => 0, 1955 can_events => 0,
1434 %arg 1956 %arg
1435 ); 1957 );
1436 1958
1437 if (exists $self->{template}) { 1959 if (exists $self->{template}) {
1438 my $layout = new CFClient::Layout; 1960 my $layout = new CFPlus::Layout;
1439 $layout->set_text (delete $self->{template}); 1961 $layout->set_text (delete $self->{template});
1440 $self->{template} = $layout; 1962 $self->{template} = $layout;
1441 } 1963 }
1442 1964
1443 if (exists $self->{markup}) { 1965 if (exists $self->{markup}) {
… …
1447 } 1969 }
1448 1970
1449 $self 1971 $self
1450} 1972}
1451 1973
1452sub escape($) {
1453 local $_ = $_[0];
1454
1455 s/&/&amp;/g;
1456 s/>/&gt;/g;
1457 s/</&lt;/g;
1458
1459 $_
1460}
1461
1462sub update { 1974sub update {
1463 my ($self) = @_; 1975 my ($self) = @_;
1464 1976
1465 delete $self->{texture}; 1977 delete $self->{texture};
1466 $self->SUPER::update; 1978 $self->SUPER::update;
1467} 1979}
1468 1980
1981sub realloc {
1982 my ($self) = @_;
1983
1984 delete $self->{ox};
1985 $self->SUPER::realloc;
1986}
1987
1469sub set_text { 1988sub set_text {
1470 my ($self, $text) = @_; 1989 my ($self, $text) = @_;
1471 1990
1472 return if $self->{text} eq "T$text"; 1991 return if $self->{text} eq "T$text";
1473 $self->{text} = "T$text"; 1992 $self->{text} = "T$text";
1474 1993
1475 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1476 $self->{layout}->set_text ($text); 1994 $self->{layout}->set_text ($text);
1477 1995
1996 delete $self->{size_req};
1478 $self->realloc; 1997 $self->realloc;
1479 $self->update; 1998 $self->update;
1480} 1999}
1481 2000
1482sub set_markup { 2001sub set_markup {
… …
1485 return if $self->{text} eq "M$markup"; 2004 return if $self->{text} eq "M$markup";
1486 $self->{text} = "M$markup"; 2005 $self->{text} = "M$markup";
1487 2006
1488 my $rgba = $markup =~ /span.*(?:foreground|background)/; 2007 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1489 2008
1490 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1491 $self->{layout}->set_markup ($markup); 2009 $self->{layout}->set_markup ($markup);
1492 2010
2011 delete $self->{size_req};
1493 $self->realloc; 2012 $self->realloc;
1494 $self->update; 2013 $self->update;
1495} 2014}
1496 2015
1497sub size_request { 2016sub size_request {
1498 my ($self) = @_; 2017 my ($self) = @_;
1499 2018
2019 $self->{size_req} ||= do {
1500 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2020 $self->{layout}->set_font ($self->{font}) if $self->{font};
1501 $self->{layout}->set_width ($self->{max_w} || -1); 2021 $self->{layout}->set_width ($self->{max_w} || -1);
1502 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2022 $self->{layout}->set_ellipsise ($self->{ellipsise});
1503 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2023 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2024 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1505 2025
1506 my ($w, $h) = $self->{layout}->size; 2026 my ($w, $h) = $self->{layout}->size;
1507 2027
1508 if (exists $self->{template}) { 2028 if (exists $self->{template}) {
1509 $self->{template}->set_font ($self->{font}) if $self->{font}; 2029 $self->{template}->set_font ($self->{font}) if $self->{font};
2030 $self->{template}->set_width ($self->{max_w} || -1);
1510 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2031 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1511 2032
1512 my ($w2, $h2) = $self->{template}->size; 2033 my ($w2, $h2) = $self->{template}->size;
1513 2034
1514 $w = List::Util::max $w, $w2; 2035 $w = List::Util::max $w, $w2;
1515 $h = List::Util::max $h, $h2; 2036 $h = List::Util::max $h, $h2;
2037 }
2038
2039 [$w, $h]
1516 } 2040 };
1517 2041
1518 ($w, $h) 2042 @{ $self->{size_req} }
1519} 2043}
1520 2044
2045sub baseline_shift {
2046 $_[0]{layout}->descent
2047}
2048
1521sub size_allocate { 2049sub invoke_size_allocate {
1522 my ($self, $w, $h, $changed) = @_; 2050 my ($self, $w, $h) = @_;
2051
2052 delete $self->{ox};
1523 2053
1524 delete $self->{texture} 2054 delete $self->{texture}
1525 if $changed; 2055 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2056
2057 1
1526} 2058}
1527 2059
1528sub set_fontsize { 2060sub set_fontsize {
1529 my ($self, $fontsize) = @_; 2061 my ($self, $fontsize) = @_;
1530 2062
1531 $self->{fontsize} = $fontsize; 2063 $self->{fontsize} = $fontsize;
2064 delete $self->{size_req};
1532 delete $self->{texture}; 2065 delete $self->{texture};
1533 2066
1534 $self->realloc; 2067 $self->realloc;
1535} 2068}
1536 2069
2070sub reconfigure {
2071 my ($self) = @_;
2072
2073 delete $self->{size_req};
2074 delete $self->{texture};
2075
2076 $self->SUPER::reconfigure;
2077}
2078
1537sub _draw { 2079sub _draw {
1538 my ($self) = @_; 2080 my ($self) = @_;
1539 2081
1540 $self->SUPER::_draw; # draw background, if applicable 2082 $self->SUPER::_draw; # draw background, if applicable
1541 2083
1542 my $tex = $self->{texture} ||= do { 2084 my $size = $self->{texture} ||= do {
1543 $self->{layout}->set_foreground (@{$self->{fg}}); 2085 $self->{layout}->set_foreground (@{$self->{fg}});
1544 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2086 $self->{layout}->set_font ($self->{font}) if $self->{font};
1545 $self->{layout}->set_width ($self->{w}); 2087 $self->{layout}->set_width ($self->{w});
1546 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2088 $self->{layout}->set_ellipsise ($self->{ellipsise});
1547 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2089 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1548 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2090 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1549 2091
1550 my $tex = new_from_layout CFClient::Texture $self->{layout}; 2092 [$self->{layout}->size]
2093 };
1551 2094
2095 unless (exists $self->{ox}) {
1552 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2096 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1553 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2097 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1554 : ($self->{w} - $tex->{w}) * 0.5); 2098 : ($self->{w} - $size->[0]) * 0.5);
1555 2099
1556 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2100 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1557 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2101 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1558 : ($self->{h} - $tex->{h}) * 0.5); 2102 : ($self->{h} - $size->[1]) * 0.5);
1559
1560 $tex
1561 }; 2103 };
1562 2104
1563 glEnable GL_TEXTURE_2D; 2105 my $w = List::Util::min $self->{w} + 4, $size->[0];
1564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2106 my $h = List::Util::min $self->{h} + 2, $size->[1];
1565 2107
1566 if ($tex->{format} == GL_ALPHA) { 2108 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1567 glColor @{$self->{fg}};
1568 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1569 } else {
1570 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1571 }
1572
1573 glDisable GL_TEXTURE_2D;
1574} 2109}
1575 2110
1576############################################################################# 2111#############################################################################
1577 2112
1578package CFClient::UI::EntryBase; 2113package CFPlus::UI::EntryBase;
1579 2114
1580our @ISA = CFClient::UI::Label::; 2115our @ISA = CFPlus::UI::Label::;
1581 2116
1582use CFClient::OpenGL; 2117use CFPlus::OpenGL;
1583 2118
1584sub new { 2119sub new {
1585 my $class = shift; 2120 my $class = shift;
1586 2121
1587 $class->SUPER::new ( 2122 $class->SUPER::new (
… …
1591 active_fg => [0, 0, 0], 2126 active_fg => [0, 0, 0],
1592 can_hover => 1, 2127 can_hover => 1,
1593 can_focus => 1, 2128 can_focus => 1,
1594 valign => 0, 2129 valign => 0,
1595 can_events => 1, 2130 can_events => 1,
2131 ellipsise => 0,
1596 #text => ... 2132 #text => ...
2133 #hidden => "*",
1597 @_ 2134 @_
1598 ) 2135 )
1599} 2136}
1600 2137
1601sub _set_text { 2138sub _set_text {
… …
1603 2140
1604 delete $self->{cur_h}; 2141 delete $self->{cur_h};
1605 2142
1606 return if $self->{text} eq $text; 2143 return if $self->{text} eq $text;
1607 2144
1608 delete $self->{texture};
1609
1610 $self->{last_activity} = $::NOW; 2145 $self->{last_activity} = $::NOW;
1611 $self->{text} = $text; 2146 $self->{text} = $text;
1612 2147
1613 $text =~ s/./*/g if $self->{hidden}; 2148 $text =~ s/./*/g if $self->{hidden};
1614 $self->{layout}->set_text ("$text "); 2149 $self->{layout}->set_text ("$text ");
2150 delete $self->{size_req};
1615 2151
1616 $self->_emit (changed => $self->{text}); 2152 $self->emit (changed => $self->{text});
2153
2154 $self->realloc;
2155 $self->update;
1617} 2156}
1618 2157
1619sub set_text { 2158sub set_text {
1620 my ($self, $text) = @_; 2159 my ($self, $text) = @_;
1621 2160
1622 $self->{cursor} = length $text; 2161 $self->{cursor} = length $text;
1623 $self->_set_text ($text); 2162 $self->_set_text ($text);
1624
1625 $self->realloc;
1626} 2163}
1627 2164
1628sub get_text { 2165sub get_text {
1629 $_[0]{text} 2166 $_[0]{text}
1630} 2167}
… …
1635 my ($w, $h) = $self->SUPER::size_request; 2172 my ($w, $h) = $self->SUPER::size_request;
1636 2173
1637 ($w + 1, $h) # add 1 for cursor 2174 ($w + 1, $h) # add 1 for cursor
1638} 2175}
1639 2176
1640sub key_down { 2177sub invoke_key_down {
1641 my ($self, $ev) = @_; 2178 my ($self, $ev) = @_;
1642 2179
1643 my $mod = $ev->{mod}; 2180 my $mod = $ev->{mod};
1644 my $sym = $ev->{sym}; 2181 my $sym = $ev->{sym};
1645 my $uni = $ev->{unicode}; 2182 my $uni = $ev->{unicode};
1646 2183
1647 my $text = $self->get_text; 2184 my $text = $self->get_text;
2185
2186 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1648 2187
1649 if ($uni == 8) { 2188 if ($uni == 8) {
1650 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2189 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1651 } elsif ($uni == 127) { 2190 } elsif ($uni == 127) {
1652 substr $text, $self->{cursor}, 1, ""; 2191 substr $text, $self->{cursor}, 1, "";
1653 } elsif ($sym == CFClient::SDLK_LEFT) { 2192 } elsif ($sym == CFPlus::SDLK_LEFT) {
1654 --$self->{cursor} if $self->{cursor}; 2193 --$self->{cursor} if $self->{cursor};
1655 } elsif ($sym == CFClient::SDLK_RIGHT) { 2194 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1656 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2195 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1657 } elsif ($sym == CFClient::SDLK_HOME) { 2196 } elsif ($sym == CFPlus::SDLK_HOME) {
2197 # what a hack
2198 $self->{cursor} =
2199 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2200 ? length $1
2201 : 0;
2202 } elsif ($sym == CFPlus::SDLK_END) {
2203 # uh, again
2204 $self->{cursor} =
2205 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2206 ? $self->{cursor} + length $1
2207 : length $self->{text};
2208 } elsif ($uni == 21) { # ctrl-u
2209 $text = "";
1658 $self->{cursor} = 0; 2210 $self->{cursor} = 0;
1659 } elsif ($sym == CFClient::SDLK_END) {
1660 $self->{cursor} = length $text;
1661 } elsif ($uni == 27) { 2211 } elsif ($uni == 27) {
1662 $self->_emit ('escape'); 2212 $self->emit ('escape');
1663 } elsif ($uni) { 2213 } elsif ($uni == 0x0d) {
2214 substr $text, $self->{cursor}++, 0, "\012";
2215 } elsif ($uni >= 0x20) {
1664 substr $text, $self->{cursor}++, 0, chr $uni; 2216 substr $text, $self->{cursor}++, 0, chr $uni;
2217 } else {
2218 return 0;
1665 } 2219 }
1666 2220
1667 $self->_set_text ($text); 2221 $self->_set_text ($text);
1668 2222
1669 $self->realloc; 2223 $self->realloc;
1670} 2224 $self->update;
1671 2225
2226 1
2227}
2228
1672sub focus_in { 2229sub invoke_focus_in {
1673 my ($self) = @_; 2230 my ($self) = @_;
1674 2231
1675 $self->{last_activity} = $::NOW; 2232 $self->{last_activity} = $::NOW;
1676 2233
1677 $self->SUPER::focus_in; 2234 $self->SUPER::invoke_focus_in
1678} 2235}
1679 2236
1680sub button_down { 2237sub invoke_button_down {
1681 my ($self, $ev, $x, $y) = @_; 2238 my ($self, $ev, $x, $y) = @_;
1682 2239
1683 $self->SUPER::button_down ($ev, $x, $y); 2240 $self->SUPER::invoke_button_down ($ev, $x, $y);
1684 2241
1685 my $idx = $self->{layout}->xy_to_index ($x, $y); 2242 my $idx = $self->{layout}->xy_to_index ($x, $y);
1686 2243
1687 # byte-index to char-index 2244 # byte-index to char-index
1688 my $text = $self->{text}; 2245 my $text = $self->{text};
1689 utf8::encode $text; 2246 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1690 $self->{cursor} = length substr $text, 0, $idx; 2247 $self->{cursor} = length $text;
1691 2248
1692 $self->_set_text ($self->{text}); 2249 $self->_set_text ($self->{text});
1693 $self->update; 2250 $self->update;
2251
2252 1
1694} 2253}
1695 2254
1696sub mouse_motion { 2255sub invoke_mouse_motion {
1697 my ($self, $ev, $x, $y) = @_; 2256 my ($self, $ev, $x, $y) = @_;
1698# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2257# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2258
2259 1
1699} 2260}
1700 2261
1701sub _draw { 2262sub _draw {
1702 my ($self) = @_; 2263 my ($self) = @_;
1703 2264
1704 local $self->{fg} = $self->{fg}; 2265 local $self->{fg} = $self->{fg};
1705 2266
1706 if ($FOCUS == $self) { 2267 if ($FOCUS == $self) {
1707 glColor @{$self->{active_bg}}; 2268 glColor_premultiply @{$self->{active_bg}};
1708 $self->{fg} = $self->{active_fg}; 2269 $self->{fg} = $self->{active_fg};
1709 } else { 2270 } else {
1710 glColor @{$self->{bg}}; 2271 glColor_premultiply @{$self->{bg}};
1711 } 2272 }
1712 2273
1713 glEnable GL_BLEND; 2274 glEnable GL_BLEND;
1714 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2275 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1715 glBegin GL_QUADS; 2276 glBegin GL_QUADS;
1716 glVertex 0 , 0; 2277 glVertex 0 , 0;
1717 glVertex 0 , $self->{h}; 2278 glVertex 0 , $self->{h};
1718 glVertex $self->{w}, $self->{h}; 2279 glVertex $self->{w}, $self->{h};
1719 glVertex $self->{w}, 0; 2280 glVertex $self->{w}, 0;
… …
1730 utf8::encode $text; 2291 utf8::encode $text;
1731 2292
1732 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2293 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1733 } 2294 }
1734 2295
1735 glColor @{$self->{fg}};
1736 glBegin GL_LINES; 2296 glBegin GL_LINES;
1737 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2297 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1738 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2298 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1739 glEnd; 2299 glEnd;
1740 } 2300 }
1741} 2301}
1742 2302
2303#############################################################################
2304
1743package CFClient::UI::Entry; 2305package CFPlus::UI::Entry;
1744 2306
1745our @ISA = CFClient::UI::EntryBase::; 2307our @ISA = CFPlus::UI::EntryBase::;
1746 2308
1747use CFClient::OpenGL; 2309use CFPlus::OpenGL;
1748 2310
1749sub key_down { 2311sub invoke_key_down {
1750 my ($self, $ev) = @_; 2312 my ($self, $ev) = @_;
1751 2313
1752 my $sym = $ev->{sym}; 2314 my $sym = $ev->{sym};
1753 2315
1754 if ($sym == 13) { 2316 if ($ev->{uni} == 0x0d || $sym == 13) {
1755 unshift @{$self->{history}}, 2317 unshift @{$self->{history}},
1756 my $txt = $self->get_text; 2318 my $txt = $self->get_text;
2319
1757 $self->{history_pointer} = -1; 2320 $self->{history_pointer} = -1;
1758 $self->{history_saveback} = ''; 2321 $self->{history_saveback} = '';
1759 $self->_emit (activate => $txt); 2322 $self->emit (activate => $txt);
1760 $self->update; 2323 $self->update;
1761 2324
1762 } elsif ($sym == CFClient::SDLK_UP) { 2325 } elsif ($sym == CFPlus::SDLK_UP) {
1763 if ($self->{history_pointer} < 0) { 2326 if ($self->{history_pointer} < 0) {
1764 $self->{history_saveback} = $self->get_text; 2327 $self->{history_saveback} = $self->get_text;
1765 } 2328 }
1766 if (@{$self->{history} || []} > 0) { 2329 if (@{$self->{history} || []} > 0) {
1767 $self->{history_pointer}++; 2330 $self->{history_pointer}++;
… …
1769 $self->{history_pointer} = @{$self->{history} || []} - 1; 2332 $self->{history_pointer} = @{$self->{history} || []} - 1;
1770 } 2333 }
1771 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2334 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1772 } 2335 }
1773 2336
1774 } elsif ($sym == CFClient::SDLK_DOWN) { 2337 } elsif ($sym == CFPlus::SDLK_DOWN) {
1775 $self->{history_pointer}--; 2338 $self->{history_pointer}--;
1776 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2339 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1777 2340
1778 if ($self->{history_pointer} >= 0) { 2341 if ($self->{history_pointer} >= 0) {
1779 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2342 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1780 } else { 2343 } else {
1781 $self->set_text ($self->{history_saveback}); 2344 $self->set_text ($self->{history_saveback});
1782 } 2345 }
1783 2346
1784 } else { 2347 } else {
1785 $self->SUPER::key_down ($ev); 2348 return $self->SUPER::invoke_key_down ($ev)
2349 }
2350
1786 } 2351 1
1787
1788} 2352}
1789 2353
1790############################################################################# 2354#############################################################################
1791 2355
2356package CFPlus::UI::TextEdit;
2357
2358our @ISA = CFPlus::UI::EntryBase::;
2359
2360use CFPlus::OpenGL;
2361
2362sub move_cursor_ver {
2363 my ($self, $dy) = @_;
2364
2365 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2366
2367 $y += $dy;
2368
2369 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2370 $self->{cursor} = $index;
2371 delete $self->{cur_h};
2372 $self->update;
2373 return;
2374 }
2375}
2376
2377sub invoke_key_down {
2378 my ($self, $ev) = @_;
2379
2380 my $sym = $ev->{sym};
2381
2382 if ($sym == CFPlus::SDLK_UP) {
2383 $self->move_cursor_ver (-1);
2384 } elsif ($sym == CFPlus::SDLK_DOWN) {
2385 $self->move_cursor_ver (+1);
2386 } else {
2387 return $self->SUPER::invoke_key_down ($ev)
2388 }
2389
2390 1
2391}
2392
2393#############################################################################
2394
1792package CFClient::UI::Button; 2395package CFPlus::UI::Button;
1793 2396
1794our @ISA = CFClient::UI::Label::; 2397our @ISA = CFPlus::UI::Label::;
1795 2398
1796use CFClient::OpenGL; 2399use CFPlus::OpenGL;
1797 2400
1798my @tex = 2401my @tex =
1799 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2402 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1800 qw(b1_button_active.png); 2403 qw(b1_button_inactive.png b1_button_active.png);
1801 2404
1802sub new { 2405sub new {
1803 my $class = shift; 2406 my $class = shift;
1804 2407
1805 $class->SUPER::new ( 2408 $class->SUPER::new (
1806 padding_x => 4, 2409 padding_x => 4,
1807 padding_y => 4, 2410 padding_y => 4,
1808 fg => [1, 1, 1], 2411 fg => [1.0, 1.0, 1.0],
1809 active_fg => [0, 0, 1], 2412 active_fg => [0.8, 0.8, 0.8],
1810 can_hover => 1, 2413 can_hover => 1,
1811 align => 0, 2414 align => 0,
1812 valign => 0, 2415 valign => 0,
1813 can_events => 1, 2416 can_events => 1,
1814 @_ 2417 @_
1815 ) 2418 )
1816} 2419}
1817 2420
1818sub activate { }
1819
1820sub button_up { 2421sub invoke_button_up {
1821 my ($self, $ev, $x, $y) = @_; 2422 my ($self, $ev, $x, $y) = @_;
1822 2423
1823 $self->emit ("activate") 2424 $self->emit ("activate")
1824 if $x >= 0 && $x < $self->{w} 2425 if $x >= 0 && $x < $self->{w}
1825 && $y >= 0 && $y < $self->{h}; 2426 && $y >= 0 && $y < $self->{h};
2427
2428 1
1826} 2429}
1827 2430
1828sub _draw { 2431sub _draw {
1829 my ($self) = @_; 2432 my ($self) = @_;
1830 2433
1831 local $self->{fg} = $self->{fg}; 2434 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1832
1833 if ($GRAB == $self) {
1834 $self->{fg} = $self->{active_fg};
1835 }
1836 2435
1837 glEnable GL_TEXTURE_2D; 2436 glEnable GL_TEXTURE_2D;
1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1839 glColor 0, 0, 0, 1; 2438 glColor 0, 0, 0, 1;
1840 2439
2440 my $tex = $tex[$GRAB == $self];
1841 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2441 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1842 2442
1843 glDisable GL_TEXTURE_2D; 2443 glDisable GL_TEXTURE_2D;
1844 2444
1845 $self->SUPER::_draw; 2445 $self->SUPER::_draw;
1846} 2446}
1847 2447
1848############################################################################# 2448#############################################################################
1849 2449
1850package CFClient::UI::CheckBox; 2450package CFPlus::UI::CheckBox;
1851 2451
1852our @ISA = CFClient::UI::DrawBG::; 2452our @ISA = CFPlus::UI::DrawBG::;
1853 2453
1854my @tex = 2454my @tex =
1855 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2455 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1856 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2456 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1857 2457
1858use CFClient::OpenGL; 2458use CFPlus::OpenGL;
1859 2459
1860sub new { 2460sub new {
1861 my $class = shift; 2461 my $class = shift;
1862 2462
1863 $class->SUPER::new ( 2463 $class->SUPER::new (
… …
1877 my ($self) = @_; 2477 my ($self) = @_;
1878 2478
1879 (6) x 2 2479 (6) x 2
1880} 2480}
1881 2481
2482sub toggle {
2483 my ($self) = @_;
2484
2485 $self->{state} = !$self->{state};
2486 $self->emit (changed => $self->{state});
2487 $self->update;
2488}
2489
1882sub button_down { 2490sub invoke_button_down {
1883 my ($self, $ev, $x, $y) = @_; 2491 my ($self, $ev, $x, $y) = @_;
1884 2492
1885 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2493 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1886 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2494 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1887 $self->{state} = !$self->{state}; 2495 $self->toggle;
1888 $self->_emit (changed => $self->{state}); 2496 } else {
2497 return 0
2498 }
2499
1889 } 2500 1
1890} 2501}
1891 2502
1892sub _draw { 2503sub _draw {
1893 my ($self) = @_; 2504 my ($self) = @_;
1894 2505
… …
1909 glDisable GL_TEXTURE_2D; 2520 glDisable GL_TEXTURE_2D;
1910} 2521}
1911 2522
1912############################################################################# 2523#############################################################################
1913 2524
1914package CFClient::UI::Image; 2525package CFPlus::UI::Image;
1915 2526
1916our @ISA = CFClient::UI::Base::; 2527our @ISA = CFPlus::UI::Base::;
1917 2528
1918use CFClient::OpenGL; 2529use CFPlus::OpenGL;
1919use Carp qw/confess/;
1920 2530
1921our %loaded_images; 2531our %texture_cache;
1922 2532
1923sub new { 2533sub new {
1924 my $class = shift; 2534 my $class = shift;
1925 2535
1926 my $self = $class->SUPER::new (can_events => 0, @_); 2536 my $self = $class->SUPER::new (
2537 can_events => 0,
2538 @_,
2539 );
1927 2540
1928 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2541 $self->{path} || $self->{tex}
2542 or Carp::croak "'path' or 'tex' attributes required";
1929 2543
1930 $loaded_images{$self->{image}} ||= 2544 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1931 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2545 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1932 2546
1933 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2547 CFPlus::weaken $texture_cache{$self->{path}};
1934 2548
1935 Scalar::Util::weaken $loaded_images{$self->{image}}; 2549 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1936
1937 $self->{aspect} = $tex->{w} / $tex->{h};
1938 2550
1939 $self 2551 $self
1940} 2552}
1941 2553
2554sub STORABLE_freeze {
2555 my ($self, $cloning) = @_;
2556
2557 $self->{path}
2558 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2559
2560 $self->{path}
2561}
2562
2563sub STORABLE_attach {
2564 my ($self, $cloning, $path) = @_;
2565
2566 $self->new (path => $path)
2567}
2568
1942sub size_request { 2569sub size_request {
1943 my ($self) = @_; 2570 my ($self) = @_;
1944 2571
1945 ($self->{tex}->{w}, $self->{tex}->{h}) 2572 ($self->{tex}{w}, $self->{tex}{h})
1946} 2573}
1947 2574
1948sub _draw { 2575sub _draw {
1949 my ($self) = @_; 2576 my ($self) = @_;
1950 2577
… …
1960 } 2587 }
1961 2588
1962 glEnable GL_TEXTURE_2D; 2589 glEnable GL_TEXTURE_2D;
1963 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2590 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1964 2591
1965 $tex->draw_quad_alpha (0, 0, $w, $h); 2592 $tex->draw_quad (0, 0, $w, $h);
1966 2593
1967 glDisable GL_TEXTURE_2D; 2594 glDisable GL_TEXTURE_2D;
1968} 2595}
1969 2596
1970############################################################################# 2597#############################################################################
1971 2598
2599package CFPlus::UI::ImageButton;
2600
2601our @ISA = CFPlus::UI::Image::;
2602
2603use CFPlus::OpenGL;
2604
2605my %textures;
2606
2607sub new {
2608 my $class = shift;
2609
2610 my $self = $class->SUPER::new (
2611 padding_x => 4,
2612 padding_y => 4,
2613 fg => [1, 1, 1],
2614 active_fg => [0, 0, 1],
2615 can_hover => 1,
2616 align => 0,
2617 valign => 0,
2618 can_events => 1,
2619 @_
2620 );
2621}
2622
2623sub invoke_button_up {
2624 my ($self, $ev, $x, $y) = @_;
2625
2626 $self->emit ("activate")
2627 if $x >= 0 && $x < $self->{w}
2628 && $y >= 0 && $y < $self->{h};
2629
2630 1
2631}
2632
2633#############################################################################
2634
1972package CFClient::UI::VGauge; 2635package CFPlus::UI::VGauge;
1973 2636
1974our @ISA = CFClient::UI::Base::; 2637our @ISA = CFPlus::UI::Base::;
1975 2638
1976use List::Util qw(min max); 2639use List::Util qw(min max);
1977 2640
1978use CFClient::OpenGL; 2641use CFPlus::OpenGL;
1979 2642
1980my %tex = ( 2643my %tex = (
1981 food => [ 2644 food => [
1982 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2645 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1983 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2646 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1984 ], 2647 ],
1985 grace => [ 2648 grace => [
1986 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2649 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1987 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2650 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1988 ], 2651 ],
1989 hp => [ 2652 hp => [
1990 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1991 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2654 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1992 ], 2655 ],
1993 mana => [ 2656 mana => [
1994 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2657 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1995 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2658 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1996 ], 2659 ],
1997); 2660);
1998 2661
1999# eg. VGauge->new (gauge => 'food'), default gauge: food 2662# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2059 my $ycut1 = max 0, min 1, $ycut; 2722 my $ycut1 = max 0, min 1, $ycut;
2060 my $ycut2 = max 0, min 1, $ycut - 1; 2723 my $ycut2 = max 0, min 1, $ycut - 1;
2061 2724
2062 my $h1 = $self->{h} * (1 - $ycut1); 2725 my $h1 = $self->{h} * (1 - $ycut1);
2063 my $h2 = $self->{h} * (1 - $ycut2); 2726 my $h2 = $self->{h} * (1 - $ycut2);
2727 my $h3 = $self->{h};
2728
2729 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2064 2730
2065 glEnable GL_BLEND; 2731 glEnable GL_BLEND;
2066 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2732 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2733 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2067 glEnable GL_TEXTURE_2D; 2734 glEnable GL_TEXTURE_2D;
2068 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2735 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2069 2736
2070 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2737 glBindTexture GL_TEXTURE_2D, $t1->{name};
2071 glBegin GL_QUADS; 2738 glBegin GL_QUADS;
… …
2086 2753
2087 if ($t3) { 2754 if ($t3) {
2088 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2755 glBindTexture GL_TEXTURE_2D, $t3->{name};
2089 glBegin GL_QUADS; 2756 glBegin GL_QUADS;
2090 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2757 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2091 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2758 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2092 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2759 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2093 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2760 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2094 glEnd; 2761 glEnd;
2095 } 2762 }
2096 2763
2097 glDisable GL_BLEND; 2764 glDisable GL_BLEND;
2098 glDisable GL_TEXTURE_2D; 2765 glDisable GL_TEXTURE_2D;
2099} 2766}
2100 2767
2101############################################################################# 2768#############################################################################
2102 2769
2103package CFClient::UI::Gauge; 2770package CFPlus::UI::Gauge;
2104 2771
2105our @ISA = CFClient::UI::VBox::; 2772our @ISA = CFPlus::UI::VBox::;
2106 2773
2107sub new { 2774sub new {
2108 my ($class, %arg) = @_; 2775 my ($class, %arg) = @_;
2109 2776
2110 my $self = $class->SUPER::new ( 2777 my $self = $class->SUPER::new (
… …
2112 can_hover => 1, 2779 can_hover => 1,
2113 can_events => 1, 2780 can_events => 1,
2114 %arg, 2781 %arg,
2115 ); 2782 );
2116 2783
2117 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2784 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2118 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2785 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2119 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2786 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2120 2787
2121 $self 2788 $self
2122} 2789}
2123 2790
2124sub set_fontsize { 2791sub set_fontsize {
… …
2145 $self->{value}->set_text ($val); 2812 $self->{value}->set_text ($val);
2146} 2813}
2147 2814
2148############################################################################# 2815#############################################################################
2149 2816
2150package CFClient::UI::Slider; 2817package CFPlus::UI::Slider;
2151 2818
2152use strict; 2819use strict;
2153 2820
2154use CFClient::OpenGL; 2821use CFPlus::OpenGL;
2155 2822
2156our @ISA = CFClient::UI::DrawBG::; 2823our @ISA = CFPlus::UI::DrawBG::;
2157 2824
2158my @tex = 2825my @tex =
2159 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2826 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2160 qw(s1_slider.png s1_slider_bg.png); 2827 qw(s1_slider.png s1_slider_bg.png);
2161 2828
2162sub new { 2829sub new {
2163 my $class = shift; 2830 my $class = shift;
2164 2831
… …
2185 $self->update; 2852 $self->update;
2186 2853
2187 $self 2854 $self
2188} 2855}
2189 2856
2190sub changed { }
2191
2192sub set_range { 2857sub set_range {
2193 my ($self, $range) = @_; 2858 my ($self, $range) = @_;
2194 2859
2195 ($range, $self->{range}) = ($self->{range}, $range); 2860 ($range, $self->{range}) = ($self->{range}, $range);
2196 2861
2197 $self->update
2198 if "@$range" ne "@{$self->{range}}"; 2862 if ("@$range" ne "@{$self->{range}}") {
2863 $self->update;
2864 $self->set_value ($self->{range}[0]);
2865 }
2199} 2866}
2200 2867
2201sub set_value { 2868sub set_value {
2202 my ($self, $value) = @_; 2869 my ($self, $value) = @_;
2203 2870
… …
2214 if $unit; 2881 if $unit;
2215 2882
2216 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2883 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2217 2884
2218 if ($value != $old_value) { 2885 if ($value != $old_value) {
2219 $self->_emit (changed => $value); 2886 $self->emit (changed => $value);
2220 $self->update; 2887 $self->update;
2221 } 2888 }
2222} 2889}
2223 2890
2224sub size_request { 2891sub size_request {
2225 my ($self) = @_; 2892 my ($self) = @_;
2226 2893
2227 ($self->{req_w}, $self->{req_h}) 2894 ($self->{req_w}, $self->{req_h})
2228} 2895}
2229 2896
2230sub button_down { 2897sub invoke_button_down {
2231 my ($self, $ev, $x, $y) = @_; 2898 my ($self, $ev, $x, $y) = @_;
2232 2899
2233 $self->SUPER::button_down ($ev, $x, $y); 2900 $self->SUPER::invoke_button_down ($ev, $x, $y);
2234 2901
2235 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2902 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236 2903
2237 $self->mouse_motion ($ev, $x, $y); 2904 $self->invoke_mouse_motion ($ev, $x, $y)
2238} 2905}
2239 2906
2240sub mouse_motion { 2907sub invoke_mouse_motion {
2241 my ($self, $ev, $x, $y) = @_; 2908 my ($self, $ev, $x, $y) = @_;
2242 2909
2243 if ($GRAB == $self) { 2910 if ($GRAB == $self) {
2244 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2911 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2245 2912
2246 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2913 my (undef, $lo, $hi, $page) = @{$self->{range}};
2247 2914
2248 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2915 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249 2916
2250 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2917 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2918 } else {
2919 return 0;
2920 }
2921
2251 } 2922 1
2923}
2924
2925sub invoke_mouse_wheel {
2926 my ($self, $ev) = @_;
2927
2928 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2929
2930 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2931
2932 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2933
2934 ! ! $delta
2252} 2935}
2253 2936
2254sub update { 2937sub update {
2255 my ($self) = @_; 2938 my ($self) = @_;
2256 2939
2257 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2940 delete $self->{knob_w};
2941 $self->SUPER::update;
2942}
2943
2944sub _draw {
2945 my ($self) = @_;
2946
2947 unless ($self->{knob_w}) {
2258 $self->set_value ($self->{range}[0]); 2948 $self->set_value ($self->{range}[0]);
2259 2949
2260 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2950 my ($value, $lo, $hi, $page) = @{$self->{range}};
2261 my $range = ($hi - $page - $lo) || 1e-100; 2951 my $range = ($hi - $page - $lo) || 1e-100;
2262 2952
… …
2268 $value = ($value - $lo) / $range; 2958 $value = ($value - $lo) / $range;
2269 $value = $value * $self->{scale} + $self->{offset}; 2959 $value = $value * $self->{scale} + $self->{offset};
2270 2960
2271 $self->{knob_x} = $value - $knob_w * 0.5; 2961 $self->{knob_x} = $value - $knob_w * 0.5;
2272 $self->{knob_w} = $knob_w; 2962 $self->{knob_w} = $knob_w;
2273 }); 2963 }
2274
2275 $self->SUPER::update;
2276}
2277
2278sub _draw {
2279 my ($self) = @_;
2280 2964
2281 $self->SUPER::_draw (); 2965 $self->SUPER::_draw ();
2282 2966
2283 glScale $self->{w}, $self->{h}; 2967 glScale $self->{w}, $self->{h};
2284 2968
… …
2304 glDisable GL_TEXTURE_2D; 2988 glDisable GL_TEXTURE_2D;
2305} 2989}
2306 2990
2307############################################################################# 2991#############################################################################
2308 2992
2309package CFClient::UI::ValSlider; 2993package CFPlus::UI::ValSlider;
2310 2994
2311our @ISA = CFClient::UI::HBox::; 2995our @ISA = CFPlus::UI::HBox::;
2312 2996
2313sub new { 2997sub new {
2314 my ($class, %arg) = @_; 2998 my ($class, %arg) = @_;
2315 2999
2316 my $range = delete $arg{range}; 3000 my $range = delete $arg{range};
2317 3001
2318 my $self = $class->SUPER::new ( 3002 my $self = $class->SUPER::new (
2319 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3003 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2320 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3004 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2321 to_value => sub { shift }, 3005 to_value => sub { shift },
2322 from_value => sub { shift }, 3006 from_value => sub { shift },
2323 %arg, 3007 %arg,
2324 ); 3008 );
2325 3009
… …
2345sub set_range { shift->{slider}->set_range (@_) } 3029sub set_range { shift->{slider}->set_range (@_) }
2346sub set_value { shift->{slider}->set_value (@_) } 3030sub set_value { shift->{slider}->set_value (@_) }
2347 3031
2348############################################################################# 3032#############################################################################
2349 3033
2350package CFClient::UI::TextView; 3034package CFPlus::UI::TextScroller;
2351 3035
2352our @ISA = CFClient::UI::HBox::; 3036our @ISA = CFPlus::UI::HBox::;
2353 3037
2354use CFClient::OpenGL; 3038use CFPlus::OpenGL;
2355 3039
2356sub new { 3040sub new {
2357 my $class = shift; 3041 my $class = shift;
2358 3042
2359 my $self = $class->SUPER::new ( 3043 my $self = $class->SUPER::new (
2360 fontsize => 1, 3044 fontsize => 1,
2361 can_events => 0, 3045 can_events => 1,
3046 indent => 0,
2362 #font => default_font 3047 #font => default_font
2363 @_, 3048 @_,
2364 3049
2365 layout => (new CFClient::Layout 1), 3050 layout => (new CFPlus::Layout),
2366 par => [], 3051 par => [],
3052 max_par => 0,
2367 height => 0, 3053 height => 0,
2368 children => [ 3054 children => [
2369 (new CFClient::UI::Empty expand => 1), 3055 (new CFPlus::UI::Empty expand => 1),
2370 (new CFClient::UI::Slider vertical => 1), 3056 (new CFPlus::UI::Slider vertical => 1),
2371 ], 3057 ],
2372 ); 3058 );
2373 3059
2374 $self->{children}[1]->connect (changed => sub { $self->update }); 3060 $self->{children}[1]->connect (changed => sub { $self->update });
2375 3061
… …
2381 3067
2382 $self->{fontsize} = $fontsize; 3068 $self->{fontsize} = $fontsize;
2383 $self->reflow; 3069 $self->reflow;
2384} 3070}
2385 3071
3072sub size_request {
3073 my ($self) = @_;
3074
3075 my ($empty, $slider) = @{ $self->{children} };
3076
3077 local $self->{children} = [$empty, $slider];
3078 $self->SUPER::size_request
3079}
3080
2386sub size_allocate { 3081sub invoke_size_allocate {
2387 my ($self, $w, $h, $changed) = @_; 3082 my ($self, $w, $h) = @_;
2388 3083
2389 $self->SUPER::size_allocate ($w, $h, $changed); 3084 my ($empty, $slider, @other) = @{ $self->{children} };
2390 3085 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2391 return unless $changed;
2392 3086
2393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3087 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3088 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w}); 3089 $self->{layout}->set_width ($empty->{w});
3090 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396 3091
2397 $self->reflow; 3092 $self->reflow;
2398}
2399 3093
2400sub text_size { 3094 local $self->{children} = [$empty, $slider];
3095 $self->SUPER::invoke_size_allocate ($w, $h)
3096}
3097
3098sub invoke_mouse_wheel {
2401 my ($self, $text, $indent) = @_; 3099 my ($self, $ev) = @_;
3100
3101 return 0 unless $ev->{dy}; # only vertical movements
3102
3103 $self->{children}[1]->emit (mouse_wheel => $ev);
3104
3105 1
3106}
3107
3108sub get_layout {
3109 my ($self, $para) = @_;
2402 3110
2403 my $layout = $self->{layout}; 3111 my $layout = $self->{layout};
2404 3112
3113 $layout->set_font ($self->{font}) if $self->{font};
3114 $layout->set_foreground (@{$para->{fg}});
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3115 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent); 3116 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3117 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407 $layout->set_markup ($text); 3118 $layout->set_markup ($para->{markup});
3119
3120 $layout->set_shapes (
3121 map
3122 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3123 @{$para->{widget}}
2408 3124 );
3125
2409 $layout->size 3126 $layout
2410} 3127}
2411 3128
2412sub reflow { 3129sub reflow {
2413 my ($self) = @_; 3130 my ($self) = @_;
2414 3131
… …
2421 3138
2422 # todo: base offset on lines or so, not on pixels 3139 # todo: base offset on lines or so, not on pixels
2423 $self->{children}[1]->set_value ($offset); 3140 $self->{children}[1]->set_value ($offset);
2424} 3141}
2425 3142
3143sub current_paragraph {
3144 my ($self) = @_;
3145
3146 $self->{top_paragraph} - 1
3147}
3148
3149sub scroll_to {
3150 my ($self, $para) = @_;
3151
3152 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3153
3154 $self->{scroll_to} = $para;
3155 $self->update;
3156}
3157
2426sub clear { 3158sub clear {
2427 my ($self) = @_; 3159 my ($self) = @_;
3160
3161 my (undef, undef, @other) = @{ $self->{children} };
3162 $self->remove ($_) for @other;
2428 3163
2429 $self->{par} = []; 3164 $self->{par} = [];
2430 $self->{height} = 0; 3165 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3166 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432} 3167}
2433 3168
2434sub add_paragraph { 3169sub add_paragraph {
2435 my ($self, $color, $text, $indent) = @_; 3170 my $self = shift;
2436 3171
2437 for my $line (split /\n/, $text) { 3172 for my $para (@_) {
2438 my ($w, $h) = $self->text_size ($line); 3173 $para = {
3174 fg => [1, 1, 1, 1],
3175 indent => 0,
3176 markup => "",
3177 widget => [],
3178 ref $para ? %$para : (markup => $para),
3179 w => 1e10,
3180 wrapped => 1,
3181 };
3182
3183 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3184 push @{$self->{par}}, $para;
3185 }
3186
3187 if (my $max = $self->{max_par}) {
3188 shift @{$self->{par}} while @{$self->{par}} > $max;
3189 }
3190
3191 $self->{need_reflow}++;
3192 $self->update;
3193}
3194
3195sub scroll_to_bottom {
3196 my ($self) = @_;
3197
3198 $self->{scroll_to} = $#{$self->{par}};
3199 $self->update;
3200}
3201
3202sub force_uptodate {
3203 my ($self) = @_;
3204
3205 if (delete $self->{need_reflow}) {
3206 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3207
3208 my $height = 0;
3209
3210 for my $para (@{$self->{par}}) {
3211 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3212 my $layout = $self->get_layout ($para);
3213 my ($w, $h) = $layout->size;
3214
3215 $para->{w} = $w + $para->{indent};
3216 $para->{h} = $h;
3217 $para->{wrapped} = $layout->has_wrapped;
3218 }
3219
3220 $para->{y} = $height;
3221 $height += $para->{h};
3222 }
3223
2439 $self->{height} += $h; 3224 $self->{height} = $height;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3225 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2441 }
2442 3226
2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3227 delete $self->{texture};
3228 }
3229
3230 if (my $paridx = delete $self->{scroll_to}) {
3231 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3232 }
2444} 3233}
2445 3234
2446sub update { 3235sub update {
2447 my ($self) = @_; 3236 my ($self) = @_;
2448 3237
… …
2450 3239
2451 return unless $self->{h} > 0; 3240 return unless $self->{h} > 0;
2452 3241
2453 delete $self->{texture}; 3242 delete $self->{texture};
2454 3243
2455 $ROOT->on_post_alloc ($self, sub { 3244 $ROOT->on_post_alloc ($self => sub {
3245 $self->force_uptodate;
3246
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3247 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457 3248
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 { 3249 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2485 glClearColor 0.5, 0.5, 0.5, 0; 3250 glClearColor 0, 0, 0, 0;
2486 glClear GL_COLOR_BUFFER_BIT; 3251 glClear GL_COLOR_BUFFER_BIT;
2487 3252
3253 package CFPlus::UI::Base;
3254 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3255 (0, 0, $self->{w}, $self->{h});
3256
3257 my $top = int $self->{children}[1]{range}[0];
3258
3259 my $paridx = 0;
3260 my $top_paragraph;
2488 my $top = int $self->{children}[1]{range}[0]; 3261 my $top = int $self->{children}[1]{range}[0];
2489 3262
2490 my $y0 = $top; 3263 my $y0 = $top;
2491 my $y1 = $top + $H; 3264 my $y1 = $top + $H;
2492 3265
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}}) { 3266 for my $para (@{$self->{par}}) {
2504 my $h = $par->[1]; 3267 my $h = $para->{h};
3268 my $y = $para->{y};
2505 3269
2506 if ($y0 < $y + $h && $y < $y1) { 3270 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] }); 3271 my $layout = $self->get_layout ($para);
2508 $layout->set_width ($W - $par->[3]);
2509 $layout->set_markup ($par->[4]);
2510 3272
2511 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3273 $layout->render ($para->{indent}, $y - $y0);
2512 3274
2513 glRasterPos $par->[3], $y - $y0; 3275 if (my @w = @{ $para->{widget} }) {
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3276 my @s = $layout->get_shapes;
3277
3278 for (@w) {
3279 my ($dx, $dy) = splice @s, 0, 2, ();
3280
3281 $_->{x} = $dx + $para->{indent};
3282 $_->{y} = $dy + $y - $y0;
3283
3284 $_->draw;
3285 }
3286 }
2515 } 3287 }
2516 3288
2517 $y += $h; 3289 $paridx++;
3290 $top_paragraph ||= $paridx if $y >= $top;
2518 } 3291 }
2519 3292
2520 glDisable GL_BLEND; 3293 $self->{top_paragraph} = $top_paragraph;
2521 }; 3294 };
2522 }); 3295 });
2523} 3296}
2524 3297
3298sub reconfigure {
3299 my ($self) = @_;
3300
3301 $self->SUPER::reconfigure;
3302
3303 $_->{w} = 1e10 for @{ $self->{par} };
3304 $self->reflow;
3305}
3306
2525sub _draw { 3307sub _draw {
2526 my ($self) = @_; 3308 my ($self) = @_;
2527 3309
2528 glEnable GL_TEXTURE_2D; 3310 glEnable GL_TEXTURE_2D;
2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3311 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1; 3312 glColor 0, 0, 0, 1;
2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3313 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532 glDisable GL_TEXTURE_2D; 3314 glDisable GL_TEXTURE_2D;
2533 3315
2534 $self->{children}[1]->draw; 3316 $self->{children}[1]->draw;
2535
2536} 3317}
2537 3318
2538############################################################################# 3319#############################################################################
2539 3320
2540package CFClient::UI::Animator; 3321package CFPlus::UI::Animator;
2541 3322
2542use CFClient::OpenGL; 3323use CFPlus::OpenGL;
2543 3324
2544our @ISA = CFClient::UI::Bin::; 3325our @ISA = CFPlus::UI::Bin::;
2545 3326
2546sub moveto { 3327sub moveto {
2547 my ($self, $x, $y) = @_; 3328 my ($self, $x, $y) = @_;
2548 3329
2549 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3330 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2577 glPopMatrix; 3358 glPopMatrix;
2578} 3359}
2579 3360
2580############################################################################# 3361#############################################################################
2581 3362
2582package CFClient::UI::Flopper; 3363package CFPlus::UI::Flopper;
2583 3364
2584our @ISA = CFClient::UI::Button::; 3365our @ISA = CFPlus::UI::Button::;
2585 3366
2586sub new { 3367sub new {
2587 my $class = shift; 3368 my $class = shift;
2588 3369
2589 my $self = $class->SUPER::new ( 3370 my $self = $class->SUPER::new (
… …
2601 $self->{other}->toggle_visibility; 3382 $self->{other}->toggle_visibility;
2602} 3383}
2603 3384
2604############################################################################# 3385#############################################################################
2605 3386
2606package CFClient::UI::Tooltip; 3387package CFPlus::UI::Tooltip;
2607 3388
2608our @ISA = CFClient::UI::Bin::; 3389our @ISA = CFPlus::UI::Bin::;
2609 3390
2610use CFClient::OpenGL; 3391use CFPlus::OpenGL;
2611 3392
2612sub new { 3393sub new {
2613 my $class = shift; 3394 my $class = shift;
2614 3395
2615 $class->SUPER::new ( 3396 $class->SUPER::new (
… …
2619} 3400}
2620 3401
2621sub set_tooltip_from { 3402sub set_tooltip_from {
2622 my ($self, $widget) = @_; 3403 my ($self, $widget) = @_;
2623 3404
3405 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3406 if $widget->{tooltip} =~ /^#(.*)$/;
3407
3408 my $tooltip = $widget->{tooltip};
3409
3410 if ($ENV{CFPLUS_DEBUG} & 2) {
3411 $tooltip .= "\n\n" . (ref $widget) . "\n"
3412 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3413 . "req $widget->{req_w} $widget->{req_h}\n"
3414 . "visible $widget->{visible}";
3415 }
3416
3417 $tooltip =~ s/^\n+//;
3418 $tooltip =~ s/\n+$//;
3419
2624 $self->add (new CFClient::UI::Label 3420 $self->add (new CFPlus::UI::Label
2625 markup => $widget->{tooltip}, 3421 markup => $tooltip,
2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3422 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627 fontsize => 0.8, 3423 fontsize => 0.8,
2628 fg => [0, 0, 0, 1], 3424 style => 1, # FLAG_INVERSE
2629 ellipsise => 0, 3425 ellipsise => 0,
2630 font => ($widget->{tooltip_font} || $::FONT_PROP), 3426 font => ($widget->{tooltip_font} || $::FONT_PROP),
2631 ); 3427 );
2632} 3428}
2633 3429
… …
2637 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3433 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2638 3434
2639 ($w + 4, $h + 4) 3435 ($w + 4, $h + 4)
2640} 3436}
2641 3437
2642sub size_allocate { 3438sub invoke_size_allocate {
2643 my ($self, $w, $h, $changed) = @_; 3439 my ($self, $w, $h) = @_;
2644 3440
2645 return unless $changed;
2646
2647 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 3441 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2648} 3442}
2649 3443
2650sub visibility_change { 3444sub invoke_visibility_change {
2651 my ($self, $visible) = @_; 3445 my ($self, $visible) = @_;
2652 3446
2653 return unless $visible; 3447 return unless $visible;
2654 3448
2655 $self->{root}->on_post_alloc ("move_$self" => sub { 3449 $self->{root}->on_post_alloc ("move_$self" => sub {
2656 my $widget = $self->{owner} 3450 my $widget = $self->{owner}
2657 or return; 3451 or return;
2658 3452
3453 if ($widget->{visible}) {
2659 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3454 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2660 3455
2661 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3456 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2662 if $x + $self->{w} > $::WIDTH; 3457 if $x + $self->{w} > $self->{root}{w};
2663 3458
2664 $self->move_abs ($x, $y); 3459 $self->move_abs ($x, $y);
3460 } else {
3461 $self->hide;
3462 }
2665 }); 3463 });
2666} 3464}
2667 3465
2668sub _draw { 3466sub _draw {
2669 my ($self) = @_; 3467 my ($self) = @_;
… …
2693 $self->SUPER::_draw; 3491 $self->SUPER::_draw;
2694} 3492}
2695 3493
2696############################################################################# 3494#############################################################################
2697 3495
2698package CFClient::UI::Face; 3496package CFPlus::UI::Face;
2699 3497
2700our @ISA = CFClient::UI::Base::; 3498our @ISA = CFPlus::UI::DrawBG::;
2701 3499
2702use CFClient::OpenGL; 3500use CFPlus::OpenGL;
2703 3501
2704sub new { 3502sub new {
2705 my $class = shift; 3503 my $class = shift;
2706 3504
2707 my $self = $class->SUPER::new ( 3505 my $self = $class->SUPER::new (
3506 size_w => 32,
3507 size_h => 8,
2708 aspect => 1, 3508 aspect => 1,
2709 can_events => 0, 3509 can_events => 0,
2710 @_, 3510 @_,
2711 ); 3511 );
2712 3512
2713 if ($self->{anim} && $self->{animspeed}) { 3513 if ($self->{anim} && $self->{animspeed}) {
2714 Scalar::Util::weaken (my $widget = $self); 3514 CFPlus::weaken (my $widget = $self);
2715 3515
3516 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3517 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2716 $self->{timer} = Event->timer ( 3518 $self->{timer} = Event->timer (
2717 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2718 hard => 1, 3519 parked => 1,
2719 interval => $self->{animspeed},
2720 cb => sub { 3520 cb => sub {
3521 return unless $::CONN && $widget;
3522
2721 ++$widget->{frame}; 3523 ++$widget->{frame};
3524 $widget->update_face;
2722 $widget->update; 3525 $widget->update;
3526
3527 $widget->update_timer;
2723 }, 3528 },
2724 ); 3529 );
3530
3531 $self->update_face;
3532 $self->update_timer;
2725 } 3533 }
2726 3534
2727 $self 3535 $self
2728} 3536}
2729 3537
3538sub update_timer {
3539 my ($self) = @_;
3540
3541 return unless $self->{timer};
3542
3543 if ($self->{visible}) {
3544 $self->{timer}->at (
3545 $self->{anim_start}
3546 + $self->{animspeed}
3547 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3548 );
3549 $self->{timer}->start;
3550 } else {
3551 $self->{timer}->stop;
3552 }
3553}
3554
3555sub update_face {
3556 my ($self) = @_;
3557
3558 return unless $::CONN;
3559
3560 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3561 if ($anim && @$anim) {
3562 delete $self->{wait_face};
3563 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3564 }
3565 }
3566}
3567
2730sub size_request { 3568sub size_request {
2731 (32, 8) 3569 my ($self) = @_;
3570
3571 if ($::CONN) {
3572 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3573 if (my $tex = $::CONN->{texture}[$faceid]) {
3574 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3575 } else {
3576 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3577 $self->realloc;
3578 });
3579 }
3580 }
3581 }
3582
3583 ($self->{size_w} || 8, $self->{size_h} || 8)
2732} 3584}
2733 3585
2734sub update { 3586sub update {
2735 my ($self) = @_; 3587 my ($self) = @_;
2736 3588
2737 return unless $self->{visible}; 3589 return unless $self->{visible};
2738 3590
2739 $self->SUPER::update; 3591 $self->SUPER::update;
2740} 3592}
2741 3593
3594sub invoke_visibility_change {
3595 my ($self) = @_;
3596
3597 $self->update_timer;
3598
3599 0
3600}
3601
2742sub _draw { 3602sub _draw {
2743 my ($self) = @_; 3603 my ($self) = @_;
2744 3604
2745 return unless $::CONN; 3605 return unless $::CONN;
2746 3606
2747 my $face; 3607 $self->SUPER::_draw;
2748 3608
2749 if ($self->{frame}) {
2750 my $anim = $::CONN->{anim}[$self->{anim}]; 3609 my $faceid = $::CONN->{faceid}[$self->{face}]
2751 3610 or return;
2752 $face = $anim->[ $self->{frame} % @$anim ]
2753 if $anim && @$anim;
2754 }
2755 3611
2756 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3612 my $tex = $::CONN->{texture}[$faceid];
2757 3613
2758 if ($tex) { 3614 if ($tex) {
2759 glEnable GL_TEXTURE_2D; 3615 glEnable GL_TEXTURE_2D;
2760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2761 glColor 1, 1, 1, 1; 3617 glColor 0, 0, 0, 1;
2762 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3618 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2763 glDisable GL_TEXTURE_2D; 3619 glDisable GL_TEXTURE_2D;
2764 } 3620 }
2765} 3621}
2766 3622
2767sub DESTROY { 3623sub destroy {
2768 my ($self) = @_; 3624 my ($self) = @_;
2769 3625
2770 $self->{timer}->cancel 3626 (delete $self->{timer})->cancel
2771 if $self->{timer}; 3627 if $self->{timer};
2772 3628
2773 $self->SUPER::DESTROY; 3629 $self->SUPER::destroy;
2774} 3630}
2775 3631
2776############################################################################# 3632#############################################################################
2777 3633
2778package CFClient::UI::Inventory; 3634package CFPlus::UI::Buttonbar;
2779 3635
2780our @ISA = CFClient::UI::ScrolledWindow::; 3636our @ISA = CFPlus::UI::HBox::;
2781 3637
2782sub new { 3638# TODO: should actually wrap buttons and other goodies.
2783 my $class = shift;
2784
2785 my $self = $class->SUPER::new (
2786 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2787 @_,
2788 );
2789
2790 $self
2791}
2792
2793sub set_items {
2794 my ($self, $items) = @_;
2795
2796 $self->{scrolled}->clear;
2797 return unless $items;
2798
2799 my @items = sort {
2800 ($a->{type} <=> $b->{type})
2801 or ($a->{name} cmp $b->{name})
2802 } @$items;
2803
2804 $self->{real_items} = \@items;
2805
2806 my $row = 0;
2807 for my $item (@items) {
2808 CFClient::Item::update_widgets $item;
2809
2810 $self->{scrolled}->add (0, $row, $item->{face_widget});
2811 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2812 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2813
2814 $row++;
2815 }
2816}
2817 3639
2818############################################################################# 3640#############################################################################
2819 3641
2820package CFClient::UI::Menu; 3642package CFPlus::UI::Menu;
2821 3643
2822our @ISA = CFClient::UI::FancyFrame::; 3644our @ISA = CFPlus::UI::Toplevel::;
2823 3645
2824use CFClient::OpenGL; 3646use CFPlus::OpenGL;
2825 3647
2826sub new { 3648sub new {
2827 my $class = shift; 3649 my $class = shift;
2828 3650
2829 my $self = $class->SUPER::new ( 3651 my $self = $class->SUPER::new (
2830 items => [], 3652 items => [],
2831 z => 100, 3653 z => 100,
2832 @_, 3654 @_,
2833 ); 3655 );
2834 3656
2835 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3657 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2836 3658
2837 for my $item (@{ $self->{items} }) { 3659 for my $item (@{ $self->{items} }) {
2838 my ($widget, $cb) = @$item; 3660 my ($widget, $cb, $tooltip) = @$item;
2839 3661
2840 # handle various types of items, only text for now 3662 # handle various types of items, only text for now
2841 if (!ref $widget) { 3663 if (!ref $widget) {
3664 if ($widget =~ /\t/) {
3665 my ($left, $right) = split /\t/, $widget, 2;
3666
2842 $widget = new CFClient::UI::Label 3667 $widget = new CFPlus::UI::HBox
2843 can_hover => 1, 3668 can_hover => 1,
2844 can_events => 1, 3669 can_events => 1,
3670 tooltip => $tooltip,
3671 children => [
3672 (new CFPlus::UI::Label markup => $left, expand => 1),
3673 (new CFPlus::UI::Label markup => $right, align => +1),
3674 ],
3675 ;
3676
3677 } else {
3678 $widget = new CFPlus::UI::Label
3679 can_hover => 1,
3680 can_events => 1,
2845 text => $widget; 3681 markup => $widget,
3682 tooltip => $tooltip;
3683 }
2846 } 3684 }
2847 3685
2848 $self->{item}{$widget} = $item; 3686 $self->{item}{$widget} = $item;
2849 3687
2850 $self->{vbox}->add ($widget); 3688 $self->{vbox}->add ($widget);
… …
2855 3693
2856# popup given the event (must be a mouse button down event currently) 3694# popup given the event (must be a mouse button down event currently)
2857sub popup { 3695sub popup {
2858 my ($self, $ev) = @_; 3696 my ($self, $ev) = @_;
2859 3697
2860 $self->_emit ("popdown"); 3698 $self->emit ("popdown");
2861 3699
2862 # maybe save $GRAB? must be careful about events... 3700 # maybe save $GRAB? must be careful about events...
2863 $GRAB = $self; 3701 $GRAB = $self;
2864 $self->{button} = $ev->{button}; 3702 $self->{button} = $ev->{button};
2865 3703
2866 $self->show; 3704 $self->show;
2867 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3705 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2868} 3706}
2869 3707
2870sub mouse_motion { 3708sub invoke_mouse_motion {
2871 my ($self, $ev, $x, $y) = @_; 3709 my ($self, $ev, $x, $y) = @_;
2872 3710
2873 # TODO: should use vbox->find_widget or so 3711 # TODO: should use vbox->find_widget or so
2874 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3712 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2875 $self->{hover} = $self->{item}{$HOVER}; 3713 $self->{hover} = $self->{item}{$HOVER};
2876}
2877 3714
3715 0
3716}
3717
2878sub button_up { 3718sub invoke_button_up {
2879 my ($self, $ev, $x, $y) = @_; 3719 my ($self, $ev, $x, $y) = @_;
2880 3720
2881 if ($ev->{button} == $self->{button}) { 3721 if ($ev->{button} == $self->{button}) {
2882 undef $GRAB; 3722 undef $GRAB;
2883 $self->hide; 3723 $self->hide;
2884 3724
2885 $self->_emit ("popdown"); 3725 $self->emit ("popdown");
2886 $self->{hover}[1]->() if $self->{hover}; 3726 $self->{hover}[1]->() if $self->{hover};
3727 } else {
3728 return 0
3729 }
3730
2887 } 3731 1
2888} 3732}
2889 3733
2890############################################################################# 3734#############################################################################
2891 3735
2892package CFClient::UI::Statusbox; 3736package CFPlus::UI::Multiplexer;
2893 3737
2894our @ISA = CFClient::UI::VBox::; 3738our @ISA = CFPlus::UI::Container::;
2895 3739
2896sub new { 3740sub new {
2897 my $class = shift; 3741 my $class = shift;
2898 3742
2899 $class->SUPER::new ( 3743 my $self = $class->SUPER::new (
3744 @_,
3745 );
3746
3747 $self->{current} = $self->{children}[0]
3748 if @{ $self->{children} };
3749
3750 $self
3751}
3752
3753sub add {
3754 my ($self, @widgets) = @_;
3755
3756 $self->SUPER::add (@widgets);
3757
3758 $self->{current} = $self->{children}[0]
3759 if @{ $self->{children} };
3760}
3761
3762sub get_current_page {
3763 my ($self) = @_;
3764
3765 $self->{current}
3766}
3767
3768sub set_current_page {
3769 my ($self, $page_or_widget) = @_;
3770
3771 my $widget = ref $page_or_widget
3772 ? $page_or_widget
3773 : $self->{children}[$page_or_widget];
3774
3775 $self->{current} = $widget;
3776 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3777
3778 $self->emit (page_changed => $self->{current});
3779
3780 $self->realloc;
3781}
3782
3783sub visible_children {
3784 $_[0]{current}
3785}
3786
3787sub size_request {
3788 my ($self) = @_;
3789
3790 $self->{current}->size_request
3791}
3792
3793sub invoke_size_allocate {
3794 my ($self, $w, $h) = @_;
3795
3796 $self->{current}->configure (0, 0, $w, $h);
3797
3798 1
3799}
3800
3801sub _draw {
3802 my ($self) = @_;
3803
3804 $self->{current}->draw;
3805}
3806
3807#############################################################################
3808
3809package CFPlus::UI::Notebook;
3810
3811our @ISA = CFPlus::UI::VBox::;
3812
3813sub new {
3814 my $class = shift;
3815
3816 my $self = $class->SUPER::new (
3817 buttonbar => (new CFPlus::UI::Buttonbar),
3818 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3819 # filter => # will be put between multiplexer and $self
3820 @_,
3821 );
3822
3823 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3824 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3825
3826 $self
3827}
3828
3829sub add {
3830 my ($self, $title, $widget, $tooltip) = @_;
3831
3832 CFPlus::weaken $self;
3833
3834 $self->{buttonbar}->add (new CFPlus::UI::Button
3835 markup => $title,
3836 tooltip => $tooltip,
3837 on_activate => sub { $self->set_current_page ($widget) },
3838 );
3839
3840 $self->{multiplexer}->add ($widget);
3841}
3842
3843sub get_current_page {
3844 my ($self) = @_;
3845
3846 $self->{multiplexer}->get_current_page
3847}
3848
3849sub set_current_page {
3850 my ($self, $page) = @_;
3851
3852 $self->{multiplexer}->set_current_page ($page);
3853 $self->emit (page_changed => $self->{multiplexer}{current});
3854}
3855
3856#############################################################################
3857
3858package CFPlus::UI::Selector;
3859
3860use utf8;
3861
3862our @ISA = CFPlus::UI::Button::;
3863
3864sub new {
3865 my $class = shift;
3866
3867 my $self = $class->SUPER::new (
3868 options => [], # [value, title, longdesc], ...
3869 value => undef,
3870 @_,
3871 );
3872
3873 $self->_set_value ($self->{value});
3874
3875 $self
3876}
3877
3878sub invoke_button_down {
3879 my ($self, $ev) = @_;
3880
3881 my @menu_items;
3882
3883 for (@{ $self->{options} }) {
3884 my ($value, $title, $tooltip) = @$_;
3885
3886 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3887 }
3888
3889 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3890}
3891
3892sub _set_value {
3893 my ($self, $value) = @_;
3894
3895 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3896 or return;
3897
3898 $self->{value} = $item->[0];
3899 $self->set_markup ("$item->[1] ⇓");
3900 $self->set_tooltip ($item->[2]);
3901}
3902
3903sub set_value {
3904 my ($self, $value) = @_;
3905
3906 return unless $self->{value} ne $value;
3907
3908 $self->_set_value ($value);
3909 $self->emit (changed => $value);
3910}
3911
3912#############################################################################
3913
3914package CFPlus::UI::Statusbox;
3915
3916our @ISA = CFPlus::UI::VBox::;
3917
3918sub new {
3919 my $class = shift;
3920
3921 my $self = $class->SUPER::new (
2900 fontsize => 0.8, 3922 fontsize => 0.8,
2901 @_, 3923 @_,
2902 ) 3924 );
3925
3926 CFPlus::weaken (my $this = $self);
3927
3928 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3929
3930 $self
2903} 3931}
2904 3932
2905sub reorder { 3933sub reorder {
2906 my ($self) = @_; 3934 my ($self) = @_;
2907 my $NOW = time; 3935 my $NOW = Time::HiRes::time;
3936
3937 # freeze display when hovering over any label
3938 return if $CFPlus::UI::TOOLTIP->{owner}
3939 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3940 values %{ $self->{item} };
2908 3941
2909 while (my ($k, $v) = each %{ $self->{item} }) { 3942 while (my ($k, $v) = each %{ $self->{item} }) {
2910 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3943 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2911 } 3944 }
2912 3945
… …
2915 my @items = sort { 3948 my @items = sort {
2916 $a->{pri} <=> $b->{pri} 3949 $a->{pri} <=> $b->{pri}
2917 or $b->{id} <=> $a->{id} 3950 or $b->{id} <=> $a->{id}
2918 } values %{ $self->{item} }; 3951 } values %{ $self->{item} };
2919 3952
3953 $self->{timer}->interval (1);
3954
2920 my $count = 10 + 1; 3955 my $count = 10 + 1;
2921 for my $item (@items) { 3956 for my $item (@items) {
2922 last unless --$count; 3957 last unless --$count;
2923 3958
2924 push @widgets, $item->{label} ||= do { 3959 my $label = $item->{label} ||= do {
2925 # TODO: doesn't handle markup well (read as: at all) 3960 # TODO: doesn't handle markup well (read as: at all)
2926 my $short = $item->{count} > 1 3961 my $short = $item->{count} > 1
2927 ? "<b>$item->{count} ×</b> $item->{text}" 3962 ? "<b>$item->{count} ×</b> $item->{text}"
2928 : $item->{text}; 3963 : $item->{text};
2929 3964
2930 for ($short) { 3965 for ($short) {
2931 s/^\s+//; 3966 s/^\s+//;
2932 s/\s+/ /g; 3967 s/\s+/ /g;
2933 } 3968 }
2934 3969
2935 new CFClient::UI::Label 3970 new CFPlus::UI::Label
2936 markup => $short, 3971 markup => $short,
2937 tooltip => $item->{tooltip}, 3972 tooltip => $item->{tooltip},
2938 tooltip_font => $::FONT_PROP, 3973 tooltip_font => $::FONT_PROP,
2939 tooltip_width => 0.67, 3974 tooltip_width => 0.67,
2940 fontsize => $item->{fontsize} || $self->{fontsize}, 3975 fontsize => $item->{fontsize} || $self->{fontsize},
2941 max_w => $::WIDTH * 0.44, 3976 max_w => $::WIDTH * 0.44,
2942 fg => $item->{fg}, 3977 fg => [@{ $item->{fg} }],
2943 can_events => 1, 3978 can_events => 1,
2944 can_hover => 1 3979 can_hover => 1
2945 }; 3980 };
3981
3982 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3983 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3984 $label->update;
3985 $label->set_max_size (undef, $label->{req_h} * $diff)
3986 if $diff < 1;
3987 $self->{timer}->interval (1/30);
3988 } else {
3989 $label->{fg}[3] = $item->{fg}[3] || 1;
3990 }
3991
3992 push @widgets, $label;
2946 } 3993 }
2947 3994
2948 $self->clear; 3995 $self->clear;
2949 $self->SUPER::add (reverse @widgets); 3996 $self->SUPER::add (reverse @widgets);
2950} 3997}
… …
2955 $text =~ s/^\s+//; 4002 $text =~ s/^\s+//;
2956 $text =~ s/\s+$//; 4003 $text =~ s/\s+$//;
2957 4004
2958 return unless $text; 4005 return unless $text;
2959 4006
2960 my $timeout = time + ((delete $arg{timeout}) || 60); 4007 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2961 4008
2962 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 4009 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2963 4010
2964 if (my $item = $self->{item}{$group}) { 4011 if (my $item = $self->{item}{$group}) {
2965 if ($item->{text} eq $text) { 4012 if ($item->{text} eq $text) {
2966 $item->{count}++; 4013 $item->{count}++;
2967 } else { 4014 } else {
2968 $item->{count} = 1; 4015 $item->{count} = 1;
2969 $item->{text} = $item->{tooltip} = $text; 4016 $item->{text} = $item->{tooltip} = $text;
2970 } 4017 }
2971 $item->{id} = ++$self->{id}; 4018 $item->{id} += 0.2;#d#
2972 $item->{timeout} = $timeout; 4019 $item->{timeout} = $timeout;
2973 delete $item->{label}; 4020 delete $item->{label};
2974 } else { 4021 } else {
2975 $self->{item}{$group} = { 4022 $self->{item}{$group} = {
2976 id => ++$self->{id}, 4023 id => ++$self->{id},
… …
2982 count => 1, 4029 count => 1,
2983 %arg, 4030 %arg,
2984 }; 4031 };
2985 } 4032 }
2986 4033
4034 $ROOT->on_refresh (reorder => sub {
2987 $self->reorder; 4035 $self->reorder;
4036 });
2988} 4037}
2989 4038
2990sub reconfigure { 4039sub reconfigure {
2991 my ($self) = @_; 4040 my ($self) = @_;
2992 4041
… …
2995 4044
2996 $self->reorder; 4045 $self->reorder;
2997 $self->SUPER::reconfigure; 4046 $self->SUPER::reconfigure;
2998} 4047}
2999 4048
4049sub destroy {
4050 my ($self) = @_;
4051
4052 $self->{timer}->cancel;
4053
4054 $self->SUPER::destroy;
4055}
4056
3000############################################################################# 4057#############################################################################
3001 4058
3002package CFClient::UI::Root; 4059package CFPlus::UI::Root;
3003 4060
3004our @ISA = CFClient::UI::Container::; 4061our @ISA = CFPlus::UI::Container::;
3005 4062
4063use List::Util qw(min max);
4064
3006use CFClient::OpenGL; 4065use CFPlus::OpenGL;
3007 4066
3008sub new { 4067sub new {
3009 my $class = shift; 4068 my $class = shift;
3010 4069
3011 my $self = $class->SUPER::new ( 4070 my $self = $class->SUPER::new (
3012 visible => 1, 4071 visible => 1,
3013 @_, 4072 @_,
3014 ); 4073 );
3015 4074
3016 Scalar::Util::weaken ($self->{root} = $self); 4075 CFPlus::weaken ($self->{root} = $self);
3017 4076
3018 $self 4077 $self
3019}
3020
3021sub configure {
3022 my ($self, $x, $y, $w, $h) = @_;
3023
3024 $self->{w} = $w;
3025 $self->{h} = $h;
3026}
3027
3028sub reconfigure {
3029 my ($self) = @_;
3030
3031 $self->SUPER::reconfigure;
3032
3033 $self->size_allocate ($self->{w}, $self->{h}, 1)
3034 if $self->{w};
3035} 4078}
3036 4079
3037sub size_request { 4080sub size_request {
3038 my ($self) = @_; 4081 my ($self) = @_;
3039 4082
… …
3052 $coord = $max - $size if $coord > $max - $size; 4095 $coord = $max - $size if $coord > $max - $size;
3053 4096
3054 int $coord + 0.5 4097 int $coord + 0.5
3055} 4098}
3056 4099
3057sub size_allocate { 4100sub invoke_size_allocate {
3058 my ($self, $w, $h, $changed) = @_; 4101 my ($self, $w, $h) = @_;
3059 4102
3060 for my $child ($self->children) { 4103 for my $child ($self->children) {
3061 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4104 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3062 4105
3063 $X = $child->{force_x} if exists $child->{force_x}; 4106 $X = $child->{force_x} if exists $child->{force_x};
… …
3066 $X = _to_pixel $X, $W, $self->{w}; 4109 $X = _to_pixel $X, $W, $self->{w};
3067 $Y = _to_pixel $Y, $H, $self->{h}; 4110 $Y = _to_pixel $Y, $H, $self->{h};
3068 4111
3069 $child->configure ($X, $Y, $W, $H); 4112 $child->configure ($X, $Y, $W, $H);
3070 } 4113 }
4114
4115 1
3071} 4116}
3072 4117
3073sub coord2local { 4118sub coord2local {
3074 my ($self, $x, $y) = @_; 4119 my ($self, $x, $y) = @_;
3075 4120
… …
3131 $_->() 4176 $_->()
3132 for values %{delete $self->{refresh_hook}}; 4177 for values %{delete $self->{refresh_hook}};
3133 } 4178 }
3134 4179
3135 if ($self->{realloc}) { 4180 if ($self->{realloc}) {
4181 my %queue;
3136 my @queue; 4182 my @queue;
4183 my $widget;
3137 4184
4185 outer:
3138 while () { 4186 while () {
3139 if ($self->{realloc}) { 4187 if (my $realloc = delete $self->{realloc}) {
3140 #TODO use array-of-depth approach 4188 for $widget (values %$realloc) {
4189 $widget->{visible} or next; # do not resize invisible widgets
3141 4190
3142 @queue = sort { $a->{visible} <=> $b->{visible} } 4191 $queue{$widget+0}++ and next; # duplicates are common
3143 @queue, values %{delete $self->{realloc}}; 4192
4193 push @{ $queue[$widget->{visible}] }, $widget;
4194 }
3144 } 4195 }
3145 4196
4197 while () {
4198 @queue or last outer;
4199
3146 my $widget = pop @queue || last; 4200 $widget = pop @{ $queue[-1] || [] }
4201 and last;
4202
4203 pop @queue;
4204 }
3147 4205
3148 $widget->{visible} or last; # do not resize invisible widgets 4206 delete $queue{$widget+0};
3149 4207
3150 my ($w, $h) = $widget->size_request; 4208 my ($w, $h) = $widget->size_request;
3151 4209
3152 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4210 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3153 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4211 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4212
4213 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4214 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3154 4215
3155 $w = $widget->{force_w} if exists $widget->{force_w}; 4216 $w = $widget->{force_w} if exists $widget->{force_w};
3156 $h = $widget->{force_h} if exists $widget->{force_h}; 4217 $h = $widget->{force_h} if exists $widget->{force_h};
3157 4218
4219 if ($widget->{req_w} != $w || $widget->{req_h} != $h
4220 || delete $widget->{force_realloc}) {
3158 $widget->{req_w} = $w; 4221 $widget->{req_w} = $w;
3159 $widget->{req_h} = $h; 4222 $widget->{req_h} = $h;
3160 4223
3161 $self->{size_alloc}{$widget} = [$widget, undef, undef]; 4224 $self->{size_alloc}{$widget+0} = $widget;
3162 4225
3163 push @queue, $widget->{parent} 4226 if (my $parent = $widget->{parent}) {
3164 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent}; 4227 $self->{realloc}{$parent+0} = $parent
4228 unless $queue{$parent+0};
4229
4230 $parent->{force_size_alloc} = 1;
4231 $self->{size_alloc}{$parent+0} = $parent;
4232 }
4233 }
4234
4235 delete $self->{realloc}{$widget+0};
3165 } 4236 }
3166 } 4237 }
3167 4238
3168 while (my $size_alloc = delete $self->{size_alloc}) { 4239 while (my $size_alloc = delete $self->{size_alloc}) {
3169 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 4240 my @queue = sort { $b->{visible} <=> $a->{visible} }
3170 values %$size_alloc; 4241 values %$size_alloc;
3171 4242
3172 while () { 4243 while () {
3173 my ($widget, $w, $h) = @{ pop @queue or last }; 4244 my $widget = pop @queue || last;
3174 4245
3175 $w = $widget->{w} || $widget->{req_w} unless defined $w; 4246 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3177 4247
3178 $w = 0 if $w < 0; 4248 $w = 0 if $w < 0;
3179 $h = 0 if $h < 0; 4249 $h = 0 if $h < 0;
3180 4250
4251 $w = max $widget->{min_w}, $w;
4252 $h = max $widget->{min_h}, $h;
4253
4254# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4255# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4256
4257 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4258 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4259
3181 $w = int $w + 0.5; 4260 $w = int $w + 0.5;
3182 $h = int $h + 0.5; 4261 $h = int $h + 0.5;
3183 4262
3184 my $changed = $widget->{w} != $w || $widget->{h} != $h; 4263 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4264 $widget->{old_w} = $widget->{w};
4265 $widget->{old_h} = $widget->{h};
3185 4266
3186 $widget->{w} = $w; 4267 $widget->{w} = $w;
3187 $widget->{h} = $h; 4268 $widget->{h} = $h;
3188 4269
3189 $widget->emit (size_allocate => $w, $h, $changed); 4270 $widget->emit (size_allocate => $w, $h);
4271 }
3190 } 4272 }
3191 } 4273 }
3192 4274
3193 while ($self->{post_alloc_hook}) { 4275 while ($self->{post_alloc_hook}) {
3194 $_->() 4276 $_->()
… …
3203 glLoadIdentity; 4285 glLoadIdentity;
3204 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4286 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3205 glMatrixMode GL_MODELVIEW; 4287 glMatrixMode GL_MODELVIEW;
3206 glLoadIdentity; 4288 glLoadIdentity;
3207 4289
4290 {
4291 package CFPlus::UI::Base;
4292
4293 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4294 (0, 0, $self->{w}, $self->{h});
4295
3208 $self->_draw; 4296 $self->_draw;
4297 }
3209} 4298}
3210 4299
3211############################################################################# 4300#############################################################################
3212 4301
3213package CFClient::UI; 4302package CFPlus::UI;
3214 4303
3215$ROOT = new CFClient::UI::Root; 4304$ROOT = new CFPlus::UI::Root;
3216$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4305$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3217 4306
32181 43071
3219 4308

Diff Legend

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