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.89 by root, Wed Apr 12 21:20:42 2006 UTC vs.
Revision 1.387 by root, Fri Jul 20 18:19:45 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines