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.203 by root, Sun May 14 21:13:11 2006 UTC vs.
Revision 1.267 by root, Thu Jun 1 04:10:29 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
18 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 if ($x + $TOOLTIP->{w} > $::WIDTH) {
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
38 }
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 } 61 }
44 62
45 return; 63 return;
46 } 64 }
47 } 65 }
… …
51 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
52} 70}
53 71
54# class methods for events 72# class methods for events
55sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
56 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
57 if $FOCUS; 75 if $FOCUS;
58} 76}
59 77
60sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
61 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
62 if $FOCUS; 80 if $FOCUS;
63} 81}
64 82
65sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
66 my ($ev) = @_; 84 my ($ev) = @_;
… …
75 check_tooltip; 93 check_tooltip;
76 } 94 }
77 95
78 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
79 97
80 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
81 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
82 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
83 }
84} 100}
85 101
86sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
87 my ($ev) = @_; 103 my ($ev) = @_;
88 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
89 105
90 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
91 107
92 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
93 109
94 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
95 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
96 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
97 }
98 112
99 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
100 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
101 $grab->update if $grab; 115 $grab->update if $grab;
102 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
118 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
119 133
120 check_tooltip; 134 check_tooltip;
121 } 135 }
122 136
123 if ($HOVER) {
124 ($x, $y) = $HOVER->coord2local ($x, $y);
125 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
126 } 138 if $HOVER;
127} 139}
128 140
129# convert position array to integers 141# convert position array to integers
130sub harmonize { 142sub harmonize {
131 my ($vals) = @_; 143 my ($vals) = @_;
… …
137 $rem += $_ - $i; 149 $rem += $_ - $i;
138 $_ = $i; 150 $_ = $i;
139 } 151 }
140} 152}
141 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
142# call when resolution changes etc. 170# call when resolution changes etc.
143sub rescale_widgets { 171sub rescale_widgets {
144 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
145 173
146 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
147 if ($widget->{toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
148 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
149 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
150 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
151 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
152 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
153 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
154 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
155 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
156 } 189 }
157
158 $widget->reconfigure;
159 } 190 }
191
192 reconfigure_widgets;
160} 193}
161 194
162############################################################################# 195#############################################################################
163 196
164package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
169 202
170sub new { 203sub new {
171 my $class = shift; 204 my $class = shift;
172 205
173 my $self = bless { 206 my $self = bless {
174 x => 0, 207 x => "center",
175 y => 0, 208 y => "center",
176 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
177 can_events => 1, 212 can_events => 1,
178 @_ 213 @_
179 }, $class; 214 }, $class;
180 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
181 for (keys %$self) { 218 for (keys %$self) {
182 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
183 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
184 } 221 }
185 } 222 }
186 223
187 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
188 235
189 $self 236 $self
190} 237}
191 238
192sub destroy { 239sub destroy {
… …
202 return if $self->{parent}; 249 return if $self->{parent};
203 250
204 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
205} 252}
206 253
207sub hide { 254sub set_visible {
208 my ($self) = @_; 255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
209 278
210 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
211 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
212 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
213 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
214 if $self->{parent}; 313 if $self->{parent};
215} 314}
216 315
217sub move { 316sub move_abs {
218 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
219 318
220 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
221 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
222 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
223 322
224 $self->update; 323 $self->update;
225} 324}
226 325
227sub set_size { 326sub set_size {
228 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
229 328
230 $self->{user_w} = $w; 329 $self->{force_w} = $w;
231 $self->{user_h} = $h; 330 $self->{force_h} = $h;
232 331
233 $self->check_size; 332 $self->realloc;
234} 333}
235 334
236sub size_request { 335sub size_request {
237 require Carp; 336 require Carp;
238 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
240 339
241sub configure { 340sub configure {
242 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
243 342
244 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
245 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
246 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
247 348
248 # use alignment to adjust x, y 349 # use alignment to adjust x, y
249 350
250 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
251 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
252
253 ($w, $h) = ($w2, $h2);
254 } 353 }
255 354
256 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
257 $self->{x} = $x; 356 $self->{x} = $x;
258 $self->{y} = $y; 357 $self->{y} = $y;
259 $self->update; 358 $self->update;
260 } 359 }
261 360
262 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
263 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
264 } 368 }
265} 369}
266 370
267sub size_allocate { 371sub size_allocate {
268 # nothing to be done 372 # nothing to be done
269} 373}
270 374
271sub reconfigure {
272 my ($self) = @_;
273
274 $self->check_size (1);
275 $self->update;
276}
277
278sub children { 375sub children {
279} 376}
280 377
281sub set_max_size { 378sub set_max_size {
282 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
283 380
284 delete $self->{max_w}; $self->{max_w} = $w if $w; 381 delete $self->{max_w}; $self->{max_w} = $w if $w;
285 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
383}
384
385sub set_tooltip {
386 my ($self, $tooltip) = @_;
387
388 $tooltip =~ s/^\s+//;
389 $tooltip =~ s/\s+$//;
390
391 return if $self->{tooltip} eq $tooltip;
392
393 $self->{tooltip} = $tooltip;
394
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip;
398 }
286} 399}
287 400
288# translate global coordinates to local coordinate system 401# translate global coordinates to local coordinate system
289sub coord2local { 402sub coord2local {
290 my ($self, $x, $y) = @_; 403 my ($self, $x, $y) = @_;
… …
305 return if $FOCUS == $self; 418 return if $FOCUS == $self;
306 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
307 420
308 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
309 422
310 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
311 424
312 $focus->update if $focus; 425 $focus->update if $focus;
313 $FOCUS->update; 426 $FOCUS->update;
314} 427}
315 428
… …
318 431
319 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
320 433
321 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
322 435
323 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
324 437
325 $focus->update if $focus; #? 438 $focus->update if $focus; #?
439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS;
326} 442}
327 443
328sub mouse_motion { } 444sub mouse_motion { }
329sub button_up { } 445sub button_up { }
330sub key_down { } 446sub key_down { }
331sub key_up { } 447sub key_up { }
332 448
333sub button_down { 449sub button_down {
334 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
335 451
336 $self->focus_in; 452 $self->focus_in;
337} 453}
338 454
339sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub find_widget {
340sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456 my ($self, $x, $y) = @_;
341sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457
342sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458 return () unless $self->{can_events};
343sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 459
460 return $self
461 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
462 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
463
464 ()
465}
466
467sub set_parent {
468 my ($self, $parent) = @_;
469
470 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495}
496
497sub realloc {
498 my ($self) = @_;
499
500 if ($self->{visible}) {
501 return if $self->{root}{realloc}{$self+0};
502
503 $self->{root}{realloc}{$self+0} = $self;
504 $self->{root}->update;
505 } else {
506 delete $self->{req_w};
507 delete $self->{req_h};
508 }
509}
510
511sub update {
512 my ($self) = @_;
513
514 $self->{parent}->update
515 if $self->{parent};
516}
517
518sub reconfigure {
519 my ($self) = @_;
520
521 $self->realloc;
522 $self->update;
523}
524
525# using global variables seems a bit hacky, but passing through all drawing
526# functions seems pointless.
527our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
344 528
345sub draw { 529sub draw {
346 my ($self) = @_; 530 my ($self) = @_;
347 531
348 return unless $self->{h} && $self->{w}; 532 return unless $self->{h} && $self->{w};
533
534 local $draw_x = $draw_x + $self->{x};
535 local $draw_y = $draw_y + $self->{y};
536
537 return if $draw_x + $self->{w} < 0;
538 return if $draw_x >= $draw_w;
539 return if $draw_y + $self->{h} < 0;
540 return if $draw_y >= $draw_h;
349 541
350 glPushMatrix; 542 glPushMatrix;
351 glTranslate $self->{x}, $self->{y}, 0; 543 glTranslate $self->{x}, $self->{y}, 0;
352 $self->_draw; 544 $self->_draw;
353 glPopMatrix; 545 glPopMatrix;
… …
365 glVertex $x , $y + $self->{h}; 557 glVertex $x , $y + $self->{h};
366 glEnd; 558 glEnd;
367 glDisable GL_BLEND; 559 glDisable GL_BLEND;
368 } 560 }
369 561
370 if ($ENV{PCLIENT_DEBUG}) { 562 if ($ENV{CFPLUS_DEBUG} & 1) {
371 glPushMatrix; 563 glPushMatrix;
372 glColor 1, 1, 0, 1; 564 glColor 1, 1, 0, 1;
373 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 565 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
374 glBegin GL_LINE_LOOP; 566 glBegin GL_LINE_LOOP;
375 glVertex 0 , 0; 567 glVertex 0 , 0;
376 glVertex $self->{w}, 0; 568 glVertex $self->{w} - 1, 0;
377 glVertex $self->{w}, $self->{h}; 569 glVertex $self->{w} - 1, $self->{h} - 1;
378 glVertex 0 , $self->{h}; 570 glVertex 0 , $self->{h} - 1;
379 glEnd; 571 glEnd;
380 glPopMatrix; 572 glPopMatrix;
381 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 573 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
382 } 574 }
383} 575}
384 576
385sub _draw { 577sub _draw {
386 my ($self) = @_; 578 my ($self) = @_;
387 579
388 warn "no draw defined for $self\n"; 580 warn "no draw defined for $self\n";
389}
390
391sub find_widget {
392 my ($self, $x, $y) = @_;
393
394 return () unless $self->{can_events};
395
396 return $self
397 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
398 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
399
400 ()
401}
402
403sub set_parent {
404 my ($self, $parent) = @_;
405
406 Scalar::Util::weaken ($self->{parent} = $parent);
407
408 # TODO: req_w _does_change after ->reconfigure
409 $self->check_size
410 unless exists $self->{req_w};
411}
412
413sub check_size {
414 my ($self, $forced) = @_;
415
416 $self->{force_alloc} = 1 if $forced;
417 $CFClient::UI::ROOT->{check_size}{$self} = $self;
418}
419
420sub update {
421 my ($self) = @_;
422
423 $self->{parent}->update
424 if $self->{parent};
425}
426
427sub connect {
428 my ($self, $signal, $cb) = @_;
429
430 push @{ $self->{signal_cb}{$signal} }, $cb;
431}
432
433sub emit {
434 my ($self, $signal, @args) = @_;
435
436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
437} 581}
438 582
439sub DESTROY { 583sub DESTROY {
440 my ($self) = @_; 584 my ($self) = @_;
441 585
… …
456 my $class = shift; 600 my $class = shift;
457 601
458 # range [value, low, high, page] 602 # range [value, low, high, page]
459 603
460 $class->SUPER::new ( 604 $class->SUPER::new (
461 bg => [0, 0, 0, 0.2], 605 #bg => [0, 0, 0, 0.2],
462 active_bg => [1, 1, 1, 0.5], 606 #active_bg => [1, 1, 1, 0.5],
463 @_ 607 @_
464 ) 608 )
465} 609}
466 610
467sub _draw { 611sub _draw {
468 my ($self) = @_; 612 my ($self) = @_;
469 613
614 my $color = $FOCUS == $self && $self->{active_bg}
615 ? $self->{active_bg}
616 : $self->{bg};
617
618 if ($color && (@$color < 4 || $color->[3])) {
470 my ($w, $h) = @$self{qw(w h)}; 619 my ($w, $h) = @$self{qw(w h)};
471 620
472 glEnable GL_BLEND; 621 glEnable GL_BLEND;
473 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
474 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 623 glColor @$color;
475 624
476 glBegin GL_QUADS; 625 glBegin GL_QUADS;
477 glVertex 0 , 0; 626 glVertex 0 , 0;
478 glVertex 0 , $h; 627 glVertex 0 , $h;
479 glVertex $w, $h; 628 glVertex $w, $h;
480 glVertex $w, 0; 629 glVertex $w, 0;
481 glEnd; 630 glEnd;
482 631
483 glDisable GL_BLEND; 632 glDisable GL_BLEND;
633 }
484} 634}
485 635
486############################################################################# 636#############################################################################
487 637
488package CFClient::UI::Empty; 638package CFClient::UI::Empty;
… …
493 my ($class, %arg) = @_; 643 my ($class, %arg) = @_;
494 $class->SUPER::new (can_events => 0, %arg); 644 $class->SUPER::new (can_events => 0, %arg);
495} 645}
496 646
497sub size_request { 647sub size_request {
498 (0, 0) 648 my ($self) = @_;
649
650 ($self->{w} + 0, $self->{h} + 0)
499} 651}
500 652
501sub draw { } 653sub draw { }
502 654
503############################################################################# 655#############################################################################
… …
532 $self->{children} = [ 684 $self->{children} = [
533 sort { $a->{z} <=> $b->{z} } 685 sort { $a->{z} <=> $b->{z} }
534 @{$self->{children}}, @widgets 686 @{$self->{children}}, @widgets
535 ]; 687 ];
536 688
537 $self->check_size (1); 689 $self->realloc;
538 $self->update;
539} 690}
540 691
541sub children { 692sub children {
542 @{ $_[0]{children} } 693 @{ $_[0]{children} }
543} 694}
… …
548 delete $child->{parent}; 699 delete $child->{parent};
549 $child->hide; 700 $child->hide;
550 701
551 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 702 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
552 703
553 $self->check_size; 704 $self->realloc;
554 $self->update;
555} 705}
556 706
557sub clear { 707sub clear {
558 my ($self) = @_; 708 my ($self) = @_;
559 709
… …
563 for (@$children) { 713 for (@$children) {
564 delete $_->{parent}; 714 delete $_->{parent};
565 $_->hide; 715 $_->hide;
566 } 716 }
567 717
568 $self->check_size; 718 $self->realloc;
569 $self->update;
570} 719}
571 720
572sub find_widget { 721sub find_widget {
573 my ($self, $x, $y) = @_; 722 my ($self, $x, $y) = @_;
574 723
… …
661 $self->SUPER::size_allocate ($w, $h); 810 $self->SUPER::size_allocate ($w, $h);
662 $self->update; 811 $self->update;
663} 812}
664 813
665sub _render { 814sub _render {
815 my ($self) = @_;
816
666 $_[0]{children}[0]->draw; 817 $self->{children}[0]->draw;
667} 818}
668 819
669sub render_child { 820sub render_child {
670 my ($self) = @_; 821 my ($self) = @_;
671 822
672 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 823 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
673 glClearColor 0, 0, 0, 0; 824 glClearColor 0, 0, 0, 0;
674 glClear GL_COLOR_BUFFER_BIT; 825 glClear GL_COLOR_BUFFER_BIT;
675 826
827 {
828 package CFClient::UI::Base;
829
830 ($draw_x, $draw_y, $draw_w, $draw_h) =
831 (0, 0, $self->{w}, $self->{h});
832 }
833
676 $self->_render; 834 $self->_render;
677# glColorMask 1, 1, 1, 0;
678# glEnable GL_BLEND;
679# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
680# glRasterPos 0, 0;
681# glCopyPixels 0, 0, $self->{w}, $self->{h};
682# glDisable GL_BLEND;
683# glColorMask 1, 1, 1, 1;
684 }; 835 };
685} 836}
686 837
687sub _draw { 838sub _draw {
688 my ($self) = @_; 839 my ($self) = @_;
689 840
690 my ($w, $h) = ($self->w, $self->h); 841 my ($w, $h) = @$self{qw(w h)};
691 842
692 my $tex = $self->{texture} 843 my $tex = $self->{texture}
693 or return; 844 or return;
694 845
695 glEnable GL_TEXTURE_2D; 846 glEnable GL_TEXTURE_2D;
696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 847 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
697 glColor 0, 0, 0, 1; 848 glColor 1, 1, 1, 1;
698 849
699 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 850 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
700 851
701 glDisable GL_TEXTURE_2D; 852 glDisable GL_TEXTURE_2D;
702} 853}
… …
705 856
706package CFClient::UI::ViewPort; 857package CFClient::UI::ViewPort;
707 858
708our @ISA = CFClient::UI::Window::; 859our @ISA = CFClient::UI::Window::;
709 860
861sub new {
862 my $class = shift;
863
864 $class->SUPER::new (
865 scroll_x => 0,
866 scroll_y => 1,
867 @_,
868 )
869}
870
710sub size_request { 871sub size_request {
711 my ($self) = @_; 872 my ($self) = @_;
712 873
713 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 874 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
714 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
715 875
716 @$self{qw(child_w child_h)} 876 $w = 10 if $self->{scroll_x};
877 $h = 10 if $self->{scroll_y};
878
879 ($w, $h)
717} 880}
718 881
719sub size_allocate { 882sub size_allocate {
720 my ($self, $w, $h) = @_; 883 my ($self, $w, $h) = @_;
721 884
885 my $child = $self->child;
886
887 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
888 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
889
890 $self->child->configure (0, 0, $w, $h);
722 $self->update; 891 $self->update;
723} 892}
724 893
725sub set_offset { 894sub set_offset {
726 my ($self, $x, $y) = @_; 895 my ($self, $x, $y) = @_;
… …
760} 929}
761 930
762sub _render { 931sub _render {
763 my ($self) = @_; 932 my ($self) = @_;
764 933
934 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
935 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
936
765 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 937 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
766 938
767 $self->SUPER::_render; 939 $self->SUPER::_render;
768} 940}
769 941
… …
777 my $class = shift; 949 my $class = shift;
778 950
779 my $self; 951 my $self;
780 952
781 my $slider = new CFClient::UI::Slider 953 my $slider = new CFClient::UI::Slider
782 vertical => 1, 954 vertical => 1,
783 range => [0, 0, 1, 0.01], # HACK fix 955 range => [0, 0, 1, 0.01], # HACK fix
784 connect_changed => sub { 956 on_changed => sub {
785 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 957 $self->{vp}->set_offset (0, $_[1]);
786 }, 958 },
787 ; 959 ;
788 960
789 $self = $class->SUPER::new ( 961 $self = $class->SUPER::new (
790 vp => (new CFClient::UI::ViewPort), 962 vp => (new CFClient::UI::ViewPort expand => 1),
791 slider => $slider, 963 slider => $slider,
792 @_, 964 @_,
793 ); 965 );
794 966
795 $self->{vp}->add ($self->{scrolled}); 967 $self->{vp}->add ($self->{scrolled});
796 $self->add ($self->{vp}); 968 $self->add ($self->{vp});
797 $self->add ($self->{slider}); 969 $self->add ($self->{slider});
798 970
799 $self 971 $self
972}
973
974sub update {
975 my ($self) = @_;
976
977 $self->SUPER::update;
978
979 # todo: overwrite size_allocate of child
980 my $child = $self->{vp}->child;
981 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
982}
983
984sub size_allocate {
985 my ($self, $w, $h) = @_;
986
987 $self->SUPER::size_allocate ($w, $h);
988
989 my $child = $self->{vp}->child;
990 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
800} 991}
801 992
802#TODO# update range on size_allocate depending on child 993#TODO# update range on size_allocate depending on child
803# update viewport offset on scroll 994# update viewport offset on scroll
804 995
… …
848 1039
849our @ISA = CFClient::UI::Bin::; 1040our @ISA = CFClient::UI::Bin::;
850 1041
851use CFClient::OpenGL; 1042use CFClient::OpenGL;
852 1043
853my @tex = 1044my $bg =
1045 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1046 mipmap => 1, wrap => 1;
1047
1048my @border =
854 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1049 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
855 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1050 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
856 1051
857sub new { 1052sub new {
858 my $class = shift; 1053 my $class = shift;
859 1054
860 # TODO: user_x, user_y, overwrite moveto?
861
862 my $self = $class->SUPER::new ( 1055 my $self = $class->SUPER::new (
863 bg => [1, 1, 1, 1], 1056 bg => [1, 1, 1, 1],
864 border_bg => [1, 1, 1, 1], 1057 border_bg => [1, 1, 1, 1],
865 border => 0.6, 1058 border => 0.6,
866 toplevel => 1,
867 can_events => 1, 1059 can_events => 1,
1060 min_w => 16,
1061 min_h => 16,
868 @_ 1062 @_
869 ); 1063 );
870 1064
871 $self->{title} &&= new CFClient::UI::Label 1065 $self->{title} &&= new CFClient::UI::Label
872 align => 0, 1066 align => 0,
… …
896 my ($self, $w, $h) = @_; 1090 my ($self, $w, $h) = @_;
897 1091
898 $h -= List::Util::max 0, $self->border * 2; 1092 $h -= List::Util::max 0, $self->border * 2;
899 $w -= List::Util::max 0, $self->border * 2; 1093 $w -= List::Util::max 0, $self->border * 2;
900 1094
901 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1095 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
902 if $self->{title}; 1096 if $self->{title};
903 1097
904 $self->child->configure ($self->border, $self->border, $w, $h); 1098 $self->child->configure ($self->border, $self->border, $w, $h);
905} 1099}
906 1100
… …
925 my ($ev, $x, $y) = @_; 1119 my ($ev, $x, $y) = @_;
926 1120
927 my $dx = $ev->{x} - $ox; 1121 my $dx = $ev->{x} - $ox;
928 my $dy = $ev->{y} - $oy; 1122 my $dy = $ev->{y} - $oy;
929 1123
930 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1124 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
931 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1125 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1126
1127 $self->realloc;
932 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1128 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
933 $self->check_size;
934 }; 1129 };
935 1130
936 } elsif ($lr ^ $td) { 1131 } elsif ($lr ^ $td) {
937 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1132 my ($ox, $oy) = ($ev->{x}, $ev->{y});
938 my ($bx, $by) = ($self->{x}, $self->{y}); 1133 my ($bx, $by) = ($self->{x}, $self->{y});
… …
940 $self->{motion} = sub { 1135 $self->{motion} = sub {
941 my ($ev, $x, $y) = @_; 1136 my ($ev, $x, $y) = @_;
942 1137
943 ($x, $y) = ($ev->{x}, $ev->{y}); 1138 ($x, $y) = ($ev->{x}, $ev->{y});
944 1139
945 $self->move ($bx + $x - $ox, $by + $y - $oy); 1140 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
946 $self->update;
947 }; 1141 };
948 } 1142 }
949} 1143}
950 1144
951sub button_up { 1145sub button_up {
… …
970 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
971 1165
972 my $border = $self->border; 1166 my $border = $self->border;
973 1167
974 glColor @{ $self->{border_bg} }; 1168 glColor @{ $self->{border_bg} };
975 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1169 $border[0]->draw_quad_alpha (0, 0, $w, $border);
976 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1170 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
977 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1171 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
978 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1172 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
979 1173
980 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1174 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
981 my $bg = $tex[0]; 1175 glColor @{ $self->{bg} };
982 1176
983 # TODO: repeat texture not scale 1177 # TODO: repeat texture not scale
1178 # solve this better(?)
984 my $rep_x = $cw / $bg->{w}; 1179 $bg->{s} = $cw / $bg->{w};
985 my $rep_y = $ch / $bg->{h}; 1180 $bg->{t} = $ch / $bg->{h};
986
987 glColor @{ $self->{bg} };
988
989 $bg->{s} = $rep_x;
990 $bg->{t} = $rep_y;
991 $bg->{wrap_mode} = 1;
992 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1181 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
993 } 1182 }
994 1183
995 glDisable GL_TEXTURE_2D; 1184 glDisable GL_TEXTURE_2D;
996 1185
… …
1012sub new { 1201sub new {
1013 my $class = shift; 1202 my $class = shift;
1014 1203
1015 $class->SUPER::new ( 1204 $class->SUPER::new (
1016 col_expand => [], 1205 col_expand => [],
1017 @_ 1206 @_,
1018 ) 1207 )
1208}
1209
1210sub children {
1211 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1019} 1212}
1020 1213
1021sub add { 1214sub add {
1022 my ($self, $x, $y, $child) = @_; 1215 my ($self, $x, $y, $child) = @_;
1023 1216
1024 $child->set_parent ($self); 1217 $child->set_parent ($self);
1025 $self->{children}[$y][$x] = $child; 1218 $self->{children}[$y][$x] = $child;
1026 1219
1027 $child->check_size; 1220 $self->realloc;
1028} 1221}
1029 1222
1030sub children {
1031 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032}
1033
1034# TODO: move to container class maybe? send childs a signal on removal? 1223# TODO: move to container class maybe? send children a signal on removal?
1035sub clear { 1224sub clear {
1036 my ($self) = @_; 1225 my ($self) = @_;
1037 1226
1038 my @children = $self->children; 1227 my @children = $self->children;
1039 delete $self->{children}; 1228 delete $self->{children};
… …
1041 for (@children) { 1230 for (@children) {
1042 delete $_->{parent}; 1231 delete $_->{parent};
1043 $_->hide; 1232 $_->hide;
1044 } 1233 }
1045 1234
1046 $self->update; 1235 $self->realloc;
1047} 1236}
1048 1237
1049sub get_wh { 1238sub get_wh {
1050 my ($self) = @_; 1239 my ($self) = @_;
1051 1240
… …
1082sub size_allocate { 1271sub size_allocate {
1083 my ($self, $w, $h) = @_; 1272 my ($self, $w, $h) = @_;
1084 1273
1085 my ($ws, $hs) = $self->get_wh; 1274 my ($ws, $hs) = $self->get_wh;
1086 1275
1087 my $req_w = sum @$ws; 1276 my $req_w = (sum @$ws) || 1;
1088 my $req_h = sum @$hs; 1277 my $req_h = (sum @$hs) || 1;
1089 1278
1090 # TODO: nicer code && do row_expand 1279 # TODO: nicer code && do row_expand
1091 my @col_expand = @{$self->{col_expand}}; 1280 my @col_expand = @{$self->{col_expand}};
1092 @col_expand = (1) x @$ws unless @col_expand; 1281 @col_expand = (1) x @$ws unless @col_expand;
1093 my $col_expand = (sum @col_expand) || 1; 1282 my $col_expand = (sum @col_expand) || 1;
… …
1147 } 1336 }
1148} 1337}
1149 1338
1150############################################################################# 1339#############################################################################
1151 1340
1152package CFClient::UI::HBox; 1341package CFClient::UI::Box;
1153
1154# TODO: wrap into common Box base class
1155 1342
1156our @ISA = CFClient::UI::Container::; 1343our @ISA = CFClient::UI::Container::;
1157 1344
1158sub size_request { 1345sub size_request {
1159 my ($self) = @_; 1346 my ($self) = @_;
1160 1347
1161 my @alloc = map [$_->size_request], @{$self->{children}}; 1348 $self->{vertical}
1162 1349 ? (
1163 ( 1350 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1164 (List::Util::sum map $_->[0], @alloc), 1351 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1165 (List::Util::max map $_->[1], @alloc), 1352 )
1166 ) 1353 : (
1354 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1355 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1356 )
1167} 1357}
1168 1358
1169sub size_allocate { 1359sub size_allocate {
1170 my ($self, $w, $h) = @_; 1360 my ($self, $w, $h) = @_;
1171 1361
1172 ($h, $w) = ($w, $h); 1362 my $space = $self->{vertical} ? $h : $w;
1173
1174 my $children = $self->{children}; 1363 my $children = $self->{children};
1175 1364
1176 my @h = map $_->{req_w}, @$children; 1365 my @req;
1177 1366
1178 my $req_h = List::Util::sum @h; 1367 if ($self->{homogeneous}) {
1179 1368 @req = ($space / (@$children || 1)) x @$children;
1180 if ($req_h > $h) {
1181 # ah well, not enough space
1182 $_ *= $h / $req_h for @h;
1183 } else { 1369 } else {
1370 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1371 my $req = List::Util::sum @req;
1372
1373 if ($req > $space) {
1374 # ah well, not enough space
1375 $_ *= $space / $req for @req;
1376 } else {
1184 my $exp = List::Util::sum map $_->{expand}, @$children; 1377 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1185 $exp ||= 1;
1186 1378
1379 $space = ($space - $req) / $expand; # remaining space to give away
1380
1381 $req[$_] += $space * $children->[$_]{expand}
1187 for (0 .. $#$children) { 1382 for 0 .. $#$children;
1188 my $child = $children->[$_];
1189
1190 my $alloc_h = $h[$_];
1191 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1192 $h[$_] = $alloc_h;
1193 } 1383 }
1194 } 1384 }
1195 1385
1196 CFClient::UI::harmonize \@h; 1386 CFClient::UI::harmonize \@req;
1197 1387
1198 my $y = 0; 1388 my $pos = 0;
1199 for (0 .. $#$children) { 1389 for (0 .. $#$children) {
1200 my $child = $children->[$_];
1201 my $h = $h[$_]; 1390 my $alloc = $req[$_];
1202 $child->configure ($y, 0, $h, $w); 1391 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1203 1392
1204 $y += $h; 1393 $pos += $alloc;
1205 } 1394 }
1206 1395
1207 1 1396 1
1208} 1397}
1209 1398
1210############################################################################# 1399#############################################################################
1211 1400
1401package CFClient::UI::HBox;
1402
1403our @ISA = CFClient::UI::Box::;
1404
1405sub new {
1406 my $class = shift;
1407
1408 $class->SUPER::new (
1409 vertical => 0,
1410 @_,
1411 )
1412}
1413
1414#############################################################################
1415
1212package CFClient::UI::VBox; 1416package CFClient::UI::VBox;
1213 1417
1214# TODO: wrap into common Box base class
1215
1216our @ISA = CFClient::UI::Container::; 1418our @ISA = CFClient::UI::Box::;
1217 1419
1218sub size_request { 1420sub new {
1219 my ($self) = @_; 1421 my $class = shift;
1220 1422
1221 my @alloc = map [$_->size_request], @{$self->{children}}; 1423 $class->SUPER::new (
1222 1424 vertical => 1,
1223 ( 1425 @_,
1224 (List::Util::max map $_->[0], @alloc),
1225 (List::Util::sum map $_->[1], @alloc),
1226 ) 1426 )
1227} 1427}
1228 1428
1229sub size_allocate {
1230 my ($self, $w, $h) = @_;
1231
1232 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1233
1234 my $children = $self->{children};
1235
1236 my @h = map $_->{req_h}, @$children;
1237
1238 my $req_h = List::Util::sum @h;
1239
1240 if ($req_h > $h) {
1241 # ah well, not enough space
1242 $_ *= $h / $req_h for @h;
1243 } else {
1244 my $exp = List::Util::sum map $_->{expand}, @$children;
1245 $exp ||= 1;
1246
1247 for (0 .. $#$children) {
1248 my $child = $children->[$_];
1249
1250 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1251 }
1252 }
1253
1254 CFClient::UI::harmonize \@h;
1255
1256 my $y = 0;
1257 for (0 .. $#$children) {
1258 my $child = $children->[$_];
1259 my $h = $h[$_];
1260 $child->configure (0, $y, $w, $h);
1261
1262 $y += $h;
1263 }
1264
1265 1
1266}
1267
1268############################################################################# 1429#############################################################################
1269 1430
1270package CFClient::UI::Label; 1431package CFClient::UI::Label;
1271 1432
1272our @ISA = CFClient::UI::Base::; 1433our @ISA = CFClient::UI::DrawBG::;
1273 1434
1274use CFClient::OpenGL; 1435use CFClient::OpenGL;
1275 1436
1276sub new { 1437sub new {
1277 my ($class, %arg) = @_; 1438 my ($class, %arg) = @_;
1278 1439
1279 my $self = $class->SUPER::new ( 1440 my $self = $class->SUPER::new (
1280 fg => [1, 1, 1], 1441 fg => [1, 1, 1],
1442 #bg => none
1443 #active_bg => none
1281 #font => default_font 1444 #font => default_font
1282 #text => initial text 1445 #text => initial text
1283 #markup => initial narkup 1446 #markup => initial narkup
1447 #max_w => maximum pixel width
1448 ellipsise => 3, # end
1284 layout => (new CFClient::Layout), 1449 layout => (new CFClient::Layout),
1285 fontsize => 1, 1450 fontsize => 1,
1286 align => -1, 1451 align => -1,
1287 valign => -1, 1452 valign => -1,
1288 padding => 2, 1453 padding_x => 2,
1454 padding_y => 2,
1289 can_events => 0, 1455 can_events => 0,
1290 %arg 1456 %arg
1291 ); 1457 );
1292 1458
1293 if (exists $self->{template}) { 1459 if (exists $self->{template}) {
… …
1303 } 1469 }
1304 1470
1305 $self 1471 $self
1306} 1472}
1307 1473
1308sub escape { 1474sub escape($) {
1309 local $_ = $_[1]; 1475 local $_ = $_[0];
1310 1476
1311 s/&/&amp;/g; 1477 s/&/&amp;/g;
1312 s/>/&gt;/g; 1478 s/>/&gt;/g;
1313 s/</&lt;/g; 1479 s/</&lt;/g;
1314 1480
1315 $_[1] 1481 $_
1316} 1482}
1317 1483
1318sub update { 1484sub update {
1319 my ($self) = @_; 1485 my ($self) = @_;
1320 1486
… …
1329 $self->{text} = "T$text"; 1495 $self->{text} = "T$text";
1330 1496
1331 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1497 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1332 $self->{layout}->set_text ($text); 1498 $self->{layout}->set_text ($text);
1333 1499
1500 $self->realloc;
1334 $self->update; 1501 $self->update;
1335 $self->check_size;
1336} 1502}
1337 1503
1338sub set_markup { 1504sub set_markup {
1339 my ($self, $markup) = @_; 1505 my ($self, $markup) = @_;
1340 1506
… …
1344 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1510 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1345 1511
1346 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1512 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1347 $self->{layout}->set_markup ($markup); 1513 $self->{layout}->set_markup ($markup);
1348 1514
1515 $self->realloc;
1349 $self->update; 1516 $self->update;
1350 $self->check_size;
1351} 1517}
1352 1518
1353sub size_request { 1519sub size_request {
1354 my ($self) = @_; 1520 my ($self) = @_;
1355 1521
1356 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1522 $self->{layout}->set_font ($self->{font}) if $self->{font};
1357 $self->{layout}->set_width ($self->{max_w} || -1); 1523 $self->{layout}->set_width ($self->{max_w} || -1);
1524 $self->{layout}->set_ellipsise ($self->{ellipsise});
1525 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1358 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1526 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359 1527
1360 my ($w, $h) = $self->{layout}->size; 1528 my ($w, $h) = $self->{layout}->size;
1361 1529
1362 if (exists $self->{template}) { 1530 if (exists $self->{template}) {
… …
1367 1535
1368 $w = List::Util::max $w, $w2; 1536 $w = List::Util::max $w, $w2;
1369 $h = List::Util::max $h, $h2; 1537 $h = List::Util::max $h, $h2;
1370 } 1538 }
1371 1539
1372 ( 1540 ($w, $h)
1373 $w + $self->{padding} * 2,
1374 $h + $self->{padding} * 2,
1375 )
1376} 1541}
1377 1542
1378sub size_allocate { 1543sub size_allocate {
1379 my ($self, $w, $h) = @_; 1544 my ($self, $w, $h) = @_;
1380 1545
1381 delete $self->{texture}; 1546 delete $self->{texture}
1547 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1382} 1548}
1383 1549
1384sub set_fontsize { 1550sub set_fontsize {
1385 my ($self, $fontsize) = @_; 1551 my ($self, $fontsize) = @_;
1386 1552
1387 $self->{fontsize} = $fontsize; 1553 $self->{fontsize} = $fontsize;
1388 delete $self->{texture}; 1554 delete $self->{texture};
1389 1555
1390 $self->update; 1556 $self->realloc;
1391 $self->check_size;
1392} 1557}
1393 1558
1394sub _draw { 1559sub _draw {
1395 my ($self) = @_; 1560 my ($self) = @_;
1561
1562 $self->SUPER::_draw; # draw background, if applicable
1396 1563
1397 my $tex = $self->{texture} ||= do { 1564 my $tex = $self->{texture} ||= do {
1398 $self->{layout}->set_foreground (@{$self->{fg}}); 1565 $self->{layout}->set_foreground (@{$self->{fg}});
1399 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1566 $self->{layout}->set_font ($self->{font}) if $self->{font};
1400 $self->{layout}->set_width ($self->{w}); 1567 $self->{layout}->set_width ($self->{w});
1568 $self->{layout}->set_ellipsise ($self->{ellipsise});
1569 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1401 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1570 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402 1571
1403 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1572 my $tex = new_from_layout CFClient::Texture $self->{layout};
1404 1573
1405 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1574 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1406 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1575 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1407 : ($self->{w} - $tex->{w}) * 0.5; 1576 : ($self->{w} - $tex->{w}) * 0.5);
1408 1577
1409 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1578 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1410 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1579 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1411 : ($self->{h} - $tex->{h}) * 0.5; 1580 : ($self->{h} - $tex->{h}) * 0.5);
1412 1581
1413 $tex 1582 $tex
1414 }; 1583 };
1415 1584
1416 glEnable GL_TEXTURE_2D; 1585 glEnable GL_TEXTURE_2D;
… …
1444 active_fg => [0, 0, 0], 1613 active_fg => [0, 0, 0],
1445 can_hover => 1, 1614 can_hover => 1,
1446 can_focus => 1, 1615 can_focus => 1,
1447 valign => 0, 1616 valign => 0,
1448 can_events => 1, 1617 can_events => 1,
1618 #text => ...
1449 @_ 1619 @_
1450 ) 1620 )
1451} 1621}
1452 1622
1453sub _set_text { 1623sub _set_text {
… …
1463 $self->{text} = $text; 1633 $self->{text} = $text;
1464 1634
1465 $text =~ s/./*/g if $self->{hidden}; 1635 $text =~ s/./*/g if $self->{hidden};
1466 $self->{layout}->set_text ("$text "); 1636 $self->{layout}->set_text ("$text ");
1467 1637
1468 $self->emit (changed => $self->{text}); 1638 $self->_emit (changed => $self->{text});
1469} 1639}
1470 1640
1471sub set_text { 1641sub set_text {
1472 my ($self, $text) = @_; 1642 my ($self, $text) = @_;
1473 1643
1474 $self->{cursor} = length $text; 1644 $self->{cursor} = length $text;
1475 $self->_set_text ($text); 1645 $self->_set_text ($text);
1476 $self->check_size; 1646
1477 $self->update; 1647 $self->realloc;
1478} 1648}
1479 1649
1480sub get_text { 1650sub get_text {
1481 $_[0]{text} 1651 $_[0]{text}
1482} 1652}
… …
1485 my ($self) = @_; 1655 my ($self) = @_;
1486 1656
1487 my ($w, $h) = $self->SUPER::size_request; 1657 my ($w, $h) = $self->SUPER::size_request;
1488 1658
1489 ($w + 1, $h) # add 1 for cursor 1659 ($w + 1, $h) # add 1 for cursor
1490}
1491
1492sub size_allocate {
1493 my ($self, $w, $h) = @_;
1494
1495 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1496} 1660}
1497 1661
1498sub key_down { 1662sub key_down {
1499 my ($self, $ev) = @_; 1663 my ($self, $ev) = @_;
1500 1664
… …
1515 } elsif ($sym == CFClient::SDLK_HOME) { 1679 } elsif ($sym == CFClient::SDLK_HOME) {
1516 $self->{cursor} = 0; 1680 $self->{cursor} = 0;
1517 } elsif ($sym == CFClient::SDLK_END) { 1681 } elsif ($sym == CFClient::SDLK_END) {
1518 $self->{cursor} = length $text; 1682 $self->{cursor} = length $text;
1519 } elsif ($uni == 27) { 1683 } elsif ($uni == 27) {
1520 $self->emit ('escape'); 1684 $self->_emit ('escape');
1521 } elsif ($uni) { 1685 } elsif ($uni) {
1522 substr $text, $self->{cursor}++, 0, chr $uni; 1686 substr $text, $self->{cursor}++, 0, chr $uni;
1523 } 1687 }
1524 1688
1525 $self->_set_text ($text); 1689 $self->_set_text ($text);
1526 $self->update; 1690
1691 $self->realloc;
1527} 1692}
1528 1693
1529sub focus_in { 1694sub focus_in {
1530 my ($self) = @_; 1695 my ($self) = @_;
1531 1696
… …
1611 if ($sym == 13) { 1776 if ($sym == 13) {
1612 unshift @{$self->{history}}, 1777 unshift @{$self->{history}},
1613 my $txt = $self->get_text; 1778 my $txt = $self->get_text;
1614 $self->{history_pointer} = -1; 1779 $self->{history_pointer} = -1;
1615 $self->{history_saveback} = ''; 1780 $self->{history_saveback} = '';
1616 $self->emit (activate => $txt); 1781 $self->_emit (activate => $txt);
1617 $self->update; 1782 $self->update;
1618 1783
1619 } elsif ($sym == CFClient::SDLK_UP) { 1784 } elsif ($sym == CFClient::SDLK_UP) {
1620 if ($self->{history_pointer} < 0) { 1785 if ($self->{history_pointer} < 0) {
1621 $self->{history_saveback} = $self->get_text; 1786 $self->{history_saveback} = $self->get_text;
… …
1658 1823
1659sub new { 1824sub new {
1660 my $class = shift; 1825 my $class = shift;
1661 1826
1662 $class->SUPER::new ( 1827 $class->SUPER::new (
1663 padding => 4, 1828 padding_x => 4,
1829 padding_y => 4,
1664 fg => [1, 1, 1], 1830 fg => [1, 1, 1],
1665 bg => [1, 1, 1, 0.2],
1666 active_fg => [0, 0, 1], 1831 active_fg => [0, 0, 1],
1667 can_hover => 1, 1832 can_hover => 1,
1668 align => 0, 1833 align => 0,
1669 valign => 0, 1834 valign => 0,
1670 can_events => 1, 1835 can_events => 1,
1671 @_ 1836 @_
1672 ) 1837 )
1673} 1838}
1674 1839
1840sub activate { }
1841
1675sub button_up { 1842sub button_up {
1676 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1677 1844
1845 $self->emit ("activate")
1678 if ($x >= 0 && $x < $self->{w} 1846 if $x >= 0 && $x < $self->{w}
1679 && $y >= 0 && $y < $self->{h}) { 1847 && $y >= 0 && $y < $self->{h};
1680 $self->emit ("activate");
1681 }
1682} 1848}
1683 1849
1684sub _draw { 1850sub _draw {
1685 my ($self) = @_; 1851 my ($self) = @_;
1686 1852
… …
1715 1881
1716sub new { 1882sub new {
1717 my $class = shift; 1883 my $class = shift;
1718 1884
1719 $class->SUPER::new ( 1885 $class->SUPER::new (
1720 padding => 2, 1886 padding_x => 2,
1887 padding_y => 2,
1721 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1722 active_fg => [1, 1, 0], 1889 active_fg => [1, 1, 0],
1890 bg => [0, 0, 0, 0.2],
1891 active_bg => [1, 1, 1, 0.5],
1723 state => 0, 1892 state => 0,
1724 can_hover => 1, 1893 can_hover => 1,
1725 @_ 1894 @_
1726 ) 1895 )
1727} 1896}
1728 1897
1729sub size_request { 1898sub size_request {
1730 my ($self) = @_; 1899 my ($self) = @_;
1731 1900
1732 ($self->{padding} * 2 + 6) x 2 1901 (6) x 2
1733} 1902}
1734 1903
1735sub button_down { 1904sub button_down {
1736 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1737 1906
1738 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1907 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1739 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1908 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1740 $self->{state} = !$self->{state}; 1909 $self->{state} = !$self->{state};
1741 $self->emit (changed => $self->{state}); 1910 $self->_emit (changed => $self->{state});
1742 } 1911 }
1743} 1912}
1744 1913
1745sub _draw { 1914sub _draw {
1746 my ($self) = @_; 1915 my ($self) = @_;
1747 1916
1748 $self->SUPER::_draw; 1917 $self->SUPER::_draw;
1749 1918
1750 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1919 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1751 1920
1752 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1921 my ($w, $h) = @$self{qw(w h)};
1922
1923 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1753 1924
1754 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1925 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1755 1926
1756 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1927 my $tex = $self->{state} ? $tex[1] : $tex[0];
1757 1928
… …
2011 qw(s1_slider.png s1_slider_bg.png); 2182 qw(s1_slider.png s1_slider_bg.png);
2012 2183
2013sub new { 2184sub new {
2014 my $class = shift; 2185 my $class = shift;
2015 2186
2016 # range [value, low, high, page] 2187 # range [value, low, high, page, unit]
2017 2188
2018 # TODO: 0-width page 2189 # TODO: 0-width page
2019 # TODO: req_w/h are wrong with vertical 2190 # TODO: req_w/h are wrong with vertical
2020 # TODO: calculations are off 2191 # TODO: calculations are off
2021 my $self = $class->SUPER::new ( 2192 my $self = $class->SUPER::new (
2022 fg => [1, 1, 1], 2193 fg => [1, 1, 1],
2023 active_fg => [0, 0, 0], 2194 active_fg => [0, 0, 0],
2195 bg => [0, 0, 0, 0.2],
2196 active_bg => [1, 1, 1, 0.5],
2024 range => [0, 0, 100, 10], 2197 range => [0, 0, 100, 10, 0],
2025 req_w => $::WIDTH / 80, 2198 min_w => $::WIDTH / 80,
2026 req_h => $::WIDTH / 80, 2199 min_h => $::WIDTH / 80,
2027 vertical => 0, 2200 vertical => 0,
2028 can_hover => 1, 2201 can_hover => 1,
2029 inner_pad => 5, 2202 inner_pad => 0.02,
2030 @_ 2203 @_
2031 ); 2204 );
2032 2205
2206 $self->set_value ($self->{range}[0]);
2207 $self->update;
2208
2033 $self 2209 $self
2034} 2210}
2035 2211
2212sub changed { }
2213
2214sub set_range {
2215 my ($self, $range) = @_;
2216
2217 ($range, $self->{range}) = ($self->{range}, $range);
2218
2219 $self->update
2220 if "@$range" ne "@{$self->{range}}";
2221}
2222
2223sub set_value {
2224 my ($self, $value) = @_;
2225
2226 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2227
2228 $hi = $lo + 1 if $hi <= $lo;
2229
2230 $page = $hi - $lo if $page > $hi - $lo;
2231
2232 $value = $lo if $value < $lo;
2233 $value = $hi - $page if $value > $hi - $page;
2234
2235 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2236 if $unit;
2237
2238 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2239
2240 if ($value != $old_value) {
2241 $self->_emit (changed => $value);
2242 $self->update;
2243 }
2244}
2245
2036sub size_request { 2246sub size_request {
2037 my ($self) = @_; 2247 my ($self) = @_;
2038 2248
2039 my $w = $self->{req_w}; 2249 ($self->{req_w}, $self->{req_h})
2040 my $h = $self->{req_h};
2041
2042 $self->{vertical} ? ($h, $w) : ($w, $h)
2043} 2250}
2044 2251
2045sub button_down { 2252sub button_down {
2046 my ($self, $ev, $x, $y) = @_; 2253 my ($self, $ev, $x, $y) = @_;
2047 2254
2048 $self->SUPER::button_down ($ev, $x, $y); 2255 $self->SUPER::button_down ($ev, $x, $y);
2256
2257 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2258
2049 $self->mouse_motion ($ev, $x, $y); 2259 $self->mouse_motion ($ev, $x, $y);
2050} 2260}
2051 2261
2052sub mouse_motion { 2262sub mouse_motion {
2053 my ($self, $ev, $x, $y) = @_; 2263 my ($self, $ev, $x, $y) = @_;
2054 2264
2055 if ($GRAB == $self) { 2265 if ($GRAB == $self) {
2266 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2267
2268 my (undef, $lo, $hi, $page) = @{$self->{range}};
2269
2270 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2271
2272 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2273 }
2274}
2275
2276sub update {
2277 my ($self) = @_;
2278
2279 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2280 $self->set_value ($self->{range}[0]);
2281
2056 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2282 my ($value, $lo, $hi, $page) = @{$self->{range}};
2283 my $range = ($hi - $page - $lo) || 1e-100;
2057 2284
2058 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2285 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2059 2286
2060 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2287 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2061 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2288 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2062 2289
2063 $x -= $inner_pad_px; # substract the padding 2290 $value = ($value - $lo) / $range;
2064 $x = $x * ($hi - $lo) / $inner_w + $lo; 2291 $value = $value * $self->{scale} + $self->{offset};
2065 $x = $lo if $x < $lo;
2066 $x = $hi - $page if $x > $hi - $page;
2067 $self->{range}[0] = $x;
2068 2292
2069 $self->emit (changed => $x); 2293 $self->{knob_x} = $value - $knob_w * 0.5;
2070 $self->update; 2294 $self->{knob_w} = $knob_w;
2071 } 2295 });
2072}
2073 2296
2074# the inner_* stuff is for generating a padding for the slider handle, 2297 $self->SUPER::update;
2075# so that the handle doesn't leave the texture. This calculation isn't 100%
2076# correct propably, but it does the job for now
2077sub _calc_inner_pad_px {
2078 my ($self, $w) = @_;
2079 ($w / 100) * $self->{inner_pad} # % to pixels
2080} 2298}
2081 2299
2082sub _draw { 2300sub _draw {
2083 my ($self) = @_; 2301 my ($self) = @_;
2084 2302
2085 $self->SUPER::_draw (); 2303 $self->SUPER::_draw ();
2086 2304
2087 my ($w, $h) = @$self{qw(w h)}; 2305 glScale $self->{w}, $self->{h};
2088 2306
2089 if ($self->{vertical}) { 2307 if ($self->{vertical}) {
2090 # draw a vertical slider like a rotated horizontal slider 2308 # draw a vertical slider like a rotated horizontal slider
2091 2309
2310 glTranslate 1, 0, 0;
2092 glRotate 90, 0, 0, 1; 2311 glRotate 90, 0, 0, 1;
2093 glTranslate 0, -$self->{w}, 0;
2094
2095 ($w, $h) = ($h, $w);
2096 } 2312 }
2097 2313
2098 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2314 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2315 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100 2316
2101 my ($value, $lo, $hi, $page) = @{$self->{range}};
2102
2103 $hi = $value + 1 if $lo == $hi;
2104
2105 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2106 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2107
2108 $page = int $page * $inner_w / ($hi - $lo);
2109 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2110
2111 $w -= $page;
2112 $page &= ~1;
2113 glTranslate $page * 0.5, 0, 0;
2114 $page ||= 2;
2115
2116 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2117 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2118
2119 glEnable GL_TEXTURE_2D; 2317 glEnable GL_TEXTURE_2D;
2120 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121 2319
2122 # draw background 2320 # draw background
2123 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2321 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124 2322
2125 # draw handle 2323 # draw handle
2126 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2324 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2127 2325
2128 glDisable GL_TEXTURE_2D; 2326 glDisable GL_TEXTURE_2D;
2129} 2327}
2328
2329#############################################################################
2330
2331package CFClient::UI::ValSlider;
2332
2333our @ISA = CFClient::UI::HBox::;
2334
2335sub new {
2336 my ($class, %arg) = @_;
2337
2338 my $range = delete $arg{range};
2339
2340 my $self = $class->SUPER::new (
2341 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2342 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2343 to_value => sub { shift },
2344 from_value => sub { shift },
2345 %arg,
2346 );
2347
2348 $self->{slider}->connect (changed => sub {
2349 my ($self, $value) = @_;
2350 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2351 $self->{parent}->emit (changed => $value);
2352 });
2353
2354# $self->{entry}->connect (changed => sub {
2355# my ($self, $value) = @_;
2356# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2357# $self->{parent}->emit (changed => $value);
2358# });
2359
2360 $self->add ($self->{slider}, $self->{entry});
2361
2362 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2363
2364 $self
2365}
2366
2367sub set_range { shift->{slider}->set_range (@_) }
2368sub set_value { shift->{slider}->set_value (@_) }
2130 2369
2131############################################################################# 2370#############################################################################
2132 2371
2133package CFClient::UI::TextView; 2372package CFClient::UI::TextView;
2134 2373
… …
2164 2403
2165 $self->{fontsize} = $fontsize; 2404 $self->{fontsize} = $fontsize;
2166 $self->reflow; 2405 $self->reflow;
2167} 2406}
2168 2407
2169sub text_height {
2170 my ($self, $text) = @_;
2171
2172 my $layout = $self->{layout};
2173
2174 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2175 $layout->set_width ($self->{children}[0]{w});
2176 $layout->set_markup ($text);
2177
2178 ($layout->size)[1]
2179}
2180
2181sub reflow {
2182 my ($self) = @_;
2183
2184 $self->{need_reflow}++;
2185 $self->update;
2186}
2187
2188sub size_allocate { 2408sub size_allocate {
2189 my ($self, $w, $h) = @_; 2409 my ($self, $w, $h) = @_;
2190 2410
2191 $self->SUPER::size_allocate ($w, $h); 2411 $self->SUPER::size_allocate ($w, $h);
2192 2412
… …
2195 $self->{layout}->set_width ($self->{children}[0]{w}); 2415 $self->{layout}->set_width ($self->{children}[0]{w});
2196 2416
2197 $self->reflow; 2417 $self->reflow;
2198} 2418}
2199 2419
2420sub text_size {
2421 my ($self, $text, $indent) = @_;
2422
2423 my $layout = $self->{layout};
2424
2425 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2426 $layout->set_width ($self->{children}[0]{w} - $indent);
2427 $layout->set_markup ($text);
2428
2429 $layout->size
2430}
2431
2432sub reflow {
2433 my ($self) = @_;
2434
2435 $self->{need_reflow}++;
2436 $self->update;
2437}
2438
2439sub set_offset {
2440 my ($self, $offset) = @_;
2441
2442 # todo: base offset on lines or so, not on pixels
2443 $self->{children}[1]->set_value ($offset);
2444}
2445
2446sub clear {
2447 my ($self) = @_;
2448
2449 $self->{par} = [];
2450 $self->{height} = 0;
2451 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2452}
2453
2200sub add_paragraph { 2454sub add_paragraph {
2201 my ($self, $color, $text) = @_; 2455 my ($self, $color, $text, $indent) = @_;
2202 2456
2203 #TODO: intelligently "reformat" paragraph 2457 for my $line (split /\n/, $text) {
2204 2458 my ($w, $h) = $self->text_size ($line);
2205 my $height = $self->text_height ($text);
2206
2207 $self->{height} += $height; 2459 $self->{height} += $h;
2460 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2461 }
2208 2462
2209 push @{$self->{par}}, [$height, $color, $text];
2210
2211 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2463 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2212 $self->{children}[1]->update;
2213} 2464}
2214 2465
2215sub update { 2466sub update {
2216 my ($self) = @_; 2467 my ($self) = @_;
2217 2468
… …
2220 return unless $self->{h} > 0; 2471 return unless $self->{h} > 0;
2221 2472
2222 delete $self->{texture}; 2473 delete $self->{texture};
2223 2474
2224 $ROOT->on_post_alloc ($self, sub { 2475 $ROOT->on_post_alloc ($self, sub {
2476 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2477
2225 if (delete $self->{need_reflow}) { 2478 if (delete $self->{need_reflow}) {
2226 my $height = 0; 2479 my $height = 0;
2227 2480
2228 $height += $_->[0] = $self->text_height ($_->[2]) 2481 my $layout = $self->{layout};
2482
2483 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2484
2229 for @{$self->{par}}; 2485 for (@{$self->{par}}) {
2486 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2487 $layout->set_width ($W - $_->[3]);
2488 $layout->set_markup ($_->[4]);
2489 my ($w, $h) = $layout->size;
2490 $_->[0] = $w + $_->[3];
2491 $_->[1] = $h;
2492 }
2493
2494 $height += $_->[1];
2495 }
2230 2496
2231 $self->{height} = $height; 2497 $self->{height} = $height;
2232 2498
2233 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2499 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2234 2500
2235 delete $self->{texture}; 2501 delete $self->{texture};
2236 } 2502 }
2237 2503
2238 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2504 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2239 glClearColor 0, 0, 0, 0; 2505 glClearColor 0.5, 0.5, 0.5, 0;
2240 glClear GL_COLOR_BUFFER_BIT; 2506 glClear GL_COLOR_BUFFER_BIT;
2241 2507
2242 glEnable GL_TEXTURE_2D;
2243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244
2245 my $top = int $self->{children}[1]{range}[0]; 2508 my $top = int $self->{children}[1]{range}[0];
2246 2509
2247 my $y0 = $top; 2510 my $y0 = $top;
2248 my $y1 = $top + $self->{h}; 2511 my $y1 = $top + $H;
2249 2512
2250 my $y = 0; 2513 my $y = 0;
2251 2514
2252 my $layout = $self->{layout}; 2515 my $layout = $self->{layout};
2253 2516
2254 $layout->set_font ($self->{font}) if $self->{font}; 2517 $layout->set_font ($self->{font}) if $self->{font};
2255 2518
2519 glEnable GL_BLEND;
2520 #TODO# not correct in windows where rgba is forced off
2521 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2522
2256 for my $par (@{$self->{par}}) { 2523 for my $par (@{$self->{par}}) {
2257 my $h = $par->[0]; 2524 my $h = $par->[1];
2258 2525
2259 if ($y0 < $y + $h && $y < $y1) { 2526 if ($y0 < $y + $h && $y < $y1) {
2260 $layout->set_foreground (@{ $par->[1] }); 2527 $layout->set_foreground (@{ $par->[2] });
2528 $layout->set_width ($W - $par->[3]);
2261 $layout->set_markup ($par->[2]); 2529 $layout->set_markup ($par->[4]);
2262 2530
2263 my ($W, $H) = $layout->size; 2531 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2532
2533 glRasterPos $par->[3], $y - $y0;
2534 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265 } 2535 }
2266 2536
2267 $y += $h; 2537 $y += $h;
2268 } 2538 }
2269 2539
2270 glDisable GL_TEXTURE_2D; 2540 glDisable GL_BLEND;
2271 }; 2541 };
2272 }); 2542 });
2273} 2543}
2274 2544
2275sub _draw { 2545sub _draw {
2276 my ($self) = @_; 2546 my ($self) = @_;
2277 2547
2278 glEnable GL_TEXTURE_2D; 2548 glEnable GL_TEXTURE_2D;
2279 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2549 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280 glColor 1, 1, 1, 1; 2550 glColor 1, 1, 1, 1;
2281 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2551 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2282 glDisable GL_TEXTURE_2D; 2552 glDisable GL_TEXTURE_2D;
2283 2553
2284 $self->{children}[1]->draw; 2554 $self->{children}[1]->draw;
2285 2555
2286} 2556}
… …
2335 2605
2336sub new { 2606sub new {
2337 my $class = shift; 2607 my $class = shift;
2338 2608
2339 my $self = $class->SUPER::new ( 2609 my $self = $class->SUPER::new (
2340 state => 0, 2610 state => 0,
2341 connect_activate => \&toggle_flopper, 2611 on_activate => \&toggle_flopper,
2342 @_ 2612 @_
2343 ); 2613 );
2344 2614
2345 if ($self->{state}) {
2346 $self->{state} = 0;
2347 $self->toggle_flopper;
2348 }
2349
2350 $self 2615 $self
2351} 2616}
2352 2617
2353sub toggle_flopper { 2618sub toggle_flopper {
2354 my ($self) = @_; 2619 my ($self) = @_;
2355 2620
2356 # TODO: use animation 2621 $self->{other}->toggle_visibility;
2357 if ($self->{state} = !$self->{state}) {
2358 $CFClient::UI::ROOT->add ($self->{other});
2359 $self->{other}->move ($self->coord2global (0, $self->{h}));
2360 $self->emit ("open");
2361 } else {
2362 $CFClient::UI::ROOT->remove ($self->{other});
2363 $self->emit ("close");
2364 }
2365
2366 $self->emit (changed => $self->{state});
2367} 2622}
2368 2623
2369############################################################################# 2624#############################################################################
2370 2625
2371package CFClient::UI::Tooltip; 2626package CFClient::UI::Tooltip;
… …
2384} 2639}
2385 2640
2386sub set_tooltip_from { 2641sub set_tooltip_from {
2387 my ($self, $widget) = @_; 2642 my ($self, $widget) = @_;
2388 2643
2644 my $tooltip = $widget->{tooltip};
2645
2646 if ($ENV{CFPLUS_DEBUG} & 2) {
2647 $tooltip .= "\n\n" . (ref $widget) . "\n"
2648 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2649 . "req $widget->{req_w} $widget->{req_h}\n"
2650 . "visible $widget->{visible}";
2651 }
2652
2389 $self->add (new CFClient::UI::Label 2653 $self->add (new CFClient::UI::Label
2390 markup => $widget->{tooltip}, 2654 markup => $tooltip,
2391 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2655 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392 fontsize => 0.8, 2656 fontsize => 0.8,
2393 fg => [0, 0, 0, 1], 2657 fg => [0, 0, 0, 1],
2658 ellipsise => 0,
2394 font => ($widget->{tooltip_font} || $::FONT_PROP), 2659 font => ($widget->{tooltip_font} || $::FONT_PROP),
2395 ); 2660 );
2396} 2661}
2397 2662
2398sub size_request { 2663sub size_request {
2399 my ($self) = @_; 2664 my ($self) = @_;
… …
2405 2670
2406sub size_allocate { 2671sub size_allocate {
2407 my ($self, $w, $h) = @_; 2672 my ($self, $w, $h) = @_;
2408 2673
2409 $self->SUPER::size_allocate ($w - 4, $h - 4); 2674 $self->SUPER::size_allocate ($w - 4, $h - 4);
2675}
2676
2677sub visibility_change {
2678 my ($self, $visible) = @_;
2679
2680 return unless $visible;
2681
2682 $self->{root}->on_post_alloc ("move_$self" => sub {
2683 my $widget = $self->{owner}
2684 or return;
2685
2686 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2687
2688 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2689 if $x + $self->{w} > $::WIDTH;
2690
2691 $self->move_abs ($x, $y);
2692 });
2410} 2693}
2411 2694
2412sub _draw { 2695sub _draw {
2413 my ($self) = @_; 2696 my ($self) = @_;
2414 2697
… …
2431 glVertex $w, $h; 2714 glVertex $w, $h;
2432 glVertex $w, 0; 2715 glVertex $w, 0;
2433 glEnd; 2716 glEnd;
2434 2717
2435 glTranslate 2 - 0.375, 2 - 0.375; 2718 glTranslate 2 - 0.375, 2 - 0.375;
2719
2436 $self->SUPER::_draw; 2720 $self->SUPER::_draw;
2437} 2721}
2438 2722
2439############################################################################# 2723#############################################################################
2440 2724
… …
2445use CFClient::OpenGL; 2729use CFClient::OpenGL;
2446 2730
2447sub new { 2731sub new {
2448 my $class = shift; 2732 my $class = shift;
2449 2733
2450 $class->SUPER::new ( 2734 my $self = $class->SUPER::new (
2451 aspect => 1, 2735 aspect => 1,
2736 can_events => 0,
2452 @_, 2737 @_,
2453 ) 2738 );
2739
2740 if ($self->{anim} && $self->{animspeed}) {
2741 Scalar::Util::weaken (my $widget = $self);
2742
2743 $self->{timer} = Event->timer (
2744 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2745 hard => 1,
2746 interval => $self->{animspeed},
2747 cb => sub {
2748 ++$widget->{frame};
2749 $widget->update;
2750 },
2751 );
2752 }
2753
2754 $self
2454} 2755}
2455 2756
2456sub size_request { 2757sub size_request {
2457 (32, 8) 2758 (32, 8)
2458} 2759}
2459 2760
2761sub update {
2762 my ($self) = @_;
2763
2764 return unless $self->{visible};
2765
2766 $self->SUPER::update;
2767}
2768
2460sub _draw { 2769sub _draw {
2461 my ($self) = @_; 2770 my ($self) = @_;
2462 2771
2463 return unless $::CONN;#d# manage and cache textures differently 2772 return unless $::CONN;
2773
2774 my $face;
2775
2776 if ($self->{frame}) {
2777 my $anim = $::CONN->{anim}[$self->{anim}];
2778
2779 $face = $anim->[ $self->{frame} % @$anim ]
2780 if $anim && @$anim;
2781 }
2782
2464 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2783 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2465 2784
2466 # TODO animation
2467 if ($tex) { 2785 if ($tex) {
2468 glEnable GL_TEXTURE_2D; 2786 glEnable GL_TEXTURE_2D;
2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2787 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470 glColor 1, 1, 1, 1; 2788 glColor 1, 1, 1, 1;
2471 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2789 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472 glDisable GL_TEXTURE_2D; 2790 glDisable GL_TEXTURE_2D;
2473 } 2791 }
2474} 2792}
2475 2793
2476############################################################################# 2794sub DESTROY {
2477
2478package CFClient::UI::InventoryItem;
2479
2480our @ISA = CFClient::UI::HBox::;
2481
2482sub new {
2483 my $class = shift;
2484
2485 my %args = @_;
2486
2487 my $item = delete $args{item};
2488
2489 my $desc = $item->{nrof} < 2
2490 ? $item->{name}
2491 : "$item->{nrof} $item->{name_pl}";
2492
2493
2494 my $self = $class->SUPER::new (
2495 can_hover => 1,
2496 can_events => 1,
2497 tooltip => (CFClient::UI::Label->escape ($desc)
2498 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2499 connect_button_down => sub {
2500 my ($self, $ev, $x, $y) = @_;
2501
2502 # todo: maybe put examine on 1? but should just be a tooltip :(
2503 if ($ev->{button} == 1) {
2504 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2505 } elsif ($ev->{button} == 2) {
2506 $::CONN->send ("apply $item->{tag}");
2507 } elsif ($ev->{button} == 3) {
2508 CFClient::UI::Menu->new (
2509 items => [
2510 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2511 [
2512 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2513 sub { $::CONN->send ("lock $item->{tag}") },
2514 ],
2515 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2516 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2517 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2518 ],
2519 )->popup ($ev);
2520 }
2521
2522 1
2523 },
2524 %args
2525 );
2526
2527 $self->add (new CFClient::UI::Face
2528 can_events => 0,
2529 face => $item->{face},
2530 anim => $item->{anim},
2531 animspeed => $item->{animspeed},
2532 );
2533
2534 $self->add (new CFClient::UI::Label
2535 can_events => 0,
2536 text => $desc,
2537 );
2538
2539 $self
2540}
2541
2542#############################################################################
2543
2544package CFClient::UI::Inventory;
2545
2546our @ISA = CFClient::UI::ScrolledWindow::;
2547
2548sub new {
2549 my $class = shift;
2550
2551 my $self = $class->SUPER::new (
2552 scrolled => (new CFClient::UI::VBox),
2553 @_,
2554 );
2555
2556 $self
2557}
2558
2559sub set_items {
2560 my ($self, $items) = @_; 2795 my ($self) = @_;
2561 2796
2562 $self->{scrolled}->clear; 2797 $self->{timer}->cancel
2563 return unless $items; 2798 if $self->{timer};
2564 2799
2565 my @items = sort { 2800 $self->SUPER::DESTROY;
2566 ($a->{type} <=> $b->{type})
2567 or ($a->{name} cmp $b->{name})
2568 } @$items;
2569
2570 $self->{real_items} = \@items;
2571
2572 for my $item (@items) {
2573 my $desc = $item->{nrof} < 2
2574 ? $item->{name}
2575 : "$item->{nrof} $item->{name_pl}";
2576
2577 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2578 }
2579
2580 $self->{scrolled}->add (@items);
2581
2582# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2583}
2584
2585sub size_request {
2586 my ($self) = @_;
2587 ($self->{req_w}, $self->{req_h});
2588} 2801}
2589 2802
2590############################################################################# 2803#############################################################################
2591 2804
2592package CFClient::UI::Menu; 2805package CFClient::UI::Menu;
… …
2627 2840
2628# popup given the event (must be a mouse button down event currently) 2841# popup given the event (must be a mouse button down event currently)
2629sub popup { 2842sub popup {
2630 my ($self, $ev) = @_; 2843 my ($self, $ev) = @_;
2631 2844
2632 $self->emit ("popdown"); 2845 $self->_emit ("popdown");
2633 2846
2634 # maybe save $GRAB? must be careful about events... 2847 # maybe save $GRAB? must be careful about events...
2635 $GRAB = $self; 2848 $GRAB = $self;
2636 $self->{button} = $ev->{button}; 2849 $self->{button} = $ev->{button};
2637 2850
2638 $self->show; 2851 $self->show;
2639 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2852 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2640} 2853}
2641 2854
2642sub mouse_motion { 2855sub mouse_motion {
2643 my ($self, $ev, $x, $y) = @_; 2856 my ($self, $ev, $x, $y) = @_;
2644 2857
… …
2652 2865
2653 if ($ev->{button} == $self->{button}) { 2866 if ($ev->{button} == $self->{button}) {
2654 undef $GRAB; 2867 undef $GRAB;
2655 $self->hide; 2868 $self->hide;
2656 2869
2657 $self->emit ("popdown"); 2870 $self->_emit ("popdown");
2658 $self->{hover}[1]->() if $self->{hover}; 2871 $self->{hover}[1]->() if $self->{hover};
2659 } 2872 }
2660} 2873}
2661 2874
2662############################################################################# 2875#############################################################################
2663 2876
2664package CFClient::UI::Statusbox; 2877package CFClient::UI::Statusbox;
2665 2878
2666our @ISA = CFClient::UI::VBox::; 2879our @ISA = CFClient::UI::VBox::;
2880
2881sub new {
2882 my $class = shift;
2883
2884 $class->SUPER::new (
2885 fontsize => 0.8,
2886 @_,
2887 )
2888}
2667 2889
2668sub reorder { 2890sub reorder {
2669 my ($self) = @_; 2891 my ($self) = @_;
2670 my $NOW = time; 2892 my $NOW = time;
2671 2893
… …
2690 ? "<b>$item->{count} ×</b> $item->{text}" 2912 ? "<b>$item->{count} ×</b> $item->{text}"
2691 : $item->{text}; 2913 : $item->{text};
2692 2914
2693 for ($short) { 2915 for ($short) {
2694 s/^\s+//; 2916 s/^\s+//;
2695 s/\012.*/…/s; 2917 s/\s+/ /g;
2696 my $len = int 40 / $item->{fontsize};
2697 substr $_, $len, length, "…" if $len < length;
2698 } 2918 }
2699 2919
2700 new CFClient::UI::Label 2920 new CFClient::UI::Label
2701 markup => $short, 2921 markup => $short,
2702 tooltip => $item->{tooltip}, 2922 tooltip => $item->{tooltip},
2703 tooltip_font => $::FONT_PROP, 2923 tooltip_font => $::FONT_PROP,
2704 tooltip_width => 0.67, 2924 tooltip_width => 0.67,
2705 fontsize => $item->{fontsize}, 2925 fontsize => $item->{fontsize} || $self->{fontsize},
2926 max_w => $::WIDTH * 0.44,
2706 color => $item->{color}, 2927 fg => $item->{fg},
2707 can_events => 1, 2928 can_events => 1,
2708 can_hover => 1 2929 can_hover => 1
2709 }; 2930 };
2710 } 2931 }
2711 2932
… …
2716sub add { 2937sub add {
2717 my ($self, $text, %arg) = @_; 2938 my ($self, $text, %arg) = @_;
2718 2939
2719 $text =~ s/^\s+//; 2940 $text =~ s/^\s+//;
2720 $text =~ s/\s+$//; 2941 $text =~ s/\s+$//;
2942
2943 return unless $text;
2721 2944
2722 my $timeout = time + ((delete $arg{timeout}) || 60); 2945 my $timeout = time + ((delete $arg{timeout}) || 60);
2723 2946
2724 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2947 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2725 2948
… …
2737 $self->{item}{$group} = { 2960 $self->{item}{$group} = {
2738 id => ++$self->{id}, 2961 id => ++$self->{id},
2739 text => $text, 2962 text => $text,
2740 timeout => $timeout, 2963 timeout => $timeout,
2741 tooltip => $text, 2964 tooltip => $text,
2742 fontsize => 0.8,
2743 color => [0.8, 0.8, 0.8, 0.8], 2965 fg => [0.8, 0.8, 0.8, 0.8],
2744 pri => 0, 2966 pri => 0,
2745 count => 1, 2967 count => 1,
2746 %arg, 2968 %arg,
2747 }; 2969 };
2748 } 2970 }
2749 2971
2750 $self->reorder; 2972 $self->reorder;
2751} 2973}
2752 2974
2975sub reconfigure {
2976 my ($self) = @_;
2977
2978 delete $_->{label}
2979 for values %{ $self->{item} || {} };
2980
2981 $self->reorder;
2982 $self->SUPER::reconfigure;
2983}
2984
2753############################################################################# 2985#############################################################################
2754 2986
2755package CFClient::UI::Root; 2987package CFClient::UI::Inventory;
2756 2988
2757our @ISA = CFClient::UI::Container::; 2989our @ISA = CFClient::UI::ScrolledWindow::;
2758
2759use CFClient::OpenGL;
2760 2990
2761sub new { 2991sub new {
2762 my $class = shift; 2992 my $class = shift;
2763 2993
2764 $class->SUPER::new ( 2994 my $self = $class->SUPER::new (
2995 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2765 @_, 2996 @_,
2766 ) 2997 );
2767}
2768 2998
2769sub configure { 2999 $self
3000}
3001
3002sub set_items {
3003 my ($self, $items) = @_;
3004
3005 $self->{scrolled}->clear;
3006 return unless $items;
3007
3008 my @items = sort {
3009 ($a->{type} <=> $b->{type})
3010 or ($a->{name} cmp $b->{name})
3011 } @$items;
3012
3013 $self->{real_items} = \@items;
3014
3015 my $row = 0;
3016 for my $item (@items) {
3017 CFClient::Item::update_widgets $item;
3018
3019 $self->{scrolled}->add (0, $row, $item->{face_widget});
3020 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3021 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3022
3023 $row++;
3024 }
3025}
3026
3027#############################################################################
3028
3029package CFClient::UI::BindEditor;
3030
3031our @ISA = CFClient::UI::FancyFrame::;
3032
3033sub new {
3034 my $class = shift;
3035
3036 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3037
3038 $self->add (my $vb = new CFClient::UI::VBox);
3039
3040
3041 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3042 text => "start recording",
3043 tooltip => "Start/Stops recording of actions."
3044 ."All subsequent actions after the recording started will be captured."
3045 ."The actions are displayed after the record was stopped."
3046 ."To bind the action you have to click on the 'Bind' button",
3047 on_activate => sub {
3048 unless ($self->{recording}) {
3049 $self->start;
3050 } else {
3051 $self->stop;
3052 }
3053 });
3054
3055 $vb->add (new CFClient::UI::Label text => "Actions:");
3056 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3057
3058 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3059 $vb->add (my $hb = new CFClient::UI::HBox);
3060 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3061 $hb->add (new CFClient::UI::Button
3062 text => "bind",
3063 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3064 on_activate => sub {
3065 $self->ask_for_bind;
3066 });
3067
3068 $vb->add (my $hb = new CFClient::UI::HBox);
3069 $hb->add (new CFClient::UI::Button
3070 text => "ok",
3071 expand => 1,
3072 tooltip => "This closes the binding editor and saves the binding",
3073 on_activate => sub {
3074 $self->hide;
3075 $self->commit;
3076 });
3077
3078 $hb->add (new CFClient::UI::Button
3079 text => "cancel",
3080 expand => 1,
3081 tooltip => "This closes the binding editor without saving",
3082 on_activate => sub {
3083 $self->hide;
3084 $self->{binding_cancel}->()
3085 if $self->{binding_cancel};
3086 });
3087
3088 $self->update_binding_widgets;
3089
3090 $self
3091}
3092
3093sub commit {
3094 my ($self) = @_;
3095 my ($mod, $sym, $cmds) = $self->get_binding;
3096 if ($sym != 0 && @$cmds > 0) {
3097 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3098 ."'. Don't forget 'Save Config'!");
3099 $self->{binding_change}->($mod, $sym, $cmds)
3100 if $self->{binding_change};
3101 } else {
3102 $::STATUSBOX->add ("No action bound, no key or action specified!");
3103 $self->{binding_cancel}->()
3104 if $self->{binding_cancel};
3105 }
3106}
3107
3108sub start {
3109 my ($self) = @_;
3110
3111 $self->{rec_btn}->set_text ("stop recording");
3112 $self->{recording} = 1;
3113 $self->clear_command_list;
3114 $::CONN->start_record if $::CONN;
3115}
3116
3117sub stop {
3118 my ($self) = @_;
3119
3120 $self->{rec_btn}->set_text ("start recording");
3121 $self->{recording} = 0;
3122
3123 my $rec;
3124 $rec = $::CONN->stop_record if $::CONN;
3125 return unless ref $rec eq 'ARRAY';
3126 $self->set_command_list ($rec);
3127}
3128
3129# if $commit is true, the binding will be set after the user entered a key combo
3130sub ask_for_bind {
3131 my ($self, $commit) = @_;
3132
3133 CFClient::Binder::open_binding_dialog (sub {
3134 my ($mod, $sym) = @_;
3135 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3136 $self->update_binding_widgets;
3137 $self->commit if $commit;
3138 });
3139}
3140
3141# $mod and $sym are the modifiers and key symbol
3142# $cmds is a array ref of strings (the commands)
3143# $cb is the callback that is executed on OK
3144# $ccb is the callback that is executed on CANCEL and
3145# when the binding was unsuccessful on OK
3146sub set_binding {
2770 my ($self, $x, $y, $w, $h) = @_; 3147 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2771 3148
2772 $self->{w} = $w; 3149 $self->clear_command_list;
2773 $self->{h} = $h; 3150 $self->{recording} = 0;
2774} 3151 $self->{rec_btn}->set_text ("start recording");
2775 3152
2776sub check_size { 3153 $self->{binding} = [$mod, $sym];
3154 $self->{commands} = $cmds;
3155
3156 $self->{binding_change} = $cb;
3157 $self->{binding_cancel} = $ccb;
3158
3159 $self->update_binding_widgets;
3160}
3161
3162# this is a shortcut method that asks for a binding
3163# and then just binds it.
3164sub do_quick_binding {
2777 my ($self) = @_; 3165 my ($self, $cmds) = @_;
3166 $self->set_binding (undef, undef, $cmds, sub {
3167 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3168 });
3169 $self->ask_for_bind (1);
3170}
2778 3171
2779 $self->size_allocate ($self->{w}, $self->{h}) 3172sub update_binding_widgets {
2780 if $self->{w}; 3173 my ($self) = @_;
3174 my ($mod, $sym, $cmds) = $self->get_binding;
3175 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3176 $self->set_command_list ($cmds);
3177}
3178
3179sub get_binding {
3180 my ($self) = @_;
3181 return (
3182 $self->{binding}->[0],
3183 $self->{binding}->[1],
3184 [ grep { defined $_ } @{$self->{commands}} ]
3185 );
3186}
3187
3188sub clear_command_list {
3189 my ($self) = @_;
3190 $self->{cmdbox}->clear ();
3191}
3192
3193sub set_command_list {
3194 my ($self, $cmds) = @_;
3195
3196 $self->{cmdbox}->clear ();
3197 $self->{commands} = $cmds;
3198
3199 my $idx = 0;
3200
3201 for (@$cmds) {
3202 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3203
3204 my $i = $idx;
3205 $hb->add (new CFClient::UI::Label text => $_);
3206 $hb->add (new CFClient::UI::Button
3207 text => "delete",
3208 tooltip => "Deletes the action from the record",
3209 on_activate => sub {
3210 $self->{cmdbox}->remove ($hb);
3211 $cmds->[$i] = undef;
3212 });
3213
3214
3215 $idx++
3216 }
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::SpellList;
3222
3223our @ISA = CFClient::UI::FancyFrame::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3229
3230 $self->add (new CFClient::UI::ScrolledWindow
3231 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3232
3233 $self;
3234}
3235
3236# XXX: Do sorting? Argl...
3237sub add_spell {
3238 my ($self, $spell) = @_;
3239 $self->{spells}->{$spell->{name}} = $spell;
3240
3241 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3242 face => $spell->{face},
3243 can_hover => 1,
3244 can_events => 1,
3245 tooltip => $spell->{message});
3246
3247 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3248 text => $spell->{name},
3249 can_hover => 1,
3250 can_events => 1,
3251 tooltip => $spell->{message},
3252 expand => 1);
3253
3254 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3255 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3256 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3257 expand => 1);
3258
3259 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3260 text => "bind to key",
3261 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3262}
3263
3264sub rebuild_spell_list {
3265 my ($self) = @_;
3266 $self->{tbl_idx} = 0;
3267 $self->add_spell ($_) for values %{$self->{spells}};
3268}
3269
3270sub remove_spell {
3271 my ($self, $spell) = @_;
3272 delete $self->{spells}->{$spell->{name}};
3273 $self->rebuild_spell_list;
3274}
3275
3276#############################################################################
3277
3278package CFClient::UI::Root;
3279
3280our @ISA = CFClient::UI::Container::;
3281
3282use CFClient::OpenGL;
3283
3284sub new {
3285 my $class = shift;
3286
3287 my $self = $class->SUPER::new (
3288 visible => 1,
3289 @_,
3290 );
3291
3292 Scalar::Util::weaken ($self->{root} = $self);
3293
3294 $self
2781} 3295}
2782 3296
2783sub size_request { 3297sub size_request {
2784 my ($self) = @_; 3298 my ($self) = @_;
2785 3299
2786 ($self->{w}, $self->{h}) 3300 ($self->{w}, $self->{h})
3301}
3302
3303sub _to_pixel {
3304 my ($coord, $size, $max) = @_;
3305
3306 $coord =
3307 $coord eq "center" ? ($max - $size) * 0.5
3308 : $coord eq "max" ? $max
3309 : $coord;
3310
3311 $coord = 0 if $coord < 0;
3312 $coord = $max - $size if $coord > $max - $size;
3313
3314 int $coord + 0.5
2787} 3315}
2788 3316
2789sub size_allocate { 3317sub size_allocate {
2790 my ($self, $w, $h) = @_; 3318 my ($self, $w, $h) = @_;
2791 3319
2792 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2793 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2794
2795 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2796 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2797
2798 for my $child ($self->children) { 3320 for my $child ($self->children) {
2799 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3321 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2800 3322
2801 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3323 $X = $child->{force_x} if exists $child->{force_x};
2802 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3324 $Y = $child->{force_y} if exists $child->{force_y};
3325
3326 $X = _to_pixel $X, $W, $self->{w};
3327 $Y = _to_pixel $Y, $H, $self->{h};
3328
2803 $child->configure ($X, $Y, $W, $H); 3329 $child->configure ($X, $Y, $W, $H);
2804 } 3330 }
2805} 3331}
2806 3332
2807sub coord2local { 3333sub coord2local {
… …
2817} 3343}
2818 3344
2819sub update { 3345sub update {
2820 my ($self) = @_; 3346 my ($self) = @_;
2821 3347
2822 $self->check_size;
2823 $::WANT_REFRESH++; 3348 $::WANT_REFRESH++;
2824} 3349}
2825 3350
2826sub add { 3351sub add {
2827 my ($self, @children) = @_; 3352 my ($self, @children) = @_;
2828 3353
2829 for my $child (@children) {
2830 $child->{toplevel} = 1; 3354 $_->{is_toplevel} = 1
2831 3355 for @children;
2832 # integerise window positions
2833 $child->{x} = int $child->{x};
2834 $child->{y} = int $child->{y};
2835 }
2836 3356
2837 $self->SUPER::add (@children); 3357 $self->SUPER::add (@children);
3358}
3359
3360sub remove {
3361 my ($self, @children) = @_;
3362
3363 $self->SUPER::remove (@children);
3364
3365 delete $self->{is_toplevel}
3366 for @children;
3367
3368 while (@children) {
3369 my $w = pop @children;
3370 push @children, $w->children;
3371 $w->set_invisible;
3372 }
2838} 3373}
2839 3374
2840sub on_refresh { 3375sub on_refresh {
2841 my ($self, $id, $cb) = @_; 3376 my ($self, $id, $cb) = @_;
2842 3377
… …
2855 while ($self->{refresh_hook}) { 3390 while ($self->{refresh_hook}) {
2856 $_->() 3391 $_->()
2857 for values %{delete $self->{refresh_hook}}; 3392 for values %{delete $self->{refresh_hook}};
2858 } 3393 }
2859 3394
2860 if ($self->{check_size}) { 3395 if ($self->{realloc}) {
2861 my @queue = ([], []); 3396 my %queue;
3397 my @queue;
3398 my $widget;
2862 3399
2863 for (;;) { 3400 outer:
2864 if ($self->{check_size}) { 3401 while () {
2865 # heuristic: check containers last 3402 if (my $realloc = delete $self->{realloc}) {
2866 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3403 for $widget (values %$realloc) {
2867 for values %{delete $self->{check_size}} 3404 $widget->{visible} or next; # do not resize invisible widgets
3405
3406 $queue{$widget+0}++ and next; # duplicates are common
3407
3408 push @{ $queue[$widget->{visible}] }, $widget;
3409 }
2868 } 3410 }
2869 3411
2870 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3412 while () {
3413 @queue or last outer;
2871 3414
2872 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3415 $widget = pop @{ $queue[-1] || [] }
2873 ? @$widget{qw(user_w user_h)} 3416 and last;
2874 : $widget->size_request;
2875
2876 if (delete $widget->{force_alloc}
2877 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2878 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2879 3417
3418 pop @queue;
3419 }
3420
3421 delete $queue{$widget+0};
3422
3423 my ($w, $h) = $widget->size_request;
3424
3425 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3426 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3427
3428 $w = $widget->{force_w} if exists $widget->{force_w};
3429 $h = $widget->{force_h} if exists $widget->{force_h};
3430
3431 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3432 || delete $widget->{force_realloc}) {
2880 $widget->{req_w} = $w; 3433 $widget->{req_w} = $w;
2881 $widget->{req_h} = $h; 3434 $widget->{req_h} = $h;
2882 3435
2883 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3436 $self->{size_alloc}{$widget+0} = $widget;
2884 3437
2885 $widget->{parent}->check_size
2886 if $widget->{parent}; 3438 if (my $parent = $widget->{parent}) {
3439 $self->{realloc}{$parent+0} = $parent
3440 unless $queue{$parent+0};
3441
3442 $parent->{force_size_alloc} = 1;
3443 $self->{size_alloc}{$parent+0} = $parent;
3444 }
2887 } 3445 }
3446
3447 delete $self->{realloc}{$widget+0};
2888 } 3448 }
2889 } 3449 }
2890 3450
2891 while ($self->{size_alloc}) { 3451 while (my $size_alloc = delete $self->{size_alloc}) {
2892 for (values %{delete $self->{size_alloc}}) { 3452 my @queue = sort { $b->{visible} <=> $a->{visible} }
2893 my ($widget, $w, $h) = @$_; 3453 values %$size_alloc;
3454
3455 while () {
3456 my $widget = pop @queue || last;
3457
3458 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2894 3459
2895 $w = 0 if $w < 0; 3460 $w = 0 if $w < 0;
2896 $h = 0 if $h < 0; 3461 $h = 0 if $h < 0;
2897 3462
3463 $w = int $w + 0.5;
3464 $h = int $h + 0.5;
3465
3466 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3467 $widget->{old_w} = $widget->{w};
3468 $widget->{old_h} = $widget->{h};
3469
2898 $widget->{w} = $w; 3470 $widget->{w} = $w;
2899 $widget->{h} = $h; 3471 $widget->{h} = $h;
2900 $widget->size_allocate ($w, $h); 3472
2901 $widget->emit (size_allocate => $w, $h); 3473 $widget->emit (size_allocate => $w, $h);
3474 }
2902 } 3475 }
2903 } 3476 }
2904 3477
2905 while ($self->{post_alloc_hook}) { 3478 while ($self->{post_alloc_hook}) {
2906 $_->() 3479 $_->()
2907 for values %{delete $self->{post_alloc_hook}}; 3480 for values %{delete $self->{post_alloc_hook}};
2908 } 3481 }
2909 3482
3483
2910 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3484 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2911 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3485 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2912 glClear GL_COLOR_BUFFER_BIT; 3486 glClear GL_COLOR_BUFFER_BIT;
2913 3487
2914 glMatrixMode GL_PROJECTION; 3488 glMatrixMode GL_PROJECTION;
2915 glLoadIdentity; 3489 glLoadIdentity;
2916 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3490 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2917 glMatrixMode GL_MODELVIEW; 3491 glMatrixMode GL_MODELVIEW;
2918 glLoadIdentity; 3492 glLoadIdentity;
2919 3493
3494 {
3495 package CFClient::UI::Base;
3496
3497 ($draw_x, $draw_y, $draw_w, $draw_h) =
3498 (0, 0, $self->{w}, $self->{h});
3499 }
3500
2920 $self->_draw; 3501 $self->_draw;
2921} 3502}
2922 3503
2923############################################################################# 3504#############################################################################
2924 3505
2925package CFClient::UI; 3506package CFClient::UI;
2926 3507
2927$ROOT = new CFClient::UI::Root; 3508$ROOT = new CFClient::UI::Root;
2928$TOOLTIP = new CFClient::UI::Tooltip; 3509$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2929 3510
29301 35111
2931 3512

Diff Legend

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