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

Diff Legend

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