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.261 by elmex, Tue May 30 14:45:56 2006 UTC vs.
Revision 1.440 by root, Sun Sep 16 18:27:48 2007 UTC

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

Diff Legend

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