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.179 by elmex, Fri Apr 28 05:17:21 2006 UTC vs.
Revision 1.323 by root, Wed Jul 5 03:01:01 2006 UTC

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

Diff Legend

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