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

Diff Legend

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