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.158 by root, Mon Apr 24 02:41:48 2006 UTC vs.
Revision 1.256 by root, Tue May 30 01:42:16 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
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
15 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
33 $layout
34}
35
36sub set_layout {
37 my ($layout) = @_;
38 $LAYOUT = $layout;
39}
40
16sub check_tooltip { 41sub check_tooltip {
17 if (!$GRAB) { 42 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 43 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 44 if (length $widget->{tooltip}) {
20 45
21 if ($TOOLTIP->{owner} != $widget) { 46 if ($TOOLTIP->{owner} != $widget) {
47 $TOOLTIP->hide;
48
22 $TOOLTIP->{owner} = $widget; 49 $TOOLTIP->{owner} = $widget;
23 50
24 my $tip = $widget->{tooltip}; 51 my $tip = $widget->{tooltip};
25 52
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 53 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 54
28 $TOOLTIP->set_text ($widget->{tooltip}); 55 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 56 $TOOLTIP->show;
31 } 57 }
32 58
33 return; 59 return;
34 } 60 }
… …
39 delete $TOOLTIP->{owner}; 65 delete $TOOLTIP->{owner};
40} 66}
41 67
42# class methods for events 68# class methods for events
43sub feed_sdl_key_down_event { 69sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 70 $FOCUS->emit (key_down => $_[0])
71 if $FOCUS;
45} 72}
46 73
47sub feed_sdl_key_up_event { 74sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 75 $FOCUS->emit (key_up => $_[0])
76 if $FOCUS;
49} 77}
50 78
51sub feed_sdl_button_down_event { 79sub feed_sdl_button_down_event {
52 my ($ev) = @_; 80 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 81 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 89 check_tooltip;
62 } 90 }
63 91
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 92 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 93
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 94 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
95 if $GRAB;
67} 96}
68 97
69sub feed_sdl_button_up_event { 98sub feed_sdl_button_up_event {
70 my ($ev) = @_; 99 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 100 my ($x, $y) = ($ev->{x}, $ev->{y});
72 101
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 102 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 103
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 104 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 105
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 106 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
107 if $GRAB;
78 108
79 if (!$BUTTON_STATE) { 109 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 110 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 111 $grab->update if $grab;
82 $GRAB->update if $GRAB; 112 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 128 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 129
100 check_tooltip; 130 check_tooltip;
101 } 131 }
102 132
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 133 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
134 if $HOVER;
104} 135}
105 136
106# convert position array to integers 137# convert position array to integers
107sub harmonize { 138sub harmonize {
108 my ($vals) = @_; 139 my ($vals) = @_;
… …
114 $rem += $_ - $i; 145 $rem += $_ - $i;
115 $_ = $i; 146 $_ = $i;
116 } 147 }
117} 148}
118 149
150sub full_refresh {
151 # make a copy, otherwise for complains about freed values.
152 my @widgets = values %WIDGET;
153
154 $_->update
155 for @widgets;
156}
157
158sub reconfigure_widgets {
159 # make a copy, otherwise C<for> complains about freed values.
160 my @widgets = values %WIDGET;
161
162 $_->reconfigure
163 for @widgets;
164}
165
166# call when resolution changes etc.
167sub rescale_widgets {
168 my ($sx, $sy) = @_;
169
170 for my $widget (values %WIDGET) {
171 if ($widget->{is_toplevel}) {
172 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
173 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
174
175 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
177 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
178 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
179 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
180 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
181
182 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
183 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
184
185 }
186 }
187
188 reconfigure_widgets;
189}
190
119############################################################################# 191#############################################################################
120 192
121package CFClient::UI::Base; 193package CFClient::UI::Base;
122 194
123use strict; 195use strict;
… …
126 198
127sub new { 199sub new {
128 my $class = shift; 200 my $class = shift;
129 201
130 my $self = bless { 202 my $self = bless {
131 x => 0, 203 x => "center",
132 y => 0, 204 y => "center",
133 z => 0, 205 z => 0,
206 w => undef,
207 h => undef,
134 can_events => 1, 208 can_events => 1,
135 @_ 209 @_
136 }, $class; 210 }, $class;
137 211
212 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
213 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
214 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
215 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
216 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
217
218 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
219 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
220 }
221
222 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
223
138 for (keys %$self) { 224 for (keys %$self) {
139 if (/^connect_(.*)$/) { 225 if (/^on_(.*)$/) {
140 $self->connect ($1 => delete $self->{$_}); 226 $self->connect ($1 => delete $self->{$_});
141 } 227 }
142 } 228 }
143 229
144 $self 230 $self
145} 231}
146 232
233sub destroy {
234 my ($self) = @_;
235
236 $self->hide;
237 %$self = ();
238}
239
147sub show { 240sub show {
148 my ($self) = @_; 241 my ($self) = @_;
149 242
150 return if $self->{parent}; 243 return if $self->{parent};
151 244
152 $CFClient::UI::ROOT->add ($self); 245 $CFClient::UI::ROOT->add ($self);
153} 246}
154 247
248sub set_visible {
249 my ($self) = @_;
250
251 return if $self->{visible};
252
253 $self->{root} = $self->{parent}{root};
254 $self->{visible} = $self->{parent}{visible} + 1;
255
256 $self->emit (visibility_change => 1);
257
258 $self->realloc if !exists $self->{req_w};
259
260 $_->set_visible for $self->children;
261}
262
263sub set_invisible {
264 my ($self) = @_;
265
266 return unless $self->{visible};
267
268 $_->set_invisible for $self->children;
269
270 delete $self->{root};
271 delete $self->{visible};
272
273 undef $GRAB if $GRAB == $self;
274 undef $HOVER if $HOVER == $self;
275
276 CFClient::UI::check_tooltip
277 if $TOOLTIP->{owner} == $self;
278
279 $self->focus_out;
280
281 $self->emit (visibility_change => 0);
282}
283
284sub set_visibility {
285 my ($self, $visible) = @_;
286
287 return if $self->{visible} == $visible;
288
289 $visible ? $self->hide
290 : $self->show;
291}
292
293sub toggle_visibility {
294 my ($self) = @_;
295
296 $self->{visible}
297 ? $self->hide
298 : $self->show;
299}
300
155sub hide { 301sub hide {
156 my ($self) = @_; 302 my ($self) = @_;
157 303
158 return unless $self->{parent}; 304 $self->set_invisible;
159 305
160 $self->{parent}->remove ($self); 306 $self->{parent}->remove ($self)
307 if $self->{parent};
161} 308}
162 309
163sub move { 310sub move_abs {
164 my ($self, $x, $y, $z) = @_; 311 my ($self, $x, $y, $z) = @_;
165 312
166 $self->{x} = int $x; 313 $self->{x} = List::Util::max 0, int $x;
167 $self->{y} = int $y; 314 $self->{y} = List::Util::max 0, int $y;
168 $self->{z} = $z if defined $z; 315 $self->{z} = $z if defined $z;
169 316
170 $self->update; 317 $self->update;
171} 318}
172 319
173sub set_size { 320sub set_size {
174 my ($self, $w, $h) = @_; 321 my ($self, $w, $h) = @_;
175 322
176 $self->{user_w} = $w; 323 $self->{force_w} = $w;
177 $self->{user_h} = $h; 324 $self->{force_h} = $h;
178 325
179 $self->check_size; 326 $self->realloc;
180} 327}
181 328
182sub size_request { 329sub size_request {
183 require Carp; 330 require Carp;
184 Carp::confess "size_request is abstract"; 331 Carp::confess "size_request is abstract";
… …
186 333
187sub configure { 334sub configure {
188 my ($self, $x, $y, $w, $h) = @_; 335 my ($self, $x, $y, $w, $h) = @_;
189 336
190 if ($self->{aspect}) { 337 if ($self->{aspect}) {
338 my ($ow, $oh) = ($w, $h);
339
191 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 340 $w = List::Util::min $w, int $h * $self->{aspect};
192 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 341 $h = List::Util::min $h, int $w / $self->{aspect};
193 342
194 # use alignment to adjust x, y 343 # use alignment to adjust x, y
195 344
196 $x += int +($w - $w2) * 0.5; 345 $x += int 0.5 * ($ow - $w);
197 $y += int +($h - $h2) * 0.5; 346 $y += int 0.5 * ($oh - $h);
198
199 ($w, $h) = ($w2, $h2);
200 } 347 }
201 348
202 if ($self->{x} != $x || $self->{y} != $y) { 349 if ($self->{x} ne $x || $self->{y} ne $y) {
203 $self->{x} = $x; 350 $self->{x} = $x;
204 $self->{y} = $y; 351 $self->{y} = $y;
205 $self->update; 352 $self->update;
206 } 353 }
207 354
208 if ($self->{w} != $w || $self->{h} != $h) { 355 if ($self->{w} != $w || $self->{h} != $h) {
209 $self->{w} = $w; 356 return unless $self->{visible};
210 $self->{h} = $h;
211 357
212 $self->size_allocate ($w, $h); 358 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
213 $self->update;
214 } 359 }
215} 360}
216 361
217sub size_allocate { 362sub size_allocate {
218 # nothing to be done 363 # nothing to be done
219} 364}
220 365
366sub children {
367}
368
221sub set_max_size { 369sub set_max_size {
222 my ($self, $w, $h) = @_; 370 my ($self, $w, $h) = @_;
223 371
224 delete $self->{max_w}; $self->{max_w} = $w if $w; 372 delete $self->{max_w}; $self->{max_w} = $w if $w;
225 delete $self->{max_h}; $self->{max_h} = $h if $h; 373 delete $self->{max_h}; $self->{max_h} = $h if $h;
226} 374}
227 375
228# return top left coordinates 376sub set_tooltip {
229sub _topleft {
230 my ($self, $x, $y) = @_; 377 my ($self, $tooltip) = @_;
231 378
232 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 379 $tooltip =~ s/^\s+//;
380 $tooltip =~ s/\s+$//;
381
382 return if $self->{tooltip} eq $tooltip;
383
384 $self->{tooltip} = $tooltip;
385
386 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
387 delete $CFClient::UI::TOOLTIP->{owner};
388 CFClient::UI::check_tooltip;
389 }
233} 390}
234 391
235# translate global coordinates to local coordinate system 392# translate global coordinates to local coordinate system
236sub coord2local { 393sub coord2local {
237 my ($self, $x, $y) = @_; 394 my ($self, $x, $y) = @_;
238 395
239 my ($X, $Y) = $self->_topleft; 396 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
240 ($x - $X, $y - $Y)
241} 397}
242 398
243# translate local coordinates to global coordinate system 399# translate local coordinates to global coordinate system
244sub coord2global { 400sub coord2global {
245 my ($self, $x, $y) = @_; 401 my ($self, $x, $y) = @_;
246 402
247 my ($X, $Y) = $self->_topleft; 403 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
248 ($x + $X, $y + $Y)
249} 404}
250 405
251sub focus_in { 406sub focus_in {
252 my ($self) = @_; 407 my ($self) = @_;
253 408
254 return if $FOCUS == $self; 409 return if $FOCUS == $self;
255 return unless $self->{can_focus}; 410 return unless $self->{can_focus};
256 411
257 my $focus = $FOCUS; $FOCUS = $self; 412 my $focus = $FOCUS; $FOCUS = $self;
258 413
259 $self->emit (focus_in => $focus); 414 $self->_emit (focus_in => $focus);
260 415
261 $focus->update if $focus; 416 $focus->update if $focus;
262 $FOCUS->update; 417 $FOCUS->update;
263} 418}
264 419
… …
267 422
268 return unless $FOCUS == $self; 423 return unless $FOCUS == $self;
269 424
270 my $focus = $FOCUS; undef $FOCUS; 425 my $focus = $FOCUS; undef $FOCUS;
271 426
272 $self->emit (focus_out => $focus); 427 $self->_emit (focus_out => $focus);
273 428
274 $focus->update if $focus; #? 429 $focus->update if $focus; #?
430
431 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
432 unless $FOCUS;
275} 433}
276 434
277sub mouse_motion { } 435sub mouse_motion { }
278sub button_up { } 436sub button_up { }
279sub key_down { } 437sub key_down { }
280sub key_up { } 438sub key_up { }
281 439
282sub button_down { 440sub button_down {
283 my ($self, $ev, $x, $y) = @_; 441 my ($self, $ev, $x, $y) = @_;
284 442
285 $self->focus_in; 443 $self->focus_in;
… …
288sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 446sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
289sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 447sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
290sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 448sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
291sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 449sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
292sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 450sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
451
452sub find_widget {
453 my ($self, $x, $y) = @_;
454
455 return () unless $self->{can_events};
456
457 return $self
458 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
459 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
460
461 ()
462}
463
464sub set_parent {
465 my ($self, $parent) = @_;
466
467 Scalar::Util::weaken ($self->{parent} = $parent);
468
469 $self->set_visible if $parent->{visible};
470}
471
472sub connect {
473 my ($self, $signal, $cb) = @_;
474
475 push @{ $self->{signal_cb}{$signal} }, $cb;
476}
477
478sub _emit {
479 my ($self, $signal, @args) = @_;
480
481 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
482}
483
484sub emit {
485 my ($self, $signal, @args) = @_;
486
487 $self->_emit ($signal, @args)
488 || $self->$signal (@args);
489}
490
491sub visibility_change {
492 #my ($self, $visible) = @_;
493}
494
495sub realloc {
496 my ($self) = @_;
497
498 if ($self->{visible}) {
499 return if $self->{root}{realloc}{$self};
500
501 $self->{root}{realloc}{$self} = $self;
502 $self->{root}->update;
503 } else {
504 delete $self->{req_w};
505 }
506}
507
508sub update {
509 my ($self) = @_;
510
511 $self->{parent}->update
512 if $self->{parent};
513}
514
515sub reconfigure {
516 my ($self) = @_;
517
518 $self->realloc;
519 $self->update;
520}
293 521
294sub draw { 522sub draw {
295 my ($self) = @_; 523 my ($self) = @_;
296 524
297 return unless $self->{h} && $self->{w}; 525 return unless $self->{h} && $self->{w};
… …
313 glVertex $x + $self->{w}, $y + $self->{h}; 541 glVertex $x + $self->{w}, $y + $self->{h};
314 glVertex $x , $y + $self->{h}; 542 glVertex $x , $y + $self->{h};
315 glEnd; 543 glEnd;
316 glDisable GL_BLEND; 544 glDisable GL_BLEND;
317 } 545 }
546
547 if ($ENV{CFPLUS_DEBUG}) {
548 glPushMatrix;
549 glColor 1, 1, 0, 1;
550 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
551 glBegin GL_LINE_LOOP;
552 glVertex 0 , 0;
553 glVertex $self->{w} - 1, 0;
554 glVertex $self->{w} - 1, $self->{h} - 1;
555 glVertex 0 , $self->{h} - 1;
556 glEnd;
557 glPopMatrix;
558 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
559 }
318} 560}
319 561
320sub _draw { 562sub _draw {
321 my ($self) = @_; 563 my ($self) = @_;
322 564
323 warn "no draw defined for $self\n"; 565 warn "no draw defined for $self\n";
324} 566}
325 567
326sub find_widget {
327 my ($self, $x, $y) = @_;
328
329 return () unless $self->{can_events};
330
331 return $self
332 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
333 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
334
335 ()
336}
337
338sub set_parent {
339 my ($self, $parent) = @_;
340
341 Scalar::Util::weaken ($self->{parent} = $parent);
342}
343
344sub check_size {
345 my ($self) = @_;
346
347 $self->{parent}
348 or return 1;
349
350 my ($w, $h) = $self->{user_w} && $self->{user_h}
351 ? @$self{qw(user_w user_h)}
352 : $self->size_request;
353
354 if ($w != $self->{req_w} || $h != $self->{req_h}) {
355 $self->{req_w} = $w;
356 $self->{req_h} = $h;
357
358 $self->{parent}->check_size
359 or $self->size_allocate (
360 (List::Util::max $self->{w}, $w),
361 (List::Util::max $self->{h}, $h),
362 );
363
364 1
365 } else {
366 0
367 }
368}
369
370sub update {
371 my ($self) = @_;
372
373 $self->{parent}->update
374 if $self->{parent};
375}
376
377sub connect {
378 my ($self, $signal, $cb) = @_;
379
380 push @{ $self->{signal_cb}{$signal} }, $cb;
381}
382
383sub emit {
384 my ($self, $signal, @args) = @_;
385
386 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
387 $cb->($self, @args);
388 }
389}
390
391sub DESTROY { 568sub DESTROY {
392 my ($self) = @_; 569 my ($self) = @_;
393 570
571 delete $WIDGET{$self+0};
394 #$self->deactivate; 572 #$self->deactivate;
395} 573}
396 574
397############################################################################# 575#############################################################################
398 576
… …
407 my $class = shift; 585 my $class = shift;
408 586
409 # range [value, low, high, page] 587 # range [value, low, high, page]
410 588
411 $class->SUPER::new ( 589 $class->SUPER::new (
412 bg => [0, 0, 0, 0.2], 590 #bg => [0, 0, 0, 0.2],
413 active_bg => [1, 1, 1, 0.5], 591 #active_bg => [1, 1, 1, 0.5],
414 @_ 592 @_
415 ) 593 )
416} 594}
417 595
418sub _draw { 596sub _draw {
419 my ($self) = @_; 597 my ($self) = @_;
420 598
599 my $color = $FOCUS == $self && $self->{active_bg}
600 ? $self->{active_bg}
601 : $self->{bg};
602
603 if ($color && (@$color < 4 || $color->[3])) {
421 my ($w, $h) = @$self{qw(w h)}; 604 my ($w, $h) = @$self{qw(w h)};
422 605
423 glEnable GL_BLEND; 606 glEnable GL_BLEND;
424 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
425 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 608 glColor @$color;
426 609
427 glBegin GL_QUADS; 610 glBegin GL_QUADS;
428 glVertex 0 , 0; 611 glVertex 0 , 0;
429 glVertex 0 , $h; 612 glVertex 0 , $h;
430 glVertex $w, $h; 613 glVertex $w, $h;
431 glVertex $w, 0; 614 glVertex $w, 0;
432 glEnd; 615 glEnd;
433 616
434 glDisable GL_BLEND; 617 glDisable GL_BLEND;
618 }
435} 619}
436 620
437############################################################################# 621#############################################################################
438 622
439package CFClient::UI::Empty; 623package CFClient::UI::Empty;
… …
444 my ($class, %arg) = @_; 628 my ($class, %arg) = @_;
445 $class->SUPER::new (can_events => 0, %arg); 629 $class->SUPER::new (can_events => 0, %arg);
446} 630}
447 631
448sub size_request { 632sub size_request {
449 (0, 0) 633 my ($self) = @_;
634
635 ($self->{w} + 0, $self->{h} + 0)
450} 636}
451 637
452sub draw { } 638sub draw { }
453 639
454############################################################################# 640#############################################################################
… …
460sub new { 646sub new {
461 my ($class, %arg) = @_; 647 my ($class, %arg) = @_;
462 648
463 my $children = delete $arg{children} || []; 649 my $children = delete $arg{children} || [];
464 650
465 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 651 my $self = $class->SUPER::new (
652 children => [],
653 can_events => 0,
654 %arg,
655 );
466 $self->add ($_) for @$children; 656 $self->add ($_) for @$children;
467 657
468 $self 658 $self
469} 659}
470 660
471sub add { 661sub add {
472 my ($self, $child) = @_; 662 my ($self, @widgets) = @_;
473 663
474 $child->set_parent ($self); 664 $_->set_parent ($self)
665 for @widgets;
475 666
476 use sort 'stable'; 667 use sort 'stable';
477 668
478 $self->{children} = [ 669 $self->{children} = [
479 sort { $a->{z} <=> $b->{z} } 670 sort { $a->{z} <=> $b->{z} }
480 @{$self->{children}}, $child 671 @{$self->{children}}, @widgets
481 ]; 672 ];
482 673
483 $child->check_size; 674 $self->realloc;
675}
676
677sub children {
678 @{ $_[0]{children} }
484} 679}
485 680
486sub remove { 681sub remove {
487 my ($self, $child) = @_; 682 my ($self, $child) = @_;
488 683
489 delete $child->{parent}; 684 delete $child->{parent};
685 $child->hide;
490 686
491 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 687 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
492 688
493 $self->check_size; 689 $self->realloc;
494 $self->update; 690}
691
692sub clear {
693 my ($self) = @_;
694
695 my $children = delete $self->{children};
696 $self->{children} = [];
697
698 for (@$children) {
699 delete $_->{parent};
700 $_->hide;
701 }
702
703 $self->realloc;
495} 704}
496 705
497sub find_widget { 706sub find_widget {
498 my ($self, $x, $y) = @_; 707 my ($self, $x, $y) = @_;
499 708
… …
552sub size_request { 761sub size_request {
553 $_[0]{children}[0]->size_request 762 $_[0]{children}[0]->size_request
554} 763}
555 764
556sub size_allocate { 765sub size_allocate {
557 my ($self, $w, $h) = @_; 766 my ($self, $w, $h, $changed) = @_;
558 767
559 $self->{children}[0]->configure (0, 0, $w, $h); 768 $self->{children}[0]->configure (0, 0, $w, $h);
560} 769}
561 770
562############################################################################# 771#############################################################################
… …
574} 783}
575 784
576sub update { 785sub update {
577 my ($self) = @_; 786 my ($self) = @_;
578 787
579 # we want to do this delayed... 788 $ROOT->on_post_alloc ($self => sub { $self->render_child });
580 $self->render_chld;
581 $self->SUPER::update; 789 $self->SUPER::update;
582} 790}
583 791
792sub size_allocate {
793 my ($self, $w, $h, $changed) = @_;
794
795 $self->SUPER::size_allocate ($w, $h, $changed);
796 $self->update
797 if $changed;
798}
799
800sub _render {
801 $_[0]{children}[0]->draw;
802}
803
584sub render_chld { 804sub render_child {
585 my ($self) = @_; 805 my ($self) = @_;
586 806
587 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 807 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
588 glClearColor 0, 0, 0, 1; 808 glClearColor 0, 0, 0, 0;
589 glClear GL_COLOR_BUFFER_BIT; 809 glClear GL_COLOR_BUFFER_BIT;
590 $self->child->draw; 810
811 $self->_render;
591 }; 812 };
592}
593
594sub size_allocate {
595 my ($self, $w, $h) = @_;
596
597 $self->child->configure (0, 0, $w, $h);
598
599 $self->render_chld;
600} 813}
601 814
602sub _draw { 815sub _draw {
603 my ($self) = @_; 816 my ($self) = @_;
604 817
605 my ($w, $h) = ($self->w, $self->h); 818 my ($w, $h) = ($self->w, $self->h);
606 819
607 my $tex = $self->{texture} 820 my $tex = $self->{texture}
608 or return; 821 or return;
609 822
610 glEnable GL_BLEND;
611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
612 glEnable GL_TEXTURE_2D; 823 glEnable GL_TEXTURE_2D;
613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 824 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
825 glColor 1, 1, 1, 1;
614 826
615 $tex->draw_quad (0, 0, $w, $h); 827 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
616 828
617 glDisable GL_BLEND;
618 glDisable GL_TEXTURE_2D; 829 glDisable GL_TEXTURE_2D;
619} 830}
620 831
621############################################################################# 832#############################################################################
622 833
623package CFClient::UI::ViewPort; 834package CFClient::UI::ViewPort;
624 835
625our @ISA = CFClient::UI::Window::; 836our @ISA = CFClient::UI::Window::;
626
627sub new { die }
628
629sub size_request {
630 my ($self) = @_;
631
632 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
633 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
634
635 @$self{qw(child_w child_h)}
636}
637
638sub _draw {
639 my ($self) = @_;
640
641 $self->{children}[1]->draw;
642}
643
644
645#############################################################################
646
647package CFClient::UI::Frame;
648
649our @ISA = CFClient::UI::Bin::;
650
651use CFClient::OpenGL;
652 837
653sub new { 838sub new {
654 my $class = shift; 839 my $class = shift;
655 840
656 my $self = $class->SUPER::new ( 841 $class->SUPER::new (
657 bg => [1, 1, 1, 1], 842 scroll_x => 0,
658 border_bg => [1, 1, 1, 1], 843 scroll_y => 1,
659 border => 0.8,
660 @_ 844 @_,
661 ); 845 )
662
663 $self
664} 846}
665 847
666sub _draw { 848sub size_request {
849 my ($self) = @_;
850
851 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
852
853 $w = 10 if $self->{scroll_x};
854 $h = 10 if $self->{scroll_y};
855
856 ($w, $h)
857}
858
859sub size_allocate {
860 my ($self, $w, $h, $changed) = @_;
861
862 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
863 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
864
865 $self->child->configure (0, 0, $w, $h);
866 $self->update;
867}
868
869sub set_offset {
667 my ($self) = @_; 870 my ($self, $x, $y) = @_;
668 871
669 my ($w, $h) = ($self->{w}, $self->{h}); 872 $self->{view_x} = int $x;
873 $self->{view_y} = int $y;
670 874
671 glEnable GL_BLEND; 875 $self->update;
672 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 876}
673 glEnable GL_TEXTURE_2D;
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 877
676# glBegin GL_QUADS; 878# hmm, this does not work for topleft of $self... but we should not ask for that
677# glColor 0, 0, 0, 0; 879sub coord2local {
678# glVertex 0 , 0; 880 my ($self, $x, $y) = @_;
679# glVertex 0 , $h;
680# glVertex $w, $h;
681# glVertex $w, 0;
682# glEnd;
683 881
882 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
883}
684 884
685 $self->child->draw; 885sub coord2global {
686 glDisable GL_BLEND; 886 my ($self, $x, $y) = @_;
687 glDisable GL_TEXTURE_2D; 887
888 $x = List::Util::min $self->{w}, $x - $self->{view_x};
889 $y = List::Util::min $self->{h}, $y - $self->{view_y};
890
891 $self->SUPER::coord2global ($x, $y)
892}
893
894sub find_widget {
895 my ($self, $x, $y) = @_;
896
897 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
898 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
899 ) {
900 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
901 } else {
902 $self->CFClient::UI::Base::find_widget ($x, $y)
903 }
904}
905
906sub _render {
907 my ($self) = @_;
908
909 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
910
911 $self->SUPER::_render;
688} 912}
689 913
690############################################################################# 914#############################################################################
691 915
692package CFClient::UI::FancyFrame; 916package CFClient::UI::ScrolledWindow;
693 917
694our @ISA = CFClient::UI::Bin::; 918our @ISA = CFClient::UI::HBox::;
695
696use CFClient::OpenGL;
697
698my @tex =
699 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
700 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
701 919
702sub new { 920sub new {
703 my $class = shift; 921 my $class = shift;
704 922
705 # TODO: user_x, user_y, overwrite moveto? 923 my $self;
924
925 my $slider = new CFClient::UI::Slider
926 vertical => 1,
927 range => [0, 0, 1, 0.01], # HACK fix
928 on_changed => sub {
929 $self->{vp}->set_offset (0, $_[1]);
930 },
931 ;
932
933 $self = $class->SUPER::new (
934 vp => (new CFClient::UI::ViewPort expand => 1),
935 slider => $slider,
936 @_,
937 );
938
939 $self->{vp}->add ($self->{scrolled});
940 $self->add ($self->{vp});
941 $self->add ($self->{slider});
942
943 $self
944}
945
946sub update {
947 my ($self) = @_;
948
949 $self->SUPER::update;
950
951 # todo: overwrite size_allocate of child
952 my $child = $self->{vp}->child;
953 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
954}
955
956sub size_allocate {
957 my ($self, $w, $h, $changed) = @_;
958
959 $self->SUPER::size_allocate ($w, $h, $changed);
960
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963}
964
965#TODO# update range on size_allocate depending on child
966# update viewport offset on scroll
967
968#############################################################################
969
970package CFClient::UI::Frame;
971
972our @ISA = CFClient::UI::Bin::;
973
974use CFClient::OpenGL;
975
976sub new {
977 my $class = shift;
978
979 $class->SUPER::new (
980 bg => undef,
981 @_,
982 )
983}
984
985sub _draw {
986 my ($self) = @_;
987
988 if ($self->{bg}) {
989 my ($w, $h) = @$self{qw(w h)};
990
991 glEnable GL_BLEND;
992 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
993 glColor @{ $self->{bg} };
994
995 glBegin GL_QUADS;
996 glVertex 0 , 0;
997 glVertex 0 , $h;
998 glVertex $w, $h;
999 glVertex $w, 0;
1000 glEnd;
1001
1002 glDisable GL_BLEND;
1003 }
1004
1005 $self->SUPER::_draw;
1006}
1007
1008#############################################################################
1009
1010package CFClient::UI::FancyFrame;
1011
1012our @ISA = CFClient::UI::Bin::;
1013
1014use CFClient::OpenGL;
1015
1016my $bg =
1017 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1018 mipmap => 1, wrap => 1;
1019
1020my @border =
1021 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1022 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1023
1024sub new {
1025 my $class = shift;
706 1026
707 my $self = $class->SUPER::new ( 1027 my $self = $class->SUPER::new (
708 bg => [1, 1, 1, 1], 1028 bg => [1, 1, 1, 1],
709 border_bg => [1, 1, 1, 1], 1029 border_bg => [1, 1, 1, 1],
710 border => 0.8, 1030 border => 0.6,
1031 is_toplevel => 1,
711 can_events => 1, 1032 can_events => 1,
712 @_ 1033 @_
713 ); 1034 );
714 1035
715 $self->{title} &&= new CFClient::UI::Label 1036 $self->{title} &&= new CFClient::UI::Label
716 align => 0, 1037 align => 0,
717 valign => 1, 1038 valign => 1,
718 text => $self->{title}, 1039 text => $self->{title},
719 fontsize => 1; 1040 fontsize => $self->{border};
720 1041
721 $self 1042 $self
722} 1043}
723 1044
724sub border { 1045sub border {
… …
735 $h + $self->border * 2, 1056 $h + $self->border * 2,
736 ) 1057 )
737} 1058}
738 1059
739sub size_allocate { 1060sub size_allocate {
740 my ($self, $w, $h) = @_; 1061 my ($self, $w, $h, $changed) = @_;
1062
1063 return unless $changed;
741 1064
742 $h -= List::Util::max 0, $self->border * 2; 1065 $h -= List::Util::max 0, $self->border * 2;
743 $w -= List::Util::max 0, $self->border * 2; 1066 $w -= List::Util::max 0, $self->border * 2;
744 1067
745 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1068 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
746 if $self->{title}; 1069 if $self->{title};
747 1070
748 $self->child->configure ($self->border, $self->border, $w, $h); 1071 $self->child->configure ($self->border, $self->border, $w, $h);
749} 1072}
750 1073
751sub button_down { 1074sub button_down {
752 my ($self, $ev, $x, $y) = @_; 1075 my ($self, $ev, $x, $y) = @_;
753 1076
1077 my ($w, $h) = @$self{qw(w h)};
754 my $border = $self->border; 1078 my $border = $self->border;
755 1079
756 if ($x < $self->{w} && $x >= $self->{w} - $border 1080 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
757 && $y < $self->{h} && $y >= $self->{h} - $border) { 1081 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
758 1082
1083 if ($lr & $td) {
1084 my ($wx, $wy) = ($self->{x}, $self->{y});
759 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1085 my ($ox, $oy) = ($ev->{x}, $ev->{y});
760 my ($bw, $bh) = ($self->{w}, $self->{h}); 1086 my ($bw, $bh) = ($self->{w}, $self->{h});
761 1087
1088 my $mx = $x < $border;
1089 my $my = $y < $border;
1090
762 $self->{motion} = sub { 1091 $self->{motion} = sub {
763 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
764 1093
765 ($x, $y) = ($ev->{x}, $ev->{y}); 1094 my $dx = $ev->{x} - $ox;
1095 my $dy = $ev->{y} - $oy;
766 1096
767 $self->{user_w} = $bw + $x - $ox; 1097 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
768 $self->{user_h} = $bh + $y - $oy; 1098 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
769 $self->check_size; 1099
1100 $self->realloc;
1101 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
770 }; 1102 };
771 1103
772 } elsif ($x >= 0 && $x < $self->{w} 1104 } elsif ($lr ^ $td) {
773 && $y >= 0 && $y < $border) {
774
775 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1105 my ($ox, $oy) = ($ev->{x}, $ev->{y});
776 my ($bx, $by) = ($self->{x}, $self->{y}); 1106 my ($bx, $by) = ($self->{x}, $self->{y});
777 1107
778 $self->{motion} = sub { 1108 $self->{motion} = sub {
779 my ($ev, $x, $y) = @_; 1109 my ($ev, $x, $y) = @_;
780 1110
781 ($x, $y) = ($ev->{x}, $ev->{y}); 1111 ($x, $y) = ($ev->{x}, $ev->{y});
782 1112
783 $self->move ($bx + $x - $ox, $by + $y - $oy); 1113 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
784 $self->update;
785 }; 1114 };
786 } 1115 }
787} 1116}
788 1117
789sub button_up { 1118sub button_up {
… …
802 my ($self) = @_; 1131 my ($self) = @_;
803 1132
804 my ($w, $h ) = ($self->{w}, $self->{h}); 1133 my ($w, $h ) = ($self->{w}, $self->{h});
805 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1134 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
806 1135
807 glEnable GL_BLEND;
808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809 glEnable GL_TEXTURE_2D; 1136 glEnable GL_TEXTURE_2D;
810 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
811 1138
812 my $border = $self->border; 1139 my $border = $self->border;
813 1140
814 glColor @{ $self->{border_bg} }; 1141 glColor @{ $self->{border_bg} };
815 $tex[1]->draw_quad (0, 0, $w, $border); 1142 $border[0]->draw_quad_alpha (0, 0, $w, $border);
816 $tex[3]->draw_quad (0, $border, $border, $ch); 1143 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
817 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1144 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
818 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1145 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
819 1146
820 my $bg = $tex[0]; 1147 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1148 glColor @{ $self->{bg} };
821 1149
822 # TODO: repeat texture not scale 1150 # TODO: repeat texture not scale
823 my $rep_x = $cw / $bg->{w}; 1151 # solve this better(?)
824 my $rep_y = $ch / $bg->{h}; 1152 $bg->{s} = $cw / $bg->{w};
825 1153 $bg->{t} = $ch / $bg->{h};
826 glColor @{ $self->{bg} };
827
828 $bg->{s} = $rep_x;
829 $bg->{t} = $rep_y;
830 $bg->{wrap_mode} = 1;
831 $bg->draw_quad ($border, $border, $cw, $ch); 1154 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1155 }
832 1156
833 glDisable GL_TEXTURE_2D; 1157 glDisable GL_TEXTURE_2D;
834 glDisable GL_BLEND;
835 1158
836 $self->{title}->draw if $self->{title}; 1159 $self->{title}->draw if $self->{title};
1160
837 $self->child->draw; 1161 $self->child->draw;
838} 1162}
839 1163
840############################################################################# 1164#############################################################################
841 1165
… …
850sub new { 1174sub new {
851 my $class = shift; 1175 my $class = shift;
852 1176
853 $class->SUPER::new ( 1177 $class->SUPER::new (
854 col_expand => [], 1178 col_expand => [],
855 @_ 1179 @_,
856 ) 1180 )
1181}
1182
1183sub children {
1184 grep $_, map @$_, grep $_, @{ $_[0]{children} }
857} 1185}
858 1186
859sub add { 1187sub add {
860 my ($self, $x, $y, $child) = @_; 1188 my ($self, $x, $y, $child) = @_;
861 1189
862 $child->set_parent ($self); 1190 $child->set_parent ($self);
863 $self->{children}[$y][$x] = $child; 1191 $self->{children}[$y][$x] = $child;
864 1192
865 $child->check_size; 1193 $self->realloc;
866} 1194}
867 1195
868# TODO: move to container class maybe? send childs a signal on removal? 1196# TODO: move to container class maybe? send children a signal on removal?
869sub clear { 1197sub clear {
870 my ($self) = @_; 1198 my ($self) = @_;
871 1199
1200 my @children = $self->children;
872 delete $self->{children}; 1201 delete $self->{children};
873 $self->update; 1202
1203 for (@children) {
1204 delete $_->{parent};
1205 $_->hide;
1206 }
1207
1208 $self->realloc;
874} 1209}
875 1210
876sub get_wh { 1211sub get_wh {
877 my ($self) = @_; 1212 my ($self) = @_;
878 1213
… …
905 (sum @$hs), 1240 (sum @$hs),
906 ) 1241 )
907} 1242}
908 1243
909sub size_allocate { 1244sub size_allocate {
910 my ($self, $w, $h) = @_; 1245 my ($self, $w, $h, $changed) = @_;
911 1246
912 my ($ws, $hs) = $self->get_wh; 1247 my ($ws, $hs) = $self->get_wh;
913 1248
914 my $req_w = sum @$ws; 1249 my $req_w = (sum @$ws) || 1;
915 my $req_h = sum @$hs; 1250 my $req_h = (sum @$hs) || 1;
916 1251
917 # TODO: nicer code && do row_expand 1252 # TODO: nicer code && do row_expand
918 my @col_expand = @{$self->{col_expand}}; 1253 my @col_expand = @{$self->{col_expand}};
919 @col_expand = (1) x @$ws unless @col_expand; 1254 @col_expand = (1) x @$ws unless @col_expand;
920 my $col_expand = (sum @col_expand) || 1; 1255 my $col_expand = (sum @col_expand) || 1;
… …
974 } 1309 }
975} 1310}
976 1311
977############################################################################# 1312#############################################################################
978 1313
1314package CFClient::UI::Box;
1315
1316our @ISA = CFClient::UI::Container::;
1317
1318sub size_request {
1319 my ($self) = @_;
1320
1321 $self->{vertical}
1322 ? (
1323 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1324 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1325 )
1326 : (
1327 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 )
1330}
1331
1332sub size_allocate {
1333 my ($self, $w, $h, $changed) = @_;
1334
1335 my $space = $self->{vertical} ? $h : $w;
1336 my $children = $self->{children};
1337
1338 my @req;
1339
1340 if ($self->{homogeneous}) {
1341 @req = ($space / (@$children || 1)) x @$children;
1342 } else {
1343 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1344 my $req = List::Util::sum @req;
1345
1346 if ($req > $space) {
1347 # ah well, not enough space
1348 $_ *= $space / $req for @req;
1349 } else {
1350 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1351
1352 $space = ($space - $req) / $expand; # remaining space to give away
1353
1354 $req[$_] += $space * $children->[$_]{expand}
1355 for 0 .. $#$children;
1356 }
1357 }
1358
1359 CFClient::UI::harmonize \@req;
1360
1361 my $pos = 0;
1362 for (0 .. $#$children) {
1363 my $alloc = $req[$_];
1364 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1365
1366 $pos += $alloc;
1367 }
1368
1369 1
1370}
1371
1372#############################################################################
1373
979package CFClient::UI::HBox; 1374package CFClient::UI::HBox;
980 1375
981# TODO: wrap into common Box base class
982
983our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Box::;
984 1377
985sub size_request { 1378sub new {
986 my ($self) = @_; 1379 my $class = shift;
987 1380
988 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $class->SUPER::new (
989 1382 vertical => 0,
990 ( 1383 @_,
991 (List::Util::sum map $_->[0], @alloc),
992 (List::Util::max map $_->[1], @alloc),
993 ) 1384 )
994} 1385}
995 1386
996sub size_allocate {
997 my ($self, $w, $h) = @_;
998
999 ($h, $w) = ($w, $h);
1000
1001 my $children = $self->{children};
1002
1003 my @h = map $_->{req_w}, @$children;
1004
1005 my $req_h = List::Util::sum @h;
1006
1007 if ($req_h > $h) {
1008 # ah well, not enough space
1009 $_ *= $h / $req_h for @h;
1010 } else {
1011 my $exp = List::Util::sum map $_->{expand}, @$children;
1012 $exp ||= 1;
1013
1014 for (0 .. $#$children) {
1015 my $child = $children->[$_];
1016
1017 my $alloc_h = $h[$_];
1018 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1019 $h[$_] = $alloc_h;
1020 }
1021 }
1022
1023 CFClient::UI::harmonize \@h;
1024
1025 my $y = 0;
1026 for (0 .. $#$children) {
1027 my $child = $children->[$_];
1028 my $h = $h[$_];
1029 $child->configure ($y, 0, $h, $w);
1030
1031 $y += $h;
1032 }
1033
1034 1
1035}
1036
1037############################################################################# 1387#############################################################################
1038 1388
1039package CFClient::UI::VBox; 1389package CFClient::UI::VBox;
1040 1390
1041# TODO: wrap into common Box base class
1042
1043our @ISA = CFClient::UI::Container::; 1391our @ISA = CFClient::UI::Box::;
1044 1392
1045sub size_request { 1393sub new {
1046 my ($self) = @_; 1394 my $class = shift;
1047 1395
1048 my @alloc = map [$_->size_request], @{$self->{children}}; 1396 $class->SUPER::new (
1049 1397 vertical => 1,
1050 ( 1398 @_,
1051 (List::Util::max map $_->[0], @alloc),
1052 (List::Util::sum map $_->[1], @alloc),
1053 ) 1399 )
1054} 1400}
1055 1401
1056sub size_allocate {
1057 my ($self, $w, $h) = @_;
1058
1059 my $children = $self->{children};
1060
1061 my @h = map $_->{req_h}, @$children;
1062
1063 my $req_h = List::Util::sum @h;
1064
1065 if ($req_h > $h) {
1066 # ah well, not enough space
1067 $_ *= $h / $req_h for @h;
1068 } else {
1069 my $exp = List::Util::sum map $_->{expand}, @$children;
1070 $exp ||= 1;
1071
1072 for (0 .. $#$children) {
1073 my $child = $children->[$_];
1074
1075 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1076 }
1077 }
1078
1079 CFClient::UI::harmonize \@h;
1080
1081 my $y = 0;
1082 for (0 .. $#$children) {
1083 my $child = $children->[$_];
1084 my $h = $h[$_];
1085 $child->configure (0, $y, $w, $h);
1086
1087 $y += $h;
1088 }
1089
1090 1
1091}
1092
1093############################################################################# 1402#############################################################################
1094 1403
1095package CFClient::UI::Label; 1404package CFClient::UI::Label;
1096 1405
1097our @ISA = CFClient::UI::Base::; 1406our @ISA = CFClient::UI::DrawBG::;
1098 1407
1099use CFClient::OpenGL; 1408use CFClient::OpenGL;
1100 1409
1101sub new { 1410sub new {
1102 my ($class, %arg) = @_; 1411 my ($class, %arg) = @_;
1103 1412
1104 my $self = $class->SUPER::new ( 1413 my $self = $class->SUPER::new (
1105 fg => [1, 1, 1], 1414 fg => [1, 1, 1],
1415 #bg => none
1416 #active_bg => none
1106 #font => default_font 1417 #font => default_font
1418 #text => initial text
1419 #markup => initial narkup
1420 #max_w => maximum pixel width
1421 ellipsise => 3, # end
1422 layout => (new CFClient::Layout),
1107 fontsize => 1, 1423 fontsize => 1,
1108 text => "",
1109 align => -1, 1424 align => -1,
1110 valign => -1, 1425 valign => -1,
1111 padding => 2, 1426 padding => 2,
1112 layout => new CFClient::Layout,
1113 can_events => 0, 1427 can_events => 0,
1114 %arg 1428 %arg
1115 ); 1429 );
1116 1430
1117 if (exists $self->{template}) { 1431 if (exists $self->{template}) {
1118 my $layout = new CFClient::Layout; 1432 my $layout = new CFClient::Layout;
1119 $layout->set_text (delete $self->{template}); 1433 $layout->set_text (delete $self->{template});
1120 $self->{template} = $layout; 1434 $self->{template} = $layout;
1121 } 1435 }
1122 1436
1123 $self->set_text (delete $self->{text}) if exists $self->{text}; 1437 if (exists $self->{markup}) {
1124 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1438 $self->set_markup (delete $self->{markup});
1439 } else {
1440 $self->set_text (delete $self->{text});
1441 }
1125 1442
1126 $self 1443 $self
1127} 1444}
1128 1445
1129sub escape_text { 1446sub escape($) {
1130 local $_ = $_[1]; 1447 local $_ = $_[0];
1131 1448
1132 s/&/&amp;/g; 1449 s/&/&amp;/g;
1133 s/>/&gt;/g; 1450 s/>/&gt;/g;
1134 s/</&lt;/g; 1451 s/</&lt;/g;
1135 1452
1136 $_[1] 1453 $_
1454}
1455
1456sub update {
1457 my ($self) = @_;
1458
1459 delete $self->{texture};
1460 $self->SUPER::update;
1137} 1461}
1138 1462
1139sub set_text { 1463sub set_text {
1140 my ($self, $text) = @_; 1464 my ($self, $text) = @_;
1141 1465
1466 return if $self->{text} eq "T$text";
1467 $self->{text} = "T$text";
1468
1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1142 $self->{layout}->set_text ($text); 1470 $self->{layout}->set_text ($text);
1143 1471
1144 delete $self->{texture}; 1472 $self->realloc;
1145 $self->check_size;
1146 $self->update; 1473 $self->update;
1147} 1474}
1148 1475
1149sub set_markup { 1476sub set_markup {
1150 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1151 1478
1479 return if $self->{text} eq "M$markup";
1480 $self->{text} = "M$markup";
1481
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1152 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1153 1486
1154 delete $self->{texture}; 1487 $self->realloc;
1155 $self->check_size;
1156 $self->update; 1488 $self->update;
1157} 1489}
1158 1490
1159sub size_request { 1491sub size_request {
1160 my ($self) = @_; 1492 my ($self) = @_;
1161 1493
1162 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1494 $self->{layout}->set_font ($self->{font}) if $self->{font};
1163 $self->{layout}->set_width ($self->{max_w} || -1); 1495 $self->{layout}->set_width ($self->{max_w} || -1);
1496 $self->{layout}->set_ellipsise ($self->{ellipsise});
1497 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1164 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1498 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1165 1499
1166 my ($w, $h) = $self->{layout}->size; 1500 my ($w, $h) = $self->{layout}->size;
1167 1501
1168 if (exists $self->{template}) { 1502 if (exists $self->{template}) {
… …
1180 $h + $self->{padding} * 2, 1514 $h + $self->{padding} * 2,
1181 ) 1515 )
1182} 1516}
1183 1517
1184sub size_allocate { 1518sub size_allocate {
1185 my ($self, $w, $h) = @_; 1519 my ($self, $w, $h, $changed) = @_;
1186 1520
1187 delete $self->{texture}; 1521 delete $self->{texture}
1522 if $changed;
1188} 1523}
1189 1524
1190sub set_fontsize { 1525sub set_fontsize {
1191 my ($self, $fontsize) = @_; 1526 my ($self, $fontsize) = @_;
1192 1527
1193 $self->{fontsize} = $fontsize; 1528 $self->{fontsize} = $fontsize;
1194 delete $self->{texture}; 1529 delete $self->{texture};
1195 $self->check_size; 1530
1196 $self->update; 1531 $self->realloc;
1197} 1532}
1198 1533
1199sub _draw { 1534sub _draw {
1200 my ($self) = @_; 1535 my ($self) = @_;
1201 1536
1537 $self->SUPER::_draw; # draw background, if applicable
1538
1202 my $tex = $self->{texture} ||= do { 1539 my $tex = $self->{texture} ||= do {
1540 $self->{layout}->set_foreground (@{$self->{fg}});
1203 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1541 $self->{layout}->set_font ($self->{font}) if $self->{font};
1204 $self->{layout}->set_width ($self->{w}); 1542 $self->{layout}->set_width ($self->{w});
1543 $self->{layout}->set_ellipsise ($self->{ellipsise});
1544 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1205 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546
1206 new_from_layout CFClient::Texture $self->{layout} 1547 my $tex = new_from_layout CFClient::Texture $self->{layout};
1548
1549 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1550 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1551 : ($self->{w} - $tex->{w}) * 0.5);
1552
1553 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1554 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1555 : ($self->{h} - $tex->{h}) * 0.5);
1556
1557 $tex
1207 }; 1558 };
1208 1559
1209 glEnable GL_BLEND;
1210 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1211 glEnable GL_TEXTURE_2D; 1560 glEnable GL_TEXTURE_2D;
1212 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1213 1562
1563 if ($tex->{format} == GL_ALPHA) {
1214 glColor @{$self->{fg}}; 1564 glColor @{$self->{fg}};
1215
1216 $self->{ox} = int (
1217 $self->{align} < 0 ? $self->{padding}
1218 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1219 : ($self->{w} - $tex->{w}) * 0.5
1220 );
1221
1222 $self->{oy} = int (
1223 $self->{valign} < 0 ? $self->{padding}
1224 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1225 : ($self->{h} - $tex->{h}) * 0.5
1226 );
1227
1228 $tex->draw_quad ($self->{ox}, $self->{oy}); 1565 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1566 } else {
1567 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1568 }
1229 1569
1230 glDisable GL_TEXTURE_2D; 1570 glDisable GL_TEXTURE_2D;
1231 glDisable GL_BLEND;
1232} 1571}
1233 1572
1234############################################################################# 1573#############################################################################
1235 1574
1236package CFClient::UI::EntryBase; 1575package CFClient::UI::EntryBase;
… …
1241 1580
1242sub new { 1581sub new {
1243 my $class = shift; 1582 my $class = shift;
1244 1583
1245 $class->SUPER::new ( 1584 $class->SUPER::new (
1246 fg => [1, 1, 1], 1585 fg => [1, 1, 1],
1247 bg => [0, 0, 0, 0.2], 1586 bg => [0, 0, 0, 0.2],
1248 active_bg => [1, 1, 1, 0.5], 1587 active_bg => [1, 1, 1, 0.5],
1249 active_fg => [0, 0, 0], 1588 active_fg => [0, 0, 0],
1250 can_hover => 1, 1589 can_hover => 1,
1251 can_focus => 1, 1590 can_focus => 1,
1252 valign => 0, 1591 valign => 0,
1253 can_events => 1, 1592 can_events => 1,
1593 #text => ...
1254 @_ 1594 @_
1255 ) 1595 )
1256} 1596}
1257 1597
1258sub _set_text { 1598sub _set_text {
… …
1268 $self->{text} = $text; 1608 $self->{text} = $text;
1269 1609
1270 $text =~ s/./*/g if $self->{hidden}; 1610 $text =~ s/./*/g if $self->{hidden};
1271 $self->{layout}->set_text ("$text "); 1611 $self->{layout}->set_text ("$text ");
1272 1612
1273 $self->emit (changed => $self->{text}); 1613 $self->_emit (changed => $self->{text});
1614}
1615
1616sub set_text {
1617 my ($self, $text) = @_;
1618
1619 $self->{cursor} = length $text;
1620 $self->_set_text ($text);
1621
1622 $self->realloc;
1274} 1623}
1275 1624
1276sub get_text { 1625sub get_text {
1277 $_[0]{text} 1626 $_[0]{text}
1278} 1627}
… …
1281 my ($self) = @_; 1630 my ($self) = @_;
1282 1631
1283 my ($w, $h) = $self->SUPER::size_request; 1632 my ($w, $h) = $self->SUPER::size_request;
1284 1633
1285 ($w + 1, $h) # add 1 for cursor 1634 ($w + 1, $h) # add 1 for cursor
1286}
1287
1288sub size_allocate {
1289 my ($self, $w, $h) = @_;
1290
1291 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1292}
1293
1294sub set_text {
1295 my ($self, $text) = @_;
1296
1297 $self->{cursor} = length $text;
1298 $self->_set_text ($text);
1299 $self->update;
1300} 1635}
1301 1636
1302sub key_down { 1637sub key_down {
1303 my ($self, $ev) = @_; 1638 my ($self, $ev) = @_;
1304 1639
… …
1306 my $sym = $ev->{sym}; 1641 my $sym = $ev->{sym};
1307 my $uni = $ev->{unicode}; 1642 my $uni = $ev->{unicode};
1308 1643
1309 my $text = $self->get_text; 1644 my $text = $self->get_text;
1310 1645
1311 if ($sym == 8) { 1646 if ($uni == 8) {
1312 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1647 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1313 } elsif ($sym == 127) { 1648 } elsif ($uni == 127) {
1314 substr $text, $self->{cursor}, 1, ""; 1649 substr $text, $self->{cursor}, 1, "";
1315 } elsif ($sym == CFClient::SDLK_LEFT) { 1650 } elsif ($sym == CFClient::SDLK_LEFT) {
1316 --$self->{cursor} if $self->{cursor}; 1651 --$self->{cursor} if $self->{cursor};
1317 } elsif ($sym == CFClient::SDLK_RIGHT) { 1652 } elsif ($sym == CFClient::SDLK_RIGHT) {
1318 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1653 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1319 } elsif ($sym == CFClient::SDLK_HOME) { 1654 } elsif ($sym == CFClient::SDLK_HOME) {
1320 $self->{cursor} = 0; 1655 $self->{cursor} = 0;
1321 } elsif ($sym == CFClient::SDLK_END) { 1656 } elsif ($sym == CFClient::SDLK_END) {
1322 $self->{cursor} = length $text; 1657 $self->{cursor} = length $text;
1323 } elsif ($sym == 27) { 1658 } elsif ($uni == 27) {
1324 $self->emit ('escape'); 1659 $self->_emit ('escape');
1325 } elsif ($uni) { 1660 } elsif ($uni) {
1326 substr $text, $self->{cursor}++, 0, chr $uni; 1661 substr $text, $self->{cursor}++, 0, chr $uni;
1327 } 1662 }
1328 1663
1329 $self->_set_text ($text); 1664 $self->_set_text ($text);
1330 $self->update; 1665
1666 $self->realloc;
1331} 1667}
1332 1668
1333sub focus_in { 1669sub focus_in {
1334 my ($self) = @_; 1670 my ($self) = @_;
1335 1671
… …
1411 my ($self, $ev) = @_; 1747 my ($self, $ev) = @_;
1412 1748
1413 my $sym = $ev->{sym}; 1749 my $sym = $ev->{sym};
1414 1750
1415 if ($sym == 13) { 1751 if ($sym == 13) {
1752 unshift @{$self->{history}},
1753 my $txt = $self->get_text;
1754 $self->{history_pointer} = -1;
1755 $self->{history_saveback} = '';
1416 $self->emit (activate => $self->get_text); 1756 $self->_emit (activate => $txt);
1417 $self->update; 1757 $self->update;
1758
1759 } elsif ($sym == CFClient::SDLK_UP) {
1760 if ($self->{history_pointer} < 0) {
1761 $self->{history_saveback} = $self->get_text;
1762 }
1763 if (@{$self->{history} || []} > 0) {
1764 $self->{history_pointer}++;
1765 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1766 $self->{history_pointer} = @{$self->{history} || []} - 1;
1767 }
1768 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1769 }
1770
1771 } elsif ($sym == CFClient::SDLK_DOWN) {
1772 $self->{history_pointer}--;
1773 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1774
1775 if ($self->{history_pointer} >= 0) {
1776 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1777 } else {
1778 $self->set_text ($self->{history_saveback});
1779 }
1418 1780
1419 } else { 1781 } else {
1420 $self->SUPER::key_down ($ev); 1782 $self->SUPER::key_down ($ev);
1421 } 1783 }
1422 1784
… …
1436 1798
1437sub new { 1799sub new {
1438 my $class = shift; 1800 my $class = shift;
1439 1801
1440 $class->SUPER::new ( 1802 $class->SUPER::new (
1441 padding => 4, 1803 padding => 4,
1442 fg => [1, 1, 1], 1804 fg => [1, 1, 1],
1443 bg => [1, 1, 1, 0.2],
1444 active_fg => [0, 0, 1], 1805 active_fg => [0, 0, 1],
1445 can_hover => 1, 1806 can_hover => 1,
1446 align => 0, 1807 align => 0,
1447 valign => 0, 1808 valign => 0,
1448 can_events => 1, 1809 can_events => 1,
1449 @_ 1810 @_
1450 ) 1811 )
1451} 1812}
1452 1813
1814sub activate { }
1815
1453sub button_up { 1816sub button_up {
1454 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1455 1818
1819 $self->emit ("activate")
1456 if ($x >= 0 && $x < $self->{w} 1820 if $x >= 0 && $x < $self->{w}
1457 && $y >= 0 && $y < $self->{h}) { 1821 && $y >= 0 && $y < $self->{h};
1458 $self->emit ("activate");
1459 }
1460} 1822}
1461 1823
1462sub _draw { 1824sub _draw {
1463 my ($self) = @_; 1825 my ($self) = @_;
1464 1826
… …
1466 1828
1467 if ($GRAB == $self) { 1829 if ($GRAB == $self) {
1468 $self->{fg} = $self->{active_fg}; 1830 $self->{fg} = $self->{active_fg};
1469 } 1831 }
1470 1832
1471 glEnable GL_BLEND;
1472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1473 glEnable GL_TEXTURE_2D; 1833 glEnable GL_TEXTURE_2D;
1474 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1475 glColor 0, 0, 0, 1; 1835 glColor 0, 0, 0, 1;
1476 1836
1477 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1837 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1478 1838
1479 glDisable GL_TEXTURE_2D; 1839 glDisable GL_TEXTURE_2D;
1480 glDisable GL_BLEND;
1481 1840
1482 $self->SUPER::_draw; 1841 $self->SUPER::_draw;
1483} 1842}
1484 1843
1485############################################################################# 1844#############################################################################
… …
1499 1858
1500 $class->SUPER::new ( 1859 $class->SUPER::new (
1501 padding => 2, 1860 padding => 2,
1502 fg => [1, 1, 1], 1861 fg => [1, 1, 1],
1503 active_fg => [1, 1, 0], 1862 active_fg => [1, 1, 0],
1863 bg => [0, 0, 0, 0.2],
1864 active_bg => [1, 1, 1, 0.5],
1504 state => 0, 1865 state => 0,
1505 can_hover => 1, 1866 can_hover => 1,
1506 @_ 1867 @_
1507 ) 1868 )
1508} 1869}
… …
1517 my ($self, $ev, $x, $y) = @_; 1878 my ($self, $ev, $x, $y) = @_;
1518 1879
1519 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1520 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1521 $self->{state} = !$self->{state}; 1882 $self->{state} = !$self->{state};
1522 $self->emit (changed => $self->{state}); 1883 $self->_emit (changed => $self->{state});
1523 } 1884 }
1524} 1885}
1525 1886
1526sub _draw { 1887sub _draw {
1527 my ($self) = @_; 1888 my ($self) = @_;
… …
1532 1893
1533 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1894 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1534 1895
1535 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1536 1897
1537 glEnable GL_BLEND; 1898 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899
1538 glEnable GL_TEXTURE_2D; 1900 glEnable GL_TEXTURE_2D;
1539 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1540
1541 my $tex = $self->{state} ? $tex[1] : $tex[0];
1542
1543 $tex->draw_quad (0, 0, $s, $s); 1901 $tex->draw_quad_alpha (0, 0, $s, $s);
1544
1545 glDisable GL_TEXTURE_2D; 1902 glDisable GL_TEXTURE_2D;
1546 glDisable GL_BLEND;
1547} 1903}
1548 1904
1549############################################################################# 1905#############################################################################
1550 1906
1551package CFClient::UI::Image; 1907package CFClient::UI::Image;
… …
1594 glTranslate 0, -$self->{w}, 0; 1950 glTranslate 0, -$self->{w}, 0;
1595 1951
1596 ($w, $h) = ($h, $w); 1952 ($w, $h) = ($h, $w);
1597 } 1953 }
1598 1954
1599 glEnable GL_BLEND;
1600 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1601 glEnable GL_TEXTURE_2D; 1955 glEnable GL_TEXTURE_2D;
1602 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1956 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1603 1957
1604 $tex->draw_quad (0, 0, $w, $h); 1958 $tex->draw_quad_alpha (0, 0, $w, $h);
1605 1959
1606 glDisable GL_BLEND;
1607 glDisable GL_TEXTURE_2D; 1960 glDisable GL_TEXTURE_2D;
1608} 1961}
1609 1962
1610############################################################################# 1963#############################################################################
1611 1964
… …
1659} 2012}
1660 2013
1661sub set_max { 2014sub set_max {
1662 my ($self, $max) = @_; 2015 my ($self, $max) = @_;
1663 2016
2017 return if $self->{max_val} == $max;
2018
1664 $self->{max_val} = $max; 2019 $self->{max_val} = $max;
2020 $self->update;
1665} 2021}
1666 2022
1667sub set_value { 2023sub set_value {
1668 my ($self, $val, $max) = @_; 2024 my ($self, $val, $max) = @_;
1669 2025
1670 $self->set_max ($max) 2026 $self->set_max ($max)
1671 if defined $max; 2027 if defined $max;
1672 2028
1673 $max = $self->{max_val}; 2029 return if $self->{val} == $val;
2030
1674 $self->{val} = $val; 2031 $self->{val} = $val;
1675
1676 $self->update; 2032 $self->update;
1677} 2033}
1678 2034
1679sub _draw { 2035sub _draw {
1680 my ($self) = @_; 2036 my ($self) = @_;
… …
1743 2099
1744sub new { 2100sub new {
1745 my ($class, %arg) = @_; 2101 my ($class, %arg) = @_;
1746 2102
1747 my $self = $class->SUPER::new ( 2103 my $self = $class->SUPER::new (
1748 tooltip => $arg{type}, 2104 tooltip => $arg{type},
2105 can_hover => 1,
2106 can_events => 1,
1749 %arg, 2107 %arg,
1750 ); 2108 );
1751 2109
1752 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 2110 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1753 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 2111 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1754 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 2112 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1755 2113
1756 $self 2114 $self
1757} 2115}
1758 2116
1759sub set_fontsize { 2117sub set_fontsize {
… …
1761 2119
1762 $self->{value}->set_fontsize ($fsize); 2120 $self->{value}->set_fontsize ($fsize);
1763 $self->{max} ->set_fontsize ($fsize); 2121 $self->{max} ->set_fontsize ($fsize);
1764} 2122}
1765 2123
2124sub set_max {
2125 my ($self, $max) = @_;
2126
2127 $self->{gauge}->set_max ($max);
2128 $self->{max}->set_text ($max);
2129}
2130
1766sub set_value { 2131sub set_value {
1767 my ($self, $val, $max) = @_; 2132 my ($self, $val, $max) = @_;
1768 2133
1769 $self->set_max ($max) 2134 $self->set_max ($max)
1770 if defined $max; 2135 if defined $max;
1771 2136
1772 $self->{gauge}->set_value ($val, $max); 2137 $self->{gauge}->set_value ($val, $max);
1773 $self->{value}->set_text ($val); 2138 $self->{value}->set_text ($val);
1774}
1775
1776sub set_max {
1777 my ($self, $max) = @_;
1778
1779 $self->{gauge}->set_max ($max);
1780 $self->{max}->set_text ($max);
1781} 2139}
1782 2140
1783############################################################################# 2141#############################################################################
1784 2142
1785package CFClient::UI::Slider; 2143package CFClient::UI::Slider;
… …
1795 qw(s1_slider.png s1_slider_bg.png); 2153 qw(s1_slider.png s1_slider_bg.png);
1796 2154
1797sub new { 2155sub new {
1798 my $class = shift; 2156 my $class = shift;
1799 2157
1800 # range [value, low, high, page] 2158 # range [value, low, high, page, unit]
1801 2159
1802 # TODO: 0-width page 2160 # TODO: 0-width page
1803 # TODO: req_w/h are wrong with vertical 2161 # TODO: req_w/h are wrong with vertical
1804 # TODO: calculations are off 2162 # TODO: calculations are off
1805 my $self = $class->SUPER::new ( 2163 my $self = $class->SUPER::new (
1806 fg => [1, 1, 1], 2164 fg => [1, 1, 1],
1807 active_fg => [0, 0, 0], 2165 active_fg => [0, 0, 0],
2166 bg => [0, 0, 0, 0.2],
2167 active_bg => [1, 1, 1, 0.5],
1808 range => [0, 0, 100, 10], 2168 range => [0, 0, 100, 10, 0],
1809 req_w => 20, 2169 req_w => $::WIDTH / 80,
1810 req_h => 20, 2170 req_h => $::WIDTH / 80,
1811 vertical => 0, 2171 vertical => 0,
1812 can_hover => 1, 2172 can_hover => 1,
1813 inner_pad => 5, 2173 inner_pad => 0.02,
1814 @_ 2174 @_
1815 ); 2175 );
1816 2176
2177 $self->set_value ($self->{range}[0]);
2178 $self->update;
2179
1817 $self 2180 $self
2181}
2182
2183sub changed { }
2184
2185sub set_range {
2186 my ($self, $range) = @_;
2187
2188 ($range, $self->{range}) = ($self->{range}, $range);
2189
2190 $self->update
2191 if "@$range" ne "@{$self->{range}}";
2192}
2193
2194sub set_value {
2195 my ($self, $value) = @_;
2196
2197 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2198
2199 $hi = $lo + 1 if $hi <= $lo;
2200
2201 $page = $hi - $lo if $page > $hi - $lo;
2202
2203 $value = $lo if $value < $lo;
2204 $value = $hi - $page if $value > $hi - $page;
2205
2206 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2207 if $unit;
2208
2209 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2210
2211 if ($value != $old_value) {
2212 $self->_emit (changed => $value);
2213 $self->update;
2214 }
1818} 2215}
1819 2216
1820sub size_request { 2217sub size_request {
1821 my ($self) = @_; 2218 my ($self) = @_;
1822 2219
… …
1828 2225
1829sub button_down { 2226sub button_down {
1830 my ($self, $ev, $x, $y) = @_; 2227 my ($self, $ev, $x, $y) = @_;
1831 2228
1832 $self->SUPER::button_down ($ev, $x, $y); 2229 $self->SUPER::button_down ($ev, $x, $y);
2230
2231 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2232
1833 $self->mouse_motion ($ev, $x, $y); 2233 $self->mouse_motion ($ev, $x, $y);
1834} 2234}
1835 2235
1836sub mouse_motion { 2236sub mouse_motion {
1837 my ($self, $ev, $x, $y) = @_; 2237 my ($self, $ev, $x, $y) = @_;
1838 2238
1839 if ($GRAB == $self) { 2239 if ($GRAB == $self) {
2240 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2241
2242 my (undef, $lo, $hi, $page) = @{$self->{range}};
2243
2244 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2245
2246 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2247 }
2248}
2249
2250sub update {
2251 my ($self) = @_;
2252
2253 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2254 $self->set_value ($self->{range}[0]);
2255
1840 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2256 my ($value, $lo, $hi, $page) = @{$self->{range}};
2257 my $range = ($hi - $page - $lo) || 1e-100;
1841 2258
1842 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2259 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1843 2260
1844 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2261 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1845 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2262 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1846 2263
1847 $x -= $inner_pad_px; # substract the padding 2264 $value = ($value - $lo) / $range;
1848 $x = $x * ($hi - $lo) / $inner_w + $lo; 2265 $value = $value * $self->{scale} + $self->{offset};
1849 $x = $lo if $x < $lo;
1850 $x = $hi - $page if $x > $hi - $page;
1851 $self->{range}[0] = $x;
1852 2266
1853 $self->emit (changed => $x); 2267 $self->{knob_x} = $value - $knob_w * 0.5;
1854 $self->update; 2268 $self->{knob_w} = $knob_w;
1855 } 2269 });
1856}
1857 2270
1858# the inner_* stuff is for generating a padding for the slider handle, 2271 $self->SUPER::update;
1859# so that the handle doesn't leave the texture. This calculation isn't 100%
1860# correct propably, but it does the job for now
1861sub _calc_inner_pad_px {
1862 my ($self, $w) = @_;
1863 ($w / 100) * $self->{inner_pad} # % to pixels
1864} 2272}
1865 2273
1866sub _draw { 2274sub _draw {
1867 my ($self) = @_; 2275 my ($self) = @_;
1868 2276
1869 $self->SUPER::_draw (); 2277 $self->SUPER::_draw ();
1870 2278
1871 my ($w, $h) = @$self{qw(w h)}; 2279 glScale $self->{w}, $self->{h};
1872 2280
1873 if ($self->{vertical}) { 2281 if ($self->{vertical}) {
1874 # draw a vertical slider like a rotated horizontal slider 2282 # draw a vertical slider like a rotated horizontal slider
1875 2283
2284 glTranslate 1, 0, 0;
1876 glRotate 90, 0, 0, 1; 2285 glRotate 90, 0, 0, 1;
1877 glTranslate 0, -$self->{w}, 0;
1878
1879 ($w, $h) = ($h, $w);
1880 } 2286 }
1881 2287
1882 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2288 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1883 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2289 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1884 2290
1885 my ($value, $lo, $hi, $page) = @{$self->{range}};
1886
1887 $hi = $value + 1 if $lo == $hi;
1888
1889 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1890 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1891
1892 $page = int $page * $inner_w / ($hi - $lo);
1893 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1894
1895 $w -= $page;
1896 $page &= ~1;
1897 glTranslate $page * 0.5, 0, 0;
1898 $page ||= 2;
1899
1900 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1901 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1902
1903 glEnable GL_BLEND;
1904 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1905 glEnable GL_TEXTURE_2D; 2291 glEnable GL_TEXTURE_2D;
1906 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2292 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1907 2293
1908 # draw background 2294 # draw background
1909 $tex[1]->draw_quad (0, 0, $w, $h); 2295 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1910 2296
1911 # draw handle 2297 # draw handle
1912 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2298 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1913 2299
1914 glDisable GL_BLEND;
1915 glDisable GL_TEXTURE_2D; 2300 glDisable GL_TEXTURE_2D;
1916} 2301}
2302
2303#############################################################################
2304
2305package CFClient::UI::ValSlider;
2306
2307our @ISA = CFClient::UI::HBox::;
2308
2309sub new {
2310 my ($class, %arg) = @_;
2311
2312 my $range = delete $arg{range};
2313
2314 my $self = $class->SUPER::new (
2315 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2316 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2317 to_value => sub { shift },
2318 from_value => sub { shift },
2319 %arg,
2320 );
2321
2322 $self->{slider}->connect (changed => sub {
2323 my ($self, $value) = @_;
2324 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2325 $self->{parent}->emit (changed => $value);
2326 });
2327
2328# $self->{entry}->connect (changed => sub {
2329# my ($self, $value) = @_;
2330# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2331# $self->{parent}->emit (changed => $value);
2332# });
2333
2334 $self->add ($self->{slider}, $self->{entry});
2335
2336 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2337
2338 $self
2339}
2340
2341sub set_range { shift->{slider}->set_range (@_) }
2342sub set_value { shift->{slider}->set_value (@_) }
1917 2343
1918############################################################################# 2344#############################################################################
1919 2345
1920package CFClient::UI::TextView; 2346package CFClient::UI::TextView;
1921 2347
… …
1925 2351
1926sub new { 2352sub new {
1927 my $class = shift; 2353 my $class = shift;
1928 2354
1929 my $self = $class->SUPER::new ( 2355 my $self = $class->SUPER::new (
1930 fontsize => 1, 2356 fontsize => 1,
2357 can_events => 0,
1931 #font => default_font 2358 #font => default_font
1932 @_, 2359 @_,
1933 2360
1934 layout => (new CFClient::Layout), 2361 layout => (new CFClient::Layout 1),
1935 par => [], 2362 par => [],
1936 height => 0, 2363 height => 0,
1937 children => [ 2364 children => [
1938 (new CFClient::UI::Empty expand => 1), 2365 (new CFClient::UI::Empty expand => 1),
1939 (new CFClient::UI::Slider vertical => 1), 2366 (new CFClient::UI::Slider vertical => 1),
1940 ], 2367 ],
1941 ); 2368 );
1942 2369
1943 $self->{children}[1]->connect (changed => sub { 2370 $self->{children}[1]->connect (changed => sub { $self->update });
1944 $self->update;
1945 });
1946 2371
1947 $self 2372 $self
1948} 2373}
1949 2374
1950sub set_fontsize { 2375sub set_fontsize {
… …
1952 2377
1953 $self->{fontsize} = $fontsize; 2378 $self->{fontsize} = $fontsize;
1954 $self->reflow; 2379 $self->reflow;
1955} 2380}
1956 2381
1957sub text_height {
1958 my ($self, $text) = @_;
1959
1960 my $layout = $self->{layout};
1961
1962 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1963 $layout->set_width ($self->{w});
1964 $layout->set_text ($text);
1965
1966 ($layout->size)[1]
1967}
1968
1969sub reflow {
1970 my ($self) = @_;
1971
1972 $self->{need_reflow}++;
1973 $self->update;
1974}
1975
1976sub size_allocate { 2382sub size_allocate {
1977 my ($self, $w, $h) = @_; 2383 my ($self, $w, $h, $changed) = @_;
1978 2384
1979 $self->SUPER::size_allocate ($w, $h); 2385 $self->SUPER::size_allocate ($w, $h, $changed);
2386
2387 return unless $changed;
1980 2388
1981 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2389 $self->{layout}->set_font ($self->{font}) if $self->{font};
1982 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1983 $self->{layout}->set_width ($self->{children}[0]{w}); 2391 $self->{layout}->set_width ($self->{children}[0]{w});
1984 2392
1985 $self->reflow; 2393 $self->reflow;
1986} 2394}
1987 2395
2396sub text_size {
2397 my ($self, $text, $indent) = @_;
2398
2399 my $layout = $self->{layout};
2400
2401 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2402 $layout->set_width ($self->{children}[0]{w} - $indent);
2403 $layout->set_markup ($text);
2404
2405 $layout->size
2406}
2407
2408sub reflow {
2409 my ($self) = @_;
2410
2411 $self->{need_reflow}++;
2412 $self->update;
2413}
2414
2415sub set_offset {
2416 my ($self, $offset) = @_;
2417
2418 # todo: base offset on lines or so, not on pixels
2419 $self->{children}[1]->set_value ($offset);
2420}
2421
2422sub clear {
2423 my ($self) = @_;
2424
2425 $self->{par} = [];
2426 $self->{height} = 0;
2427 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2428}
2429
1988sub add_paragraph { 2430sub add_paragraph {
1989 my ($self, $color, $text) = @_; 2431 my ($self, $color, $text, $indent) = @_;
1990 2432
1991 #TODO: intelligently "reformat" paragraph 2433 for my $line (split /\n/, $text) {
1992 2434 my ($w, $h) = $self->text_size ($line);
1993 my $height = $self->text_height ($text);
1994
1995 $self->{height} += $height; 2435 $self->{height} += $h;
2436 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2437 }
1996 2438
1997 push @{$self->{par}}, [$height, $color, $text];
1998
1999 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2439 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2000 $self->{children}[1]->update;
2001} 2440}
2002 2441
2003sub update { 2442sub update {
2004 my ($self) = @_; 2443 my ($self) = @_;
2005 2444
… …
2007 2446
2008 return unless $self->{h} > 0; 2447 return unless $self->{h} > 0;
2009 2448
2010 delete $self->{texture}; 2449 delete $self->{texture};
2011 2450
2012 $ROOT->on_refresh ($self, sub { 2451 $ROOT->on_post_alloc ($self, sub {
2452 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2453
2013 if (delete $self->{need_reflow}) { 2454 if (delete $self->{need_reflow}) {
2014 my $height = 0; 2455 my $height = 0;
2015 2456
2016 $height += $_->[0] = $self->text_height ($_->[2]) 2457 my $layout = $self->{layout};
2458
2459 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2460
2017 for @{$self->{par}}; 2461 for (@{$self->{par}}) {
2462 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2463 $layout->set_width ($W - $_->[3]);
2464 $layout->set_markup ($_->[4]);
2465 my ($w, $h) = $layout->size;
2466 $_->[0] = $w + $_->[3];
2467 $_->[1] = $h;
2468 }
2469
2470 $height += $_->[1];
2471 }
2018 2472
2019 $self->{height} = $height; 2473 $self->{height} = $height;
2020 2474
2021 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2475 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2022 2476
2023 delete $self->{texture}; 2477 delete $self->{texture};
2024 } 2478 }
2025 2479
2026 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2480 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2027 glClearColor 0, 0, 0, 1; 2481 glClearColor 0.5, 0.5, 0.5, 0;
2028 glClear GL_COLOR_BUFFER_BIT; 2482 glClear GL_COLOR_BUFFER_BIT;
2029 2483
2484 my $top = int $self->{children}[1]{range}[0];
2485
2486 my $y0 = $top;
2487 my $y1 = $top + $H;
2488
2489 my $y = 0;
2490
2491 my $layout = $self->{layout};
2492
2493 $layout->set_font ($self->{font}) if $self->{font};
2494
2030 glEnable GL_BLEND; 2495 glEnable GL_BLEND;
2496 #TODO# not correct in windows where rgba is forced off
2031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2497 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2032 glEnable GL_TEXTURE_2D;
2033 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2034
2035 my $top = int $self->{children}[1]{range}[0];
2036
2037 my $y0 = $top;
2038 my $y1 = $top + $self->{h};
2039
2040 my $y = 0;
2041
2042 my $layout = $self->{layout};
2043
2044 $layout->set_font ($self->{font}) if $self->{font};
2045 2498
2046 for my $par (@{$self->{par}}) { 2499 for my $par (@{$self->{par}}) {
2047 my $h = $par->[0]; 2500 my $h = $par->[1];
2048 2501
2049 if ($y0 < $y + $h && $y < $y1) { 2502 if ($y0 < $y + $h && $y < $y1) {
2503 $layout->set_foreground (@{ $par->[2] });
2504 $layout->set_width ($W - $par->[3]);
2050 $layout->set_text ($par->[2]); 2505 $layout->set_markup ($par->[4]);
2051 2506
2052 glColor @{ $par->[1] }; 2507 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2053 my ($W, $H) = $layout->size; 2508
2054 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2509 glRasterPos $par->[3], $y - $y0;
2510 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2055 } 2511 }
2056 2512
2057 $y += $h; 2513 $y += $h;
2058 } 2514 }
2059 2515
2060 glDisable GL_TEXTURE_2D;
2061 glDisable GL_BLEND; 2516 glDisable GL_BLEND;
2062 }; 2517 };
2063 }); 2518 });
2064} 2519}
2065 2520
2066sub _draw { 2521sub _draw {
2067 my ($self) = @_; 2522 my ($self) = @_;
2068 2523
2069 if ($self->{texture}) {
2070 glEnable GL_TEXTURE_2D; 2524 glEnable GL_TEXTURE_2D;
2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2526 glColor 1, 1, 1, 1;
2072 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2527 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2073 glDisable GL_TEXTURE_2D; 2528 glDisable GL_TEXTURE_2D;
2074 }
2075 2529
2076 $self->{children}[1]->draw; 2530 $self->{children}[1]->draw;
2077 2531
2078} 2532}
2079 2533
… …
2127 2581
2128sub new { 2582sub new {
2129 my $class = shift; 2583 my $class = shift;
2130 2584
2131 my $self = $class->SUPER::new ( 2585 my $self = $class->SUPER::new (
2132 state => 0, 2586 state => 0,
2133 connect_activate => \&toggle_flopper, 2587 on_activate => \&toggle_flopper,
2134 can_events => 1,
2135 @_ 2588 @_
2136 ); 2589 );
2137 2590
2138 if ($self->{state}) {
2139 $self->{state} = 0;
2140 $self->toggle_flopper;
2141 }
2142
2143 $self 2591 $self
2144} 2592}
2145 2593
2146sub toggle_flopper { 2594sub toggle_flopper {
2147 my ($self) = @_; 2595 my ($self) = @_;
2148 2596
2149 # TODO: use animation 2597 $self->{other}->toggle_visibility;
2150 if ($self->{state} = !$self->{state}) {
2151 $CFClient::UI::ROOT->add ($self->{other});
2152 $self->{other}->move ($self->coord2global (0, $self->{h}));
2153 $self->emit ("open");
2154 } else {
2155 $CFClient::UI::ROOT->remove ($self->{other});
2156 $self->emit ("close");
2157 }
2158
2159 $self->emit (changed => $self->{state});
2160} 2598}
2161 2599
2162############################################################################# 2600#############################################################################
2163 2601
2164package CFClient::UI::Tooltip; 2602package CFClient::UI::Tooltip;
… …
2174 @_, 2612 @_,
2175 can_events => 0, 2613 can_events => 0,
2176 ) 2614 )
2177} 2615}
2178 2616
2179sub set_text { 2617sub set_tooltip_from {
2180 my ($self, $text) = @_; 2618 my ($self, $widget) = @_;
2181 2619
2182 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2620 $self->add (new CFClient::UI::Label
2183 $self->{label}->set_text ($text); 2621 markup => $widget->{tooltip},
2184 $self->add ($self->{label}); 2622 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2623 fontsize => 0.8,
2624 fg => [0, 0, 0, 1],
2625 ellipsise => 0,
2626 font => ($widget->{tooltip_font} || $::FONT_PROP),
2627 );
2185} 2628}
2186 2629
2187sub size_request { 2630sub size_request {
2188 my ($self) = @_; 2631 my ($self) = @_;
2189 2632
2190 $self->child->set_max_size ($::WIDTH * 0.2);
2191
2192 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2633 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2193 2634
2194 ($w + 4, $h + 4) 2635 ($w + 4, $h + 4)
2195} 2636}
2196 2637
2638sub size_allocate {
2639 my ($self, $w, $h, $changed) = @_;
2640
2641 return unless $changed;
2642
2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2644}
2645
2646sub visibility_change {
2647 my ($self, $visible) = @_;
2648
2649 return unless $visible;
2650
2651 $self->{root}->on_post_alloc ("move_$self" => sub {
2652 my $widget = $self->{owner}
2653 or return;
2654
2655 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2656
2657 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2658 if $x + $self->{w} > $::WIDTH;
2659
2660 $self->move_abs ($x, $y);
2661 });
2662}
2663
2197sub _draw { 2664sub _draw {
2198 my ($self) = @_; 2665 my ($self) = @_;
2199 2666
2200 glPushMatrix;
2201 glTranslate 0.375, 0.375; 2667 glTranslate 0.375, 0.375;
2202 2668
2203 my ($w, $h) = @$self{qw(w h)}; 2669 my ($w, $h) = @$self{qw(w h)};
2204 2670
2205 glColor 1, 0.8, 0.4; 2671 glColor 1, 0.8, 0.4;
… …
2216 glVertex 0 , $h; 2682 glVertex 0 , $h;
2217 glVertex $w, $h; 2683 glVertex $w, $h;
2218 glVertex $w, 0; 2684 glVertex $w, 0;
2219 glEnd; 2685 glEnd;
2220 2686
2221 glPopMatrix; 2687 glTranslate 2 - 0.375, 2 - 0.375;
2222 2688
2223 glTranslate 2, 2;
2224 $self->SUPER::_draw; 2689 $self->SUPER::_draw;
2225} 2690}
2226 2691
2227############################################################################# 2692#############################################################################
2228 2693
2694package CFClient::UI::Face;
2695
2696our @ISA = CFClient::UI::Base::;
2697
2698use CFClient::OpenGL;
2699
2700sub new {
2701 my $class = shift;
2702
2703 my $self = $class->SUPER::new (
2704 aspect => 1,
2705 can_events => 0,
2706 @_,
2707 );
2708
2709 if ($self->{anim} && $self->{animspeed}) {
2710 Scalar::Util::weaken (my $widget = $self);
2711
2712 $self->{timer} = Event->timer (
2713 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2714 hard => 1,
2715 interval => $self->{animspeed},
2716 cb => sub {
2717 ++$widget->{frame};
2718 $widget->update;
2719 },
2720 );
2721 }
2722
2723 $self
2724}
2725
2726sub size_request {
2727 (32, 8)
2728}
2729
2730sub update {
2731 my ($self) = @_;
2732
2733 return unless $self->{visible};
2734
2735 $self->SUPER::update;
2736}
2737
2738sub _draw {
2739 my ($self) = @_;
2740
2741 return unless $::CONN;
2742
2743 my $face;
2744
2745 if ($self->{frame}) {
2746 my $anim = $::CONN->{anim}[$self->{anim}];
2747
2748 $face = $anim->[ $self->{frame} % @$anim ]
2749 if $anim && @$anim;
2750 }
2751
2752 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2753
2754 if ($tex) {
2755 glEnable GL_TEXTURE_2D;
2756 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2757 glColor 1, 1, 1, 1;
2758 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2759 glDisable GL_TEXTURE_2D;
2760 }
2761}
2762
2763sub DESTROY {
2764 my ($self) = @_;
2765
2766 $self->{timer}->cancel
2767 if $self->{timer};
2768
2769 $self->SUPER::DESTROY;
2770}
2771
2772#############################################################################
2773
2774package CFClient::UI::Inventory;
2775
2776our @ISA = CFClient::UI::ScrolledWindow::;
2777
2778sub new {
2779 my $class = shift;
2780
2781 my $self = $class->SUPER::new (
2782 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2783 @_,
2784 );
2785
2786 $self
2787}
2788
2789sub set_items {
2790 my ($self, $items) = @_;
2791
2792 $self->{scrolled}->clear;
2793 return unless $items;
2794
2795 my @items = sort {
2796 ($a->{type} <=> $b->{type})
2797 or ($a->{name} cmp $b->{name})
2798 } @$items;
2799
2800 $self->{real_items} = \@items;
2801
2802 my $row = 0;
2803 for my $item (@items) {
2804 CFClient::Item::update_widgets $item;
2805
2806 $self->{scrolled}->add (0, $row, $item->{face_widget});
2807 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2808 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2809
2810 $row++;
2811 }
2812}
2813
2814#############################################################################
2815
2816package CFClient::UI::Menu;
2817
2818our @ISA = CFClient::UI::FancyFrame::;
2819
2820use CFClient::OpenGL;
2821
2822sub new {
2823 my $class = shift;
2824
2825 my $self = $class->SUPER::new (
2826 items => [],
2827 z => 100,
2828 @_,
2829 );
2830
2831 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2832
2833 for my $item (@{ $self->{items} }) {
2834 my ($widget, $cb) = @$item;
2835
2836 # handle various types of items, only text for now
2837 if (!ref $widget) {
2838 $widget = new CFClient::UI::Label
2839 can_hover => 1,
2840 can_events => 1,
2841 text => $widget;
2842 }
2843
2844 $self->{item}{$widget} = $item;
2845
2846 $self->{vbox}->add ($widget);
2847 }
2848
2849 $self
2850}
2851
2852# popup given the event (must be a mouse button down event currently)
2853sub popup {
2854 my ($self, $ev) = @_;
2855
2856 $self->_emit ("popdown");
2857
2858 # maybe save $GRAB? must be careful about events...
2859 $GRAB = $self;
2860 $self->{button} = $ev->{button};
2861
2862 $self->show;
2863 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2864}
2865
2866sub mouse_motion {
2867 my ($self, $ev, $x, $y) = @_;
2868
2869 # TODO: should use vbox->find_widget or so
2870 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2871 $self->{hover} = $self->{item}{$HOVER};
2872}
2873
2874sub button_up {
2875 my ($self, $ev, $x, $y) = @_;
2876
2877 if ($ev->{button} == $self->{button}) {
2878 undef $GRAB;
2879 $self->hide;
2880
2881 $self->_emit ("popdown");
2882 $self->{hover}[1]->() if $self->{hover};
2883 }
2884}
2885
2886#############################################################################
2887
2888package CFClient::UI::Statusbox;
2889
2890our @ISA = CFClient::UI::VBox::;
2891
2892sub new {
2893 my $class = shift;
2894
2895 $class->SUPER::new (
2896 fontsize => 0.8,
2897 @_,
2898 )
2899}
2900
2901sub reorder {
2902 my ($self) = @_;
2903 my $NOW = time;
2904
2905 while (my ($k, $v) = each %{ $self->{item} }) {
2906 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2907 }
2908
2909 my @widgets;
2910
2911 my @items = sort {
2912 $a->{pri} <=> $b->{pri}
2913 or $b->{id} <=> $a->{id}
2914 } values %{ $self->{item} };
2915
2916 my $count = 10 + 1;
2917 for my $item (@items) {
2918 last unless --$count;
2919
2920 push @widgets, $item->{label} ||= do {
2921 # TODO: doesn't handle markup well (read as: at all)
2922 my $short = $item->{count} > 1
2923 ? "<b>$item->{count} ×</b> $item->{text}"
2924 : $item->{text};
2925
2926 for ($short) {
2927 s/^\s+//;
2928 s/\s+/ /g;
2929 }
2930
2931 new CFClient::UI::Label
2932 markup => $short,
2933 tooltip => $item->{tooltip},
2934 tooltip_font => $::FONT_PROP,
2935 tooltip_width => 0.67,
2936 fontsize => $item->{fontsize} || $self->{fontsize},
2937 max_w => $::WIDTH * 0.44,
2938 fg => $item->{fg},
2939 can_events => 1,
2940 can_hover => 1
2941 };
2942 }
2943
2944 $self->clear;
2945 $self->SUPER::add (reverse @widgets);
2946}
2947
2948sub add {
2949 my ($self, $text, %arg) = @_;
2950
2951 $text =~ s/^\s+//;
2952 $text =~ s/\s+$//;
2953
2954 return unless $text;
2955
2956 my $timeout = time + ((delete $arg{timeout}) || 60);
2957
2958 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2959
2960 if (my $item = $self->{item}{$group}) {
2961 if ($item->{text} eq $text) {
2962 $item->{count}++;
2963 } else {
2964 $item->{count} = 1;
2965 $item->{text} = $item->{tooltip} = $text;
2966 }
2967 $item->{id} = ++$self->{id};
2968 $item->{timeout} = $timeout;
2969 delete $item->{label};
2970 } else {
2971 $self->{item}{$group} = {
2972 id => ++$self->{id},
2973 text => $text,
2974 timeout => $timeout,
2975 tooltip => $text,
2976 fg => [0.8, 0.8, 0.8, 0.8],
2977 pri => 0,
2978 count => 1,
2979 %arg,
2980 };
2981 }
2982
2983 $self->reorder;
2984}
2985
2986sub reconfigure {
2987 my ($self) = @_;
2988
2989 delete $_->{label}
2990 for values %{ $self->{item} || {} };
2991
2992 $self->reorder;
2993 $self->SUPER::reconfigure;
2994}
2995
2996#############################################################################
2997
2229package CFClient::UI::Root; 2998package CFClient::UI::Root;
2230 2999
2231our @ISA = CFClient::UI::Container::; 3000our @ISA = CFClient::UI::Container::;
2232 3001
2233use CFClient::OpenGL; 3002use CFClient::OpenGL;
2234 3003
2235sub check_size { 3004sub new {
2236 my ($self) = @_; 3005 my $class = shift;
2237 3006
2238 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3007 my $self = $class->SUPER::new (
2239} 3008 visible => 1,
3009 @_,
3010 );
2240 3011
2241sub size_request { 3012 Scalar::Util::weaken ($self->{root} = $self);
2242 ($::WIDTH, $::HEIGHT) 3013
3014 $self
2243} 3015}
2244 3016
2245sub configure { 3017sub configure {
2246 my ($self, $x, $y, $w, $h) = @_; 3018 my ($self, $x, $y, $w, $h) = @_;
2247 3019
2248 $self->SUPER::configure ($x, $y, $w, $h); 3020 $self->{w} = $w;
3021 $self->{h} = $h;
3022}
2249 3023
3024sub reconfigure {
3025 my ($self) = @_;
3026
3027 $self->SUPER::reconfigure;
3028
3029 $self->size_allocate ($self->{w}, $self->{h}, 1)
3030 if $self->{w};
3031}
3032
3033sub size_request {
3034 my ($self) = @_;
3035
3036 ($self->{w}, $self->{h})
3037}
3038
3039sub _to_pixel {
3040 my ($coord, $size, $max) = @_;
3041
3042 $coord =
3043 $coord eq "center" ? ($max - $size) * 0.5
3044 : $coord eq "max" ? $max
3045 : $coord;
3046
3047 $coord = 0 if $coord < 0;
3048 $coord = $max - $size if $coord > $max - $size;
3049
3050 int $coord + 0.5
3051}
3052
3053sub size_allocate {
3054 my ($self, $w, $h, $changed) = @_;
3055
2250 for my $child (@{$self->{children}}) { 3056 for my $child ($self->children) {
2251 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3057 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2252 3058
2253 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3059 $X = $child->{force_x} if exists $child->{force_x};
2254 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3060 $Y = $child->{force_y} if exists $child->{force_y};
3061
3062 $X = _to_pixel $X, $W, $self->{w};
3063 $Y = _to_pixel $Y, $H, $self->{h};
3064
2255 $child->configure ($X, $Y, $W,$H); 3065 $child->configure ($X, $Y, $W, $H);
2256 } 3066 }
2257} 3067}
2258 3068
2259sub _topleft { 3069sub coord2local {
2260 my ($self, $x, $y) = @_; 3070 my ($self, $x, $y) = @_;
2261 3071
2262 ($x, $y) 3072 ($x, $y)
2263} 3073}
2264 3074
3075sub coord2global {
3076 my ($self, $x, $y) = @_;
3077
3078 ($x, $y)
3079}
3080
2265sub update { 3081sub update {
2266 my ($self) = @_; 3082 my ($self) = @_;
2267 3083
2268 $self->check_size; 3084 $::WANT_REFRESH++;
2269 ::refresh ();
2270} 3085}
2271 3086
2272sub add { 3087sub add {
2273 my ($self, $child) = @_; 3088 my ($self, @children) = @_;
2274 3089
2275 # integerize window positions 3090 $_->{is_toplevel} = 1
2276 $child->{x} = int $child->{x}; 3091 for @children;
2277 $child->{y} = int $child->{y};
2278 3092
2279 $self->SUPER::add ($child); 3093 $self->SUPER::add (@children);
3094}
3095
3096sub remove {
3097 my ($self, @children) = @_;
3098
3099 $self->SUPER::remove (@children);
3100
3101 delete $self->{is_toplevel}
3102 for @children;
3103
3104 while (@children) {
3105 my $w = pop @children;
3106 push @children, $w->children;
3107 $w->set_invisible;
3108 }
2280} 3109}
2281 3110
2282sub on_refresh { 3111sub on_refresh {
2283 my ($self, $id, $cb) = @_; 3112 my ($self, $id, $cb) = @_;
2284 3113
2285 $self->{refresh_hook}{$id} = $cb; 3114 $self->{refresh_hook}{$id} = $cb;
2286} 3115}
2287 3116
3117sub on_post_alloc {
3118 my ($self, $id, $cb) = @_;
3119
3120 $self->{post_alloc_hook}{$id} = $cb;
3121}
3122
2288sub draw { 3123sub draw {
2289 my ($self) = @_; 3124 my ($self) = @_;
2290 3125
2291 while (my $rcb = delete $self->{refresh_hook}) { 3126 while ($self->{refresh_hook}) {
2292 $_->() for values %$rcb; 3127 $_->()
3128 for values %{delete $self->{refresh_hook}};
3129 }
3130
3131 if ($self->{realloc}) {
3132 my @queue;
3133
3134 while () {
3135 if ($self->{realloc}) {
3136 #TODO use array-of-depth approach
3137
3138 @queue = sort { $a->{visible} <=> $b->{visible} }
3139 @queue, values %{delete $self->{realloc}};
3140 }
3141
3142 my $widget = pop @queue || last;
3143
3144 $widget->{visible} or last; # do not resize invisible widgets
3145
3146 my ($w, $h) = exists $widget->{force_w} && exists $widget->{force_h}
3147 ? @$widget{qw(force_w force_h)}
3148 : $widget->size_request;
3149
3150 my $min_size = $widget->{is_toplevel} ? 16 : 0;
3151
3152 $w = $min_size if $w < $min_size;
3153 $h = $min_size if $h < $min_size;
3154
3155 $widget->{req_w} = $w;
3156 $widget->{req_h} = $h;
3157
3158 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3159
3160 push @queue, $widget->{parent}
3161 if $widget->{parent};
3162 }
3163 }
3164
3165 while (my $size_alloc = delete $self->{size_alloc}) {
3166 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3167 values %$size_alloc;
3168
3169 while () {
3170 my ($widget, $w, $h) = @{ pop @queue or last };
3171
3172 $w = $widget->{w} || $widget->{req_w} unless defined $w;
3173 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3174
3175 $w = 0 if $w < 0;
3176 $h = 0 if $h < 0;
3177
3178 $w = int $w + 0.5;
3179 $h = int $h + 0.5;
3180
3181 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3182
3183 $widget->{w} = $w;
3184 $widget->{h} = $h;
3185
3186 $widget->emit (size_allocate => $w, $h, $changed);
3187 }
3188 }
3189
3190 while ($self->{post_alloc_hook}) {
3191 $_->()
3192 for values %{delete $self->{post_alloc_hook}};
2293 } 3193 }
2294 3194
2295 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3195 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2296 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3196 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2297 glClear GL_COLOR_BUFFER_BIT; 3197 glClear GL_COLOR_BUFFER_BIT;
2298 3198
2299 glMatrixMode GL_PROJECTION; 3199 glMatrixMode GL_PROJECTION;
2300 glLoadIdentity; 3200 glLoadIdentity;
2301 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3201 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2302 glMatrixMode GL_MODELVIEW; 3202 glMatrixMode GL_MODELVIEW;
2303 glLoadIdentity; 3203 glLoadIdentity;
2304 3204
2305 $self->_draw; 3205 $self->_draw;
2306} 3206}
… …
2308############################################################################# 3208#############################################################################
2309 3209
2310package CFClient::UI; 3210package CFClient::UI;
2311 3211
2312$ROOT = new CFClient::UI::Root; 3212$ROOT = new CFClient::UI::Root;
2313$TOOLTIP = new CFClient::UI::Tooltip; 3213$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2314 3214
23151 32151
2316 3216

Diff Legend

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