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

Diff Legend

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