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.232 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.311 by root, Fri Jun 23 22:35:16 2006 UTC

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

Diff Legend

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