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

Diff Legend

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