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

Diff Legend

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