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.240 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.324 by root, Wed Jul 12 17:20:04 2006 UTC

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

Diff Legend

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