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.77 by root, Tue Apr 11 22:14:13 2006 UTC vs.
Revision 1.279 by root, Mon Jun 5 00:17:47 2006 UTC

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

Diff Legend

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