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.176 by root, Tue Apr 25 12:10:58 2006 UTC vs.
Revision 1.314 by root, Mon Jun 26 21:59:04 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 my $focus = $FOCUS; $FOCUS = $self;
302 429
303 $self->emit (focus_in => $focus);
304
305 $focus->update if $focus; 430 $focus->update if $focus;
306 $FOCUS->update; 431 $FOCUS->update;
307}
308 432
433 0
434}
435
309sub focus_out { 436sub invoke_focus_out {
310 my ($self) = @_; 437 my ($self) = @_;
311 438
312 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
313 440
314 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
315 442
316 $self->emit (focus_out => $focus);
317
318 $focus->update if $focus; #? 443 $focus->update if $focus; #?
319}
320 444
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
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->hide };
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
834sub button_down { 1160sub invoke_button_down {
835 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
836 1162
837 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
838 my $border = $self->border; 1164 my $border = $self->border;
839 1165
… …
852 my ($ev, $x, $y) = @_; 1178 my ($ev, $x, $y) = @_;
853 1179
854 my $dx = $ev->{x} - $ox; 1180 my $dx = $ev->{x} - $ox;
855 my $dy = $ev->{y} - $oy; 1181 my $dy = $ev->{y} - $oy;
856 1182
857 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1183 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
858 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1184 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1185
859 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1186 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
860 $self->check_size; 1187 $self->realloc;
861 }; 1188 };
862 1189
863 } elsif ($lr ^ $td) { 1190 } elsif ($lr ^ $td) {
864 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1191 my ($ox, $oy) = ($ev->{x}, $ev->{y});
865 my ($bx, $by) = ($self->{x}, $self->{y}); 1192 my ($bx, $by) = ($self->{x}, $self->{y});
… …
867 $self->{motion} = sub { 1194 $self->{motion} = sub {
868 my ($ev, $x, $y) = @_; 1195 my ($ev, $x, $y) = @_;
869 1196
870 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
871 1198
872 $self->move ($bx + $x - $ox, $by + $y - $oy); 1199 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
873 $self->update; 1200 # HACK: the next line is required to enforce placement
1201 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
874 }; 1202 };
1203 } else {
1204 return 0;
1205 }
1206
875 } 1207 1
876} 1208}
877 1209
878sub button_up { 1210sub invoke_button_up {
879 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
880 1212
881 delete $self->{motion}; 1213 ! ! delete $self->{motion}
882} 1214}
883 1215
884sub mouse_motion { 1216sub invoke_mouse_motion {
885 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
886 1218
887 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220
1221 ! ! $self->{motion}
888} 1222}
889 1223
890sub _draw { 1224sub _draw {
891 my ($self) = @_; 1225 my ($self) = @_;
892 1226
1227 my $child = $self->{children}[0];
1228
893 my ($w, $h ) = ($self->{w}, $self->{h}); 1229 my ($w, $h ) = ($self->{w}, $self->{h});
894 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1230 my ($cw, $ch) = ($child->{w}, $child->{h});
895 1231
896 glEnable GL_BLEND;
897 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
898 glEnable GL_TEXTURE_2D; 1232 glEnable GL_TEXTURE_2D;
899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
900 1234
901 my $border = $self->border; 1235 my $border = $self->border;
902 1236
903 glColor @{ $self->{border_bg} }; 1237 glColor @{ $self->{border_bg} };
904 $tex[1]->draw_quad (0, 0, $w, $border); 1238 $border[0]->draw_quad_alpha (0, 0, $w, $border);
905 $tex[3]->draw_quad (0, $border, $border, $ch); 1239 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1240 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
907 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1241 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
908 1242
909 my $bg = $tex[0]; 1243 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1244 glColor @{ $self->{bg} };
910 1245
911 # TODO: repeat texture not scale 1246 # TODO: repeat texture not scale
912 my $rep_x = $cw / $bg->{w}; 1247 # solve this better(?)
913 my $rep_y = $ch / $bg->{h}; 1248 $bg->{s} = $cw / $bg->{w};
914 1249 $bg->{t} = $ch / $bg->{h};
915 glColor @{ $self->{bg} };
916
917 $bg->{s} = $rep_x;
918 $bg->{t} = $rep_y;
919 $bg->{wrap_mode} = 1;
920 $bg->draw_quad ($border, $border, $cw, $ch); 1250 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1251 }
921 1252
922 glDisable GL_TEXTURE_2D; 1253 glDisable GL_TEXTURE_2D;
923 glDisable GL_BLEND;
924 1254
925 $self->{title}->draw if $self->{title};
926 $self->child->draw; 1255 $child->draw;
1256
1257 if ($self->{title_widget}) {
1258 glTranslate 0, $border - $self->{h};
1259 $self->{title_widget}->_draw;
1260
1261 glTranslate 0, - ($border - $self->{h});
1262 }
1263
1264 $self->{close_button}->draw
1265 if $self->{close_button};
927} 1266}
928 1267
929############################################################################# 1268#############################################################################
930 1269
931package CFClient::UI::Table; 1270package CFClient::UI::Table;
… …
939sub new { 1278sub new {
940 my $class = shift; 1279 my $class = shift;
941 1280
942 $class->SUPER::new ( 1281 $class->SUPER::new (
943 col_expand => [], 1282 col_expand => [],
944 @_ 1283 @_,
945 ) 1284 )
1285}
1286
1287sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} }
946} 1289}
947 1290
948sub add { 1291sub add {
949 my ($self, $x, $y, $child) = @_; 1292 my ($self, $x, $y, $child) = @_;
950 1293
951 $child->set_parent ($self); 1294 $child->set_parent ($self);
952 $self->{children}[$y][$x] = $child; 1295 $self->{children}[$y][$x] = $child;
953 1296
954 $child->check_size; 1297 $self->realloc;
955} 1298}
956 1299
957sub children { 1300sub remove {
958 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1301 my ($self, $child) = @_;
959}
960 1302
1303 # TODO: not yet implemented
1304}
1305
961# TODO: move to container class maybe? send childs a signal on removal? 1306# TODO: move to container class maybe? send children a signal on removal?
962sub clear { 1307sub clear {
963 my ($self) = @_; 1308 my ($self) = @_;
964 1309
965 my @children = $self->children; 1310 my @children = $self->children;
966 delete $self->{children}; 1311 delete $self->{children};
… …
968 for (@children) { 1313 for (@children) {
969 delete $_->{parent}; 1314 delete $_->{parent};
970 $_->hide; 1315 $_->hide;
971 } 1316 }
972 1317
973 $self->update; 1318 $self->realloc;
974} 1319}
975 1320
976sub get_wh { 1321sub get_wh {
977 my ($self) = @_; 1322 my ($self) = @_;
978 1323
… …
1004 (sum @$ws), 1349 (sum @$ws),
1005 (sum @$hs), 1350 (sum @$hs),
1006 ) 1351 )
1007} 1352}
1008 1353
1009sub size_allocate { 1354sub invoke_size_allocate {
1010 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1011 1356
1012 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1013 1358
1014 my $req_w = sum @$ws; 1359 my $req_w = (sum @$ws) || 1;
1015 my $req_h = sum @$hs; 1360 my $req_h = (sum @$hs) || 1;
1016 1361
1017 # TODO: nicer code && do row_expand 1362 # TODO: nicer code && do row_expand
1018 my @col_expand = @{$self->{col_expand}}; 1363 my @col_expand = @{$self->{col_expand}};
1019 @col_expand = (1) x @$ws unless @col_expand; 1364 @col_expand = (1) x @$ws unless @col_expand;
1020 my $col_expand = (sum @col_expand) || 1; 1365 my $col_expand = (sum @col_expand) || 1;
… …
1046 } 1391 }
1047 1392
1048 $y += $row_h; 1393 $y += $row_h;
1049 } 1394 }
1050 1395
1396 1
1051} 1397}
1052 1398
1053sub find_widget { 1399sub find_widget {
1054 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1055 1401
… …
1074 } 1420 }
1075} 1421}
1076 1422
1077############################################################################# 1423#############################################################################
1078 1424
1425package CFClient::UI::Box;
1426
1427our @ISA = CFClient::UI::Container::;
1428
1429sub size_request {
1430 my ($self) = @_;
1431
1432 $self->{vertical}
1433 ? (
1434 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1435 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1436 )
1437 : (
1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1439 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1440 )
1441}
1442
1443sub invoke_size_allocate {
1444 my ($self, $w, $h) = @_;
1445
1446 my $space = $self->{vertical} ? $h : $w;
1447 my @children = $self->visible_children;
1448
1449 my @req;
1450
1451 if ($self->{homogeneous}) {
1452 @req = ($space / (@children || 1)) x @children;
1453 } else {
1454 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1455 my $req = List::Util::sum @req;
1456
1457 if ($req > $space) {
1458 # ah well, not enough space
1459 $_ *= $space / $req for @req;
1460 } else {
1461 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1462
1463 $space = ($space - $req) / $expand; # remaining space to give away
1464
1465 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children;
1467 }
1468 }
1469
1470 CFClient::UI::harmonize \@req;
1471
1472 my $pos = 0;
1473 for (0 .. $#children) {
1474 my $alloc = $req[$_];
1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1476
1477 $pos += $alloc;
1478 }
1479
1480 1
1481}
1482
1483#############################################################################
1484
1079package CFClient::UI::HBox; 1485package CFClient::UI::HBox;
1080 1486
1081# TODO: wrap into common Box base class
1082
1083our @ISA = CFClient::UI::Container::; 1487our @ISA = CFClient::UI::Box::;
1084 1488
1085sub size_request { 1489sub new {
1086 my ($self) = @_; 1490 my $class = shift;
1087 1491
1088 my @alloc = map [$_->size_request], @{$self->{children}}; 1492 $class->SUPER::new (
1089 1493 vertical => 0,
1090 ( 1494 @_,
1091 (List::Util::sum map $_->[0], @alloc),
1092 (List::Util::max map $_->[1], @alloc),
1093 ) 1495 )
1094} 1496}
1095 1497
1096sub size_allocate {
1097 my ($self, $w, $h) = @_;
1098
1099 ($h, $w) = ($w, $h);
1100
1101 my $children = $self->{children};
1102
1103 my @h = map $_->{req_w}, @$children;
1104
1105 my $req_h = List::Util::sum @h;
1106
1107 if ($req_h > $h) {
1108 # ah well, not enough space
1109 $_ *= $h / $req_h for @h;
1110 } else {
1111 my $exp = List::Util::sum map $_->{expand}, @$children;
1112 $exp ||= 1;
1113
1114 for (0 .. $#$children) {
1115 my $child = $children->[$_];
1116
1117 my $alloc_h = $h[$_];
1118 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1119 $h[$_] = $alloc_h;
1120 }
1121 }
1122
1123 CFClient::UI::harmonize \@h;
1124
1125 my $y = 0;
1126 for (0 .. $#$children) {
1127 my $child = $children->[$_];
1128 my $h = $h[$_];
1129 $child->configure ($y, 0, $h, $w);
1130
1131 $y += $h;
1132 }
1133
1134 1
1135}
1136
1137############################################################################# 1498#############################################################################
1138 1499
1139package CFClient::UI::VBox; 1500package CFClient::UI::VBox;
1140 1501
1141# TODO: wrap into common Box base class
1142
1143our @ISA = CFClient::UI::Container::; 1502our @ISA = CFClient::UI::Box::;
1144 1503
1145sub size_request { 1504sub new {
1146 my ($self) = @_; 1505 my $class = shift;
1147 1506
1148 my @alloc = map [$_->size_request], @{$self->{children}}; 1507 $class->SUPER::new (
1149 1508 vertical => 1,
1150 ( 1509 @_,
1151 (List::Util::max map $_->[0], @alloc),
1152 (List::Util::sum map $_->[1], @alloc),
1153 ) 1510 )
1154} 1511}
1155 1512
1156sub size_allocate {
1157 my ($self, $w, $h) = @_;
1158
1159 my $children = $self->{children};
1160
1161 my @h = map $_->{req_h}, @$children;
1162
1163 my $req_h = List::Util::sum @h;
1164
1165 if ($req_h > $h) {
1166 # ah well, not enough space
1167 $_ *= $h / $req_h for @h;
1168 } else {
1169 my $exp = List::Util::sum map $_->{expand}, @$children;
1170 $exp ||= 1;
1171
1172 for (0 .. $#$children) {
1173 my $child = $children->[$_];
1174
1175 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1176 }
1177 }
1178
1179 CFClient::UI::harmonize \@h;
1180
1181 my $y = 0;
1182 for (0 .. $#$children) {
1183 my $child = $children->[$_];
1184 my $h = $h[$_];
1185 $child->configure (0, $y, $w, $h);
1186
1187 $y += $h;
1188 }
1189
1190 1
1191}
1192
1193############################################################################# 1513#############################################################################
1194 1514
1195package CFClient::UI::Label; 1515package CFClient::UI::Label;
1196 1516
1197our @ISA = CFClient::UI::Base::; 1517our @ISA = CFClient::UI::DrawBG::;
1198 1518
1199use CFClient::OpenGL; 1519use CFClient::OpenGL;
1200 1520
1201sub new { 1521sub new {
1202 my ($class, %arg) = @_; 1522 my ($class, %arg) = @_;
1203 1523
1204 my $self = $class->SUPER::new ( 1524 my $self = $class->SUPER::new (
1205 fg => [1, 1, 1], 1525 fg => [1, 1, 1],
1526 #bg => none
1527 #active_bg => none
1206 #font => default_font 1528 #font => default_font
1529 #text => initial text
1530 #markup => initial narkup
1531 #max_w => maximum pixel width
1532 ellipsise => 3, # end
1533 layout => (new CFClient::Layout),
1207 fontsize => 1, 1534 fontsize => 1,
1208 text => "",
1209 align => -1, 1535 align => -1,
1210 valign => -1, 1536 valign => -1,
1211 padding => 2, 1537 padding_x => 2,
1212 layout => new CFClient::Layout, 1538 padding_y => 2,
1213 can_events => 0, 1539 can_events => 0,
1214 %arg 1540 %arg
1215 ); 1541 );
1216 1542
1217 if (exists $self->{template}) { 1543 if (exists $self->{template}) {
1218 my $layout = new CFClient::Layout; 1544 my $layout = new CFClient::Layout;
1219 $layout->set_text (delete $self->{template}); 1545 $layout->set_text (delete $self->{template});
1220 $self->{template} = $layout; 1546 $self->{template} = $layout;
1221 } 1547 }
1222 1548
1223 $self->set_text (delete $self->{text}) if exists $self->{text}; 1549 if (exists $self->{markup}) {
1224 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1550 $self->set_markup (delete $self->{markup});
1551 } else {
1552 $self->set_text (delete $self->{text});
1553 }
1225 1554
1226 $self 1555 $self
1227} 1556}
1228 1557
1229sub escape { 1558sub escape($) {
1230 local $_ = $_[1]; 1559 local $_ = $_[0];
1231 1560
1232 s/&/&amp;/g; 1561 s/&/&amp;/g;
1233 s/>/&gt;/g; 1562 s/>/&gt;/g;
1234 s/</&lt;/g; 1563 s/</&lt;/g;
1235 1564
1236 $_[1] 1565 $_
1237} 1566}
1238 1567
1239sub update { 1568sub update {
1240 my ($self) = @_; 1569 my ($self) = @_;
1241 1570
1242 delete $self->{texture}; 1571 delete $self->{texture};
1243 $self->SUPER::update; 1572 $self->SUPER::update;
1244} 1573}
1245 1574
1246sub reconfigure { 1575sub realloc {
1247 my ($self) = @_; 1576 my ($self) = @_;
1248 1577
1249 delete $self->{texture}; 1578 delete $self->{ox};
1579 $self->SUPER::realloc;
1250} 1580}
1251 1581
1252sub set_text { 1582sub set_text {
1253 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1254 1584
1255 return if $self->{text} eq "T$text"; 1585 return if $self->{text} eq "T$text";
1256 $self->{text} = "T$text"; 1586 $self->{text} = "T$text";
1257 1587
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1258 $self->{layout}->set_text ($text); 1589 $self->{layout}->set_text ($text);
1259 1590
1260 delete $self->{texture}; 1591 delete $self->{size_req};
1592 $self->realloc;
1261 $self->update; 1593 $self->update;
1262 $self->check_size;
1263} 1594}
1264 1595
1265sub set_markup { 1596sub set_markup {
1266 my ($self, $markup) = @_; 1597 my ($self, $markup) = @_;
1267 1598
1268 return if $self->{text} eq "M$markup"; 1599 return if $self->{text} eq "M$markup";
1269 $self->{text} = "M$markup"; 1600 $self->{text} = "M$markup";
1270 1601
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1271 $self->{layout}->set_markup ($markup); 1605 $self->{layout}->set_markup ($markup);
1272 1606
1273 delete $self->{texture}; 1607 delete $self->{size_req};
1608 $self->realloc;
1274 $self->update; 1609 $self->update;
1275 $self->check_size;
1276} 1610}
1277 1611
1278sub size_request { 1612sub size_request {
1279 my ($self) = @_; 1613 my ($self) = @_;
1280 1614
1615 $self->{size_req} ||= do {
1281 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1616 $self->{layout}->set_font ($self->{font}) if $self->{font};
1282 $self->{layout}->set_width ($self->{max_w} || -1); 1617 $self->{layout}->set_width ($self->{max_w} || -1);
1618 $self->{layout}->set_ellipsise ($self->{ellipsise});
1619 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1283 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1620 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1284 1621
1285 my ($w, $h) = $self->{layout}->size; 1622 my ($w, $h) = $self->{layout}->size;
1286 1623
1287 if (exists $self->{template}) { 1624 if (exists $self->{template}) {
1288 $self->{template}->set_font ($self->{font}) if $self->{font}; 1625 $self->{template}->set_font ($self->{font}) if $self->{font};
1289 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1290 1627
1291 my ($w2, $h2) = $self->{template}->size; 1628 my ($w2, $h2) = $self->{template}->size;
1292 1629
1293 $w = List::Util::max $w, $w2; 1630 $w = List::Util::max $w, $w2;
1294 $h = List::Util::max $h, $h2; 1631 $h = List::Util::max $h, $h2;
1632 }
1633
1634 [$w, $h]
1295 } 1635 };
1296 1636
1297 ( 1637 @{ $self->{size_req} }
1298 $w + $self->{padding} * 2,
1299 $h + $self->{padding} * 2,
1300 )
1301} 1638}
1302 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1303sub size_allocate { 1644sub invoke_size_allocate {
1304 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1305 1646
1647 delete $self->{ox};
1648
1306 delete $self->{texture}; 1649 delete $self->{texture}
1650 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1651
1652 1
1307} 1653}
1308 1654
1309sub set_fontsize { 1655sub set_fontsize {
1310 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1311 1657
1312 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1313 delete $self->{texture}; 1659 delete $self->{texture};
1314 $self->check_size; 1660
1315 $self->update; 1661 $self->realloc;
1662}
1663
1664sub reconfigure {
1665 my ($self) = @_;
1666
1667 delete $self->{size_req};
1668
1669 $self->SUPER::reconfigure;
1316} 1670}
1317 1671
1318sub _draw { 1672sub _draw {
1319 my ($self) = @_; 1673 my ($self) = @_;
1320 1674
1675 $self->SUPER::_draw; # draw background, if applicable
1676
1321 my $tex = $self->{texture} ||= do { 1677 my $tex = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}});
1322 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1679 $self->{layout}->set_font ($self->{font}) if $self->{font};
1323 $self->{layout}->set_width ($self->{w}); 1680 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1324 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684
1325 new_from_layout CFClient::Texture $self->{layout} 1685 new_from_layout CFClient::Texture $self->{layout}
1326 }; 1686 };
1327 1687
1328 glEnable GL_BLEND; 1688 unless (exists $self->{ox}) {
1329 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5);
1692
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5);
1696 };
1697
1330 glEnable GL_TEXTURE_2D; 1698 glEnable GL_TEXTURE_2D;
1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1702
1703 if ($tex->{format} == GL_ALPHA) {
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705 glColor @{$self->{fg}};
1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707 } else {
1331 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1332 1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1333 glColor @{$self->{fg}}; 1710 }
1334
1335 $self->{ox} = int (
1336 $self->{align} < 0 ? $self->{padding}
1337 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1338 : ($self->{w} - $tex->{w}) * 0.5
1339 );
1340
1341 $self->{oy} = int (
1342 $self->{valign} < 0 ? $self->{padding}
1343 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1344 : ($self->{h} - $tex->{h}) * 0.5
1345 );
1346
1347 $tex->draw_quad ($self->{ox}, $self->{oy});
1348 1711
1349 glDisable GL_TEXTURE_2D; 1712 glDisable GL_TEXTURE_2D;
1350 glDisable GL_BLEND;
1351} 1713}
1352 1714
1353############################################################################# 1715#############################################################################
1354 1716
1355package CFClient::UI::EntryBase; 1717package CFClient::UI::EntryBase;
… …
1368 active_fg => [0, 0, 0], 1730 active_fg => [0, 0, 0],
1369 can_hover => 1, 1731 can_hover => 1,
1370 can_focus => 1, 1732 can_focus => 1,
1371 valign => 0, 1733 valign => 0,
1372 can_events => 1, 1734 can_events => 1,
1735 #text => ...
1736 #hidden => "*",
1373 @_ 1737 @_
1374 ) 1738 )
1375} 1739}
1376 1740
1377sub _set_text { 1741sub _set_text {
… …
1379 1743
1380 delete $self->{cur_h}; 1744 delete $self->{cur_h};
1381 1745
1382 return if $self->{text} eq $text; 1746 return if $self->{text} eq $text;
1383 1747
1384 delete $self->{texture};
1385
1386 $self->{last_activity} = $::NOW; 1748 $self->{last_activity} = $::NOW;
1387 $self->{text} = $text; 1749 $self->{text} = $text;
1388 1750
1389 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1390 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1753 delete $self->{size_req};
1391 1754
1392 $self->emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1756
1757 $self->realloc;
1758 $self->update;
1759}
1760
1761sub set_text {
1762 my ($self, $text) = @_;
1763
1764 $self->{cursor} = length $text;
1765 $self->_set_text ($text);
1393} 1766}
1394 1767
1395sub get_text { 1768sub get_text {
1396 $_[0]{text} 1769 $_[0]{text}
1397} 1770}
… …
1402 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1403 1776
1404 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1405} 1778}
1406 1779
1407sub size_allocate {
1408 my ($self, $w, $h) = @_;
1409
1410 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1411}
1412
1413sub set_text {
1414 my ($self, $text) = @_;
1415
1416 $self->{cursor} = length $text;
1417 $self->_set_text ($text);
1418 $self->update;
1419}
1420
1421sub key_down { 1780sub invoke_key_down {
1422 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1423 1782
1424 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1425 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1426 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
1427 1786
1428 my $text = $self->get_text; 1787 my $text = $self->get_text;
1429 1788
1430 if ($sym == 8) { 1789 if ($uni == 8) {
1431 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1790 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1432 } elsif ($sym == 127) { 1791 } elsif ($uni == 127) {
1433 substr $text, $self->{cursor}, 1, ""; 1792 substr $text, $self->{cursor}, 1, "";
1434 } elsif ($sym == CFClient::SDLK_LEFT) { 1793 } elsif ($sym == CFClient::SDLK_LEFT) {
1435 --$self->{cursor} if $self->{cursor}; 1794 --$self->{cursor} if $self->{cursor};
1436 } elsif ($sym == CFClient::SDLK_RIGHT) { 1795 } elsif ($sym == CFClient::SDLK_RIGHT) {
1437 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1796 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1438 } elsif ($sym == CFClient::SDLK_HOME) { 1797 } elsif ($sym == CFClient::SDLK_HOME) {
1439 $self->{cursor} = 0; 1798 $self->{cursor} = 0;
1440 } elsif ($sym == CFClient::SDLK_END) { 1799 } elsif ($sym == CFClient::SDLK_END) {
1441 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1442 } elsif ($sym == 27) { 1801 } elsif ($uni == 27) {
1443 $self->emit ('escape'); 1802 $self->emit ('escape');
1444 } elsif ($uni) { 1803 } elsif ($uni) {
1445 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else {
1806 return 0;
1446 } 1807 }
1447 1808
1448 $self->_set_text ($text); 1809 $self->_set_text ($text);
1449 $self->update;
1450}
1451 1810
1811 $self->realloc;
1812
1813 1
1814}
1815
1452sub focus_in { 1816sub invoke_focus_in {
1453 my ($self) = @_; 1817 my ($self) = @_;
1454 1818
1455 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1456 1820
1457 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1458} 1822}
1459 1823
1460sub button_down { 1824sub invoke_button_down {
1461 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1462 1826
1463 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1464 1828
1465 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1466 1830
1467 # byte-index to char-index 1831 # byte-index to char-index
1468 my $text = $self->{text}; 1832 my $text = $self->{text};
1469 utf8::encode $text; 1833 utf8::encode $text;
1470 $self->{cursor} = length substr $text, 0, $idx; 1834 $self->{cursor} = length substr $text, 0, $idx;
1471 1835
1472 $self->_set_text ($self->{text}); 1836 $self->_set_text ($self->{text});
1473 $self->update; 1837 $self->update;
1838
1839 1
1474} 1840}
1475 1841
1476sub mouse_motion { 1842sub invoke_mouse_motion {
1477 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1478# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1844# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1845
1846 1
1479} 1847}
1480 1848
1481sub _draw { 1849sub _draw {
1482 my ($self) = @_; 1850 my ($self) = @_;
1483 1851
1484 local $self->{fg} = $self->{fg}; 1852 local $self->{fg} = $self->{fg};
1485 1853
1486 if ($FOCUS == $self) { 1854 if ($FOCUS == $self) {
1487 glColor @{$self->{active_bg}}; 1855 glColor_premultiply @{$self->{active_bg}};
1488 $self->{fg} = $self->{active_fg}; 1856 $self->{fg} = $self->{active_fg};
1489 } else { 1857 } else {
1490 glColor @{$self->{bg}}; 1858 glColor_premultiply @{$self->{bg}};
1491 } 1859 }
1492 1860
1493 glEnable GL_BLEND; 1861 glEnable GL_BLEND;
1494 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1495 glBegin GL_QUADS; 1863 glBegin GL_QUADS;
1496 glVertex 0 , 0; 1864 glVertex 0 , 0;
1497 glVertex 0 , $self->{h}; 1865 glVertex 0 , $self->{h};
1498 glVertex $self->{w}, $self->{h}; 1866 glVertex $self->{w}, $self->{h};
1499 glVertex $self->{w}, 0; 1867 glVertex $self->{w}, 0;
… …
1524 1892
1525our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1526 1894
1527use CFClient::OpenGL; 1895use CFClient::OpenGL;
1528 1896
1529sub key_down { 1897sub invoke_key_down {
1530 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1531 1899
1532 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1533 1901
1534 if ($sym == 13) { 1902 if ($sym == 13) {
1535 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1536 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1537 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1538 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1539 $self->emit (activate => $txt); 1908 $self->emit (activate => $txt);
1540 $self->update; 1909 $self->update;
1541 1910
… …
1560 } else { 1929 } else {
1561 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1562 } 1931 }
1563 1932
1564 } else { 1933 } else {
1565 $self->SUPER::key_down ($ev); 1934 return $self->SUPER::invoke_key_down ($ev)
1935 }
1936
1566 } 1937 1
1567
1568} 1938}
1569 1939
1570############################################################################# 1940#############################################################################
1571 1941
1572package CFClient::UI::Button; 1942package CFClient::UI::Button;
… …
1581 1951
1582sub new { 1952sub new {
1583 my $class = shift; 1953 my $class = shift;
1584 1954
1585 $class->SUPER::new ( 1955 $class->SUPER::new (
1586 padding => 4, 1956 padding_x => 4,
1957 padding_y => 4,
1587 fg => [1, 1, 1], 1958 fg => [1, 1, 1],
1588 bg => [1, 1, 1, 0.2],
1589 active_fg => [0, 0, 1], 1959 active_fg => [0, 0, 1],
1590 can_hover => 1, 1960 can_hover => 1,
1591 align => 0, 1961 align => 0,
1592 valign => 0, 1962 valign => 0,
1593 can_events => 1, 1963 can_events => 1,
1594 @_ 1964 @_
1595 ) 1965 )
1596} 1966}
1597 1967
1598sub button_up { 1968sub invoke_button_up {
1599 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1600 1970
1971 $self->emit ("activate")
1601 if ($x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1602 && $y >= 0 && $y < $self->{h}) { 1973 && $y >= 0 && $y < $self->{h};
1603 $self->emit ("activate"); 1974
1604 } 1975 1
1605} 1976}
1606 1977
1607sub _draw { 1978sub _draw {
1608 my ($self) = @_; 1979 my ($self) = @_;
1609 1980
1610 local $self->{fg} = $self->{fg}; 1981 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1611 1982
1612 if ($GRAB == $self) {
1613 $self->{fg} = $self->{active_fg};
1614 }
1615
1616 glEnable GL_BLEND;
1617 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1618 glEnable GL_TEXTURE_2D; 1983 glEnable GL_TEXTURE_2D;
1619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1620 glColor 0, 0, 0, 1; 1985 glColor 0, 0, 0, 1;
1621 1986
1622 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1623 1988
1624 glDisable GL_TEXTURE_2D; 1989 glDisable GL_TEXTURE_2D;
1625 glDisable GL_BLEND;
1626 1990
1627 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1992}
1993
1994#############################################################################
1995
1996package CFClient::UI::ImageButton;
1997
1998our @ISA = CFClient::UI::Image::;
1999
2000use CFClient::OpenGL;
2001
2002my %textures;
2003
2004sub new {
2005 my $class = shift;
2006
2007 my $self = $class->SUPER::new (
2008 padding_x => 4,
2009 padding_y => 4,
2010 fg => [1, 1, 1],
2011 active_fg => [0, 0, 1],
2012 can_hover => 1,
2013 align => 0,
2014 valign => 0,
2015 can_events => 1,
2016 @_
2017 );
2018}
2019
2020sub invoke_button_up {
2021 my ($self, $ev, $x, $y) = @_;
2022
2023 $self->emit ("activate")
2024 if $x >= 0 && $x < $self->{w}
2025 && $y >= 0 && $y < $self->{h};
2026
2027 1
1628} 2028}
1629 2029
1630############################################################################# 2030#############################################################################
1631 2031
1632package CFClient::UI::CheckBox; 2032package CFClient::UI::CheckBox;
… …
1641 2041
1642sub new { 2042sub new {
1643 my $class = shift; 2043 my $class = shift;
1644 2044
1645 $class->SUPER::new ( 2045 $class->SUPER::new (
1646 padding => 2, 2046 padding_x => 2,
2047 padding_y => 2,
1647 fg => [1, 1, 1], 2048 fg => [1, 1, 1],
1648 active_fg => [1, 1, 0], 2049 active_fg => [1, 1, 0],
2050 bg => [0, 0, 0, 0.2],
2051 active_bg => [1, 1, 1, 0.5],
1649 state => 0, 2052 state => 0,
1650 can_hover => 1, 2053 can_hover => 1,
1651 @_ 2054 @_
1652 ) 2055 )
1653} 2056}
1654 2057
1655sub size_request { 2058sub size_request {
1656 my ($self) = @_; 2059 my ($self) = @_;
1657 2060
1658 ($self->{padding} * 2 + 6) x 2 2061 (6) x 2
1659} 2062}
1660 2063
1661sub button_down { 2064sub invoke_button_down {
1662 my ($self, $ev, $x, $y) = @_; 2065 my ($self, $ev, $x, $y) = @_;
1663 2066
1664 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1665 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1666 $self->{state} = !$self->{state}; 2069 $self->{state} = !$self->{state};
1667 $self->emit (changed => $self->{state}); 2070 $self->emit (changed => $self->{state});
2071 } else {
2072 return 0
2073 }
2074
1668 } 2075 1
1669} 2076}
1670 2077
1671sub _draw { 2078sub _draw {
1672 my ($self) = @_; 2079 my ($self) = @_;
1673 2080
1674 $self->SUPER::_draw; 2081 $self->SUPER::_draw;
1675 2082
1676 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2083 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1677 2084
1678 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2085 my ($w, $h) = @$self{qw(w h)};
2086
2087 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1679 2088
1680 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2089 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1681 2090
1682 glEnable GL_BLEND; 2091 my $tex = $self->{state} ? $tex[1] : $tex[0];
2092
1683 glEnable GL_TEXTURE_2D; 2093 glEnable GL_TEXTURE_2D;
1684 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1685
1686 my $tex = $self->{state} ? $tex[1] : $tex[0];
1687
1688 $tex->draw_quad (0, 0, $s, $s); 2094 $tex->draw_quad_alpha (0, 0, $s, $s);
1689
1690 glDisable GL_TEXTURE_2D; 2095 glDisable GL_TEXTURE_2D;
1691 glDisable GL_BLEND;
1692} 2096}
1693 2097
1694############################################################################# 2098#############################################################################
1695 2099
1696package CFClient::UI::Image; 2100package CFClient::UI::Image;
1697 2101
1698our @ISA = CFClient::UI::Base::; 2102our @ISA = CFClient::UI::Base::;
1699 2103
1700use CFClient::OpenGL; 2104use CFClient::OpenGL;
1701use Carp qw/confess/;
1702 2105
1703our %loaded_images; 2106our %texture_cache;
1704 2107
1705sub new { 2108sub new {
1706 my $class = shift; 2109 my $class = shift;
1707 2110
1708 my $self = $class->SUPER::new (can_events => 0, @_); 2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
1709 2115
1710 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
1711 2118
1712 $loaded_images{$self->{image}} ||= 2119 $self->{tex} = $texture_cache{$self->{path}} ||=
1713 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1714 2121
1715 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2122 Scalar::Util::weaken $texture_cache{$self->{path}};
1716 2123
1717 Scalar::Util::weaken $loaded_images{$self->{image}}; 2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1718
1719 $self->{aspect} = $tex->{w} / $tex->{h};
1720 2125
1721 $self 2126 $self
1722} 2127}
1723 2128
1724sub size_request { 2129sub size_request {
1725 my ($self) = @_; 2130 my ($self) = @_;
1726 2131
1727 ($self->{tex}->{w}, $self->{tex}->{h}) 2132 ($self->{tex}{w}, $self->{tex}{h})
1728} 2133}
1729 2134
1730sub _draw { 2135sub _draw {
1731 my ($self) = @_; 2136 my ($self) = @_;
1732 2137
… …
1739 glTranslate 0, -$self->{w}, 0; 2144 glTranslate 0, -$self->{w}, 0;
1740 2145
1741 ($w, $h) = ($h, $w); 2146 ($w, $h) = ($h, $w);
1742 } 2147 }
1743 2148
1744 glEnable GL_BLEND;
1745 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1746 glEnable GL_TEXTURE_2D; 2149 glEnable GL_TEXTURE_2D;
1747 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2150 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1748 2151
1749 $tex->draw_quad (0, 0, $w, $h); 2152 $tex->draw_quad_alpha (0, 0, $w, $h);
1750 2153
1751 glDisable GL_BLEND;
1752 glDisable GL_TEXTURE_2D; 2154 glDisable GL_TEXTURE_2D;
1753} 2155}
1754 2156
1755############################################################################# 2157#############################################################################
1756 2158
… …
1846 2248
1847 my $h1 = $self->{h} * (1 - $ycut1); 2249 my $h1 = $self->{h} * (1 - $ycut1);
1848 my $h2 = $self->{h} * (1 - $ycut2); 2250 my $h2 = $self->{h} * (1 - $ycut2);
1849 2251
1850 glEnable GL_BLEND; 2252 glEnable GL_BLEND;
1851 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1852 glEnable GL_TEXTURE_2D; 2255 glEnable GL_TEXTURE_2D;
1853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2256 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1854 2257
1855 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2258 glBindTexture GL_TEXTURE_2D, $t1->{name};
1856 glBegin GL_QUADS; 2259 glBegin GL_QUADS;
… …
1945 qw(s1_slider.png s1_slider_bg.png); 2348 qw(s1_slider.png s1_slider_bg.png);
1946 2349
1947sub new { 2350sub new {
1948 my $class = shift; 2351 my $class = shift;
1949 2352
1950 # range [value, low, high, page] 2353 # range [value, low, high, page, unit]
1951 2354
1952 # TODO: 0-width page 2355 # TODO: 0-width page
1953 # TODO: req_w/h are wrong with vertical 2356 # TODO: req_w/h are wrong with vertical
1954 # TODO: calculations are off 2357 # TODO: calculations are off
1955 my $self = $class->SUPER::new ( 2358 my $self = $class->SUPER::new (
1956 fg => [1, 1, 1], 2359 fg => [1, 1, 1],
1957 active_fg => [0, 0, 0], 2360 active_fg => [0, 0, 0],
2361 bg => [0, 0, 0, 0.2],
2362 active_bg => [1, 1, 1, 0.5],
1958 range => [0, 0, 100, 10], 2363 range => [0, 0, 100, 10, 0],
1959 req_w => 20, 2364 min_w => $::WIDTH / 80,
1960 req_h => 20, 2365 min_h => $::WIDTH / 80,
1961 vertical => 0, 2366 vertical => 0,
1962 can_hover => 1, 2367 can_hover => 1,
1963 inner_pad => 5, 2368 inner_pad => 0.02,
1964 @_ 2369 @_
1965 ); 2370 );
1966 2371
2372 $self->set_value ($self->{range}[0]);
2373 $self->update;
2374
1967 $self 2375 $self
1968} 2376}
1969 2377
2378sub set_range {
2379 my ($self, $range) = @_;
2380
2381 ($range, $self->{range}) = ($self->{range}, $range);
2382
2383 if ("@$range" ne "@{$self->{range}}") {
2384 $self->update;
2385 $self->set_value ($self->{range}[0]);
2386 }
2387}
2388
2389sub set_value {
2390 my ($self, $value) = @_;
2391
2392 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2393
2394 $hi = $lo + 1 if $hi <= $lo;
2395
2396 $page = $hi - $lo if $page > $hi - $lo;
2397
2398 $value = $lo if $value < $lo;
2399 $value = $hi - $page if $value > $hi - $page;
2400
2401 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2402 if $unit;
2403
2404 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2405
2406 if ($value != $old_value) {
2407 $self->emit (changed => $value);
2408 $self->update;
2409 }
2410}
2411
1970sub size_request { 2412sub size_request {
1971 my ($self) = @_; 2413 my ($self) = @_;
1972 2414
1973 my $w = $self->{req_w}; 2415 ($self->{req_w}, $self->{req_h})
1974 my $h = $self->{req_h};
1975
1976 $self->{vertical} ? ($h, $w) : ($w, $h)
1977} 2416}
1978 2417
1979sub button_down { 2418sub invoke_button_down {
1980 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
1981 2420
1982 $self->SUPER::button_down ($ev, $x, $y); 2421 $self->SUPER::invoke_button_down ($ev, $x, $y);
2422
2423 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2424
1983 $self->mouse_motion ($ev, $x, $y); 2425 $self->invoke_mouse_motion ($ev, $x, $y)
1984} 2426}
1985 2427
1986sub mouse_motion { 2428sub invoke_mouse_motion {
1987 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
1988 2430
1989 if ($GRAB == $self) { 2431 if ($GRAB == $self) {
2432 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2433
2434 my (undef, $lo, $hi, $page) = @{$self->{range}};
2435
2436 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2437
2438 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2439 } else {
2440 return 0;
2441 }
2442
2443 1
2444}
2445
2446sub update {
2447 my ($self) = @_;
2448
2449 delete $self->{knob_w};
2450 $self->SUPER::update;
2451}
2452
2453sub _draw {
2454 my ($self) = @_;
2455
2456 unless ($self->{knob_w}) {
2457 $self->set_value ($self->{range}[0]);
2458
1990 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2459 my ($value, $lo, $hi, $page) = @{$self->{range}};
2460 my $range = ($hi - $page - $lo) || 1e-100;
1991 2461
1992 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2462 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1993 2463
1994 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2464 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1995 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2465 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1996 2466
1997 $x -= $inner_pad_px; # substract the padding 2467 $value = ($value - $lo) / $range;
1998 $x = $x * ($hi - $lo) / $inner_w + $lo; 2468 $value = $value * $self->{scale} + $self->{offset};
1999 $x = $lo if $x < $lo;
2000 $x = $hi - $page if $x > $hi - $page;
2001 $self->{range}[0] = $x;
2002 2469
2003 $self->emit (changed => $x); 2470 $self->{knob_x} = $value - $knob_w * 0.5;
2004 $self->update; 2471 $self->{knob_w} = $knob_w;
2005 } 2472 }
2006}
2007
2008# the inner_* stuff is for generating a padding for the slider handle,
2009# so that the handle doesn't leave the texture. This calculation isn't 100%
2010# correct propably, but it does the job for now
2011sub _calc_inner_pad_px {
2012 my ($self, $w) = @_;
2013 ($w / 100) * $self->{inner_pad} # % to pixels
2014}
2015
2016sub _draw {
2017 my ($self) = @_;
2018 2473
2019 $self->SUPER::_draw (); 2474 $self->SUPER::_draw ();
2020 2475
2021 my ($w, $h) = @$self{qw(w h)}; 2476 glScale $self->{w}, $self->{h};
2022 2477
2023 if ($self->{vertical}) { 2478 if ($self->{vertical}) {
2024 # draw a vertical slider like a rotated horizontal slider 2479 # draw a vertical slider like a rotated horizontal slider
2025 2480
2481 glTranslate 1, 0, 0;
2026 glRotate 90, 0, 0, 1; 2482 glRotate 90, 0, 0, 1;
2027 glTranslate 0, -$self->{w}, 0;
2028
2029 ($w, $h) = ($h, $w);
2030 } 2483 }
2031 2484
2032 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2485 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2033 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2486 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2034 2487
2035 my ($value, $lo, $hi, $page) = @{$self->{range}};
2036
2037 $hi = $value + 1 if $lo == $hi;
2038
2039 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2040 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2041
2042 $page = int $page * $inner_w / ($hi - $lo);
2043 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2044
2045 $w -= $page;
2046 $page &= ~1;
2047 glTranslate $page * 0.5, 0, 0;
2048 $page ||= 2;
2049
2050 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2051 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2052
2053 glEnable GL_BLEND;
2054 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2055 glEnable GL_TEXTURE_2D; 2488 glEnable GL_TEXTURE_2D;
2056 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2489 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2057 2490
2058 # draw background 2491 # draw background
2059 $tex[1]->draw_quad (0, 0, $w, $h); 2492 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2060 2493
2061 # draw handle 2494 # draw handle
2062 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2495 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2063 2496
2064 glDisable GL_BLEND;
2065 glDisable GL_TEXTURE_2D; 2497 glDisable GL_TEXTURE_2D;
2066} 2498}
2067 2499
2068############################################################################# 2500#############################################################################
2069 2501
2502package CFClient::UI::ValSlider;
2503
2504our @ISA = CFClient::UI::HBox::;
2505
2506sub new {
2507 my ($class, %arg) = @_;
2508
2509 my $range = delete $arg{range};
2510
2511 my $self = $class->SUPER::new (
2512 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2513 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2514 to_value => sub { shift },
2515 from_value => sub { shift },
2516 %arg,
2517 );
2518
2519 $self->{slider}->connect (changed => sub {
2520 my ($self, $value) = @_;
2521 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2522 $self->{parent}->emit (changed => $value);
2523 });
2524
2525# $self->{entry}->connect (changed => sub {
2526# my ($self, $value) = @_;
2527# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2528# $self->{parent}->emit (changed => $value);
2529# });
2530
2531 $self->add ($self->{slider}, $self->{entry});
2532
2533 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2534
2535 $self
2536}
2537
2538sub set_range { shift->{slider}->set_range (@_) }
2539sub set_value { shift->{slider}->set_value (@_) }
2540
2541#############################################################################
2542
2070package CFClient::UI::TextView; 2543package CFClient::UI::TextScroller;
2071 2544
2072our @ISA = CFClient::UI::HBox::; 2545our @ISA = CFClient::UI::HBox::;
2073 2546
2074use CFClient::OpenGL; 2547use CFClient::OpenGL;
2075 2548
… …
2077 my $class = shift; 2550 my $class = shift;
2078 2551
2079 my $self = $class->SUPER::new ( 2552 my $self = $class->SUPER::new (
2080 fontsize => 1, 2553 fontsize => 1,
2081 can_events => 0, 2554 can_events => 0,
2555 indent => 0,
2082 #font => default_font 2556 #font => default_font
2083 @_, 2557 @_,
2084 2558
2085 layout => (new CFClient::Layout), 2559 layout => (new CFClient::Layout 1),
2086 par => [], 2560 par => [],
2087 height => 0, 2561 height => 0,
2088 children => [ 2562 children => [
2089 (new CFClient::UI::Empty expand => 1), 2563 (new CFClient::UI::Empty expand => 1),
2090 (new CFClient::UI::Slider vertical => 1), 2564 (new CFClient::UI::Slider vertical => 1),
… …
2101 2575
2102 $self->{fontsize} = $fontsize; 2576 $self->{fontsize} = $fontsize;
2103 $self->reflow; 2577 $self->reflow;
2104} 2578}
2105 2579
2106sub text_height { 2580sub size_request {
2581 my ($self) = @_;
2582
2583 my ($empty, $slider) = @{ $self->{children} };
2584
2585 local $self->{children} = [$empty, $slider];
2586 $self->SUPER::size_request
2587}
2588
2589sub invoke_size_allocate {
2590 my ($self, $w, $h) = @_;
2591
2592 my ($empty, $slider, @other) = @{ $self->{children} };
2593 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2594
2595 $self->{layout}->set_font ($self->{font}) if $self->{font};
2596 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2597 $self->{layout}->set_width ($empty->{w});
2598 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2599
2600 $self->reflow;
2601
2602 local $self->{children} = [$empty, $slider];
2603 $self->SUPER::invoke_size_allocate ($w, $h)
2604}
2605
2606sub get_layout {
2107 my ($self, $text) = @_; 2607 my ($self, $para) = @_;
2108 2608
2109 my $layout = $self->{layout}; 2609 my $layout = $self->{layout};
2110 2610
2611 $layout->set_font ($self->{font}) if $self->{font};
2612 $layout->set_foreground (@{$para->{fg}});
2111 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2613 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2112 $layout->set_width ($self->{children}[0]{w}); 2614 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2113 $layout->set_text ($text); 2615 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2616 $layout->set_markup ($para->{markup});
2617
2618 $layout->set_shapes (
2619 map
2620 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2621 @{$para->{widget}}
2114 2622 );
2115 ($layout->size)[1] 2623
2624 $layout
2116} 2625}
2117 2626
2118sub reflow { 2627sub reflow {
2119 my ($self) = @_; 2628 my ($self) = @_;
2120 2629
2121 $self->{need_reflow}++; 2630 $self->{need_reflow}++;
2122 $self->update; 2631 $self->update;
2123} 2632}
2124 2633
2125sub size_allocate { 2634sub set_offset {
2635 my ($self, $offset) = @_;
2636
2637 # todo: base offset on lines or so, not on pixels
2638 $self->{children}[1]->set_value ($offset);
2639}
2640
2641sub clear {
2126 my ($self, $w, $h) = @_; 2642 my ($self) = @_;
2127 2643
2128 $self->SUPER::size_allocate ($w, $h); 2644 my (undef, undef, @other) = @{ $self->{children} };
2645 $self->remove ($_) for @other;
2129 2646
2130 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2647 $self->{par} = [];
2131 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2648 $self->{height} = 0;
2132 $self->{layout}->set_width ($self->{children}[0]{w}); 2649 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2133
2134 $self->reflow;
2135} 2650}
2136 2651
2137sub add_paragraph { 2652sub add_paragraph {
2138 my ($self, $color, $text) = @_; 2653 my ($self, $color, $para, $indent) = @_;
2139 2654
2140 #TODO: intelligently "reformat" paragraph 2655 my ($text, @w) = ref $para ? @$para : $para;
2141 2656
2142 my $height = $self->text_height ($text); 2657 $para = {
2658 w => 1e10,
2659 wrapped => 1,
2660 fg => $color,
2661 indent => $indent,
2662 markup => $text,
2663 widget => \@w,
2664 };
2143 2665
2144 $self->{height} += $height; 2666 $self->add (@w) if @w;
2667 push @{$self->{par}}, $para;
2145 2668
2146 push @{$self->{par}}, [$height, $color, $text]; 2669 $self->{need_reflow}++;
2670 $self->update;
2671}
2147 2672
2148 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2673sub scroll_to_bottom {
2149 $self->{children}[1]->update; 2674 my ($self) = @_;
2675
2676 $self->{scroll_to_bottom} = 1;
2677 $self->update;
2150} 2678}
2151 2679
2152sub update { 2680sub update {
2153 my ($self) = @_; 2681 my ($self) = @_;
2154 2682
… …
2156 2684
2157 return unless $self->{h} > 0; 2685 return unless $self->{h} > 0;
2158 2686
2159 delete $self->{texture}; 2687 delete $self->{texture};
2160 2688
2161 $ROOT->on_refresh ($self, sub { 2689 $ROOT->on_post_alloc ($self => sub {
2690 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2691
2162 if (delete $self->{need_reflow}) { 2692 if (delete $self->{need_reflow}) {
2163 my $height = 0; 2693 my $height = 0;
2164 2694
2165 $height += $_->[0] = $self->text_height ($_->[2])
2166 for @{$self->{par}}; 2695 for my $para (@{$self->{par}}) {
2696 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2697 my $layout = $self->get_layout ($para);
2698 my ($w, $h) = $layout->size;
2699
2700 $para->{w} = $w + $para->{indent};
2701 $para->{h} = $h;
2702 $para->{wrapped} = $layout->has_wrapped;
2703 }
2704
2705 $height += $para->{h};
2706 }
2167 2707
2168 $self->{height} = $height; 2708 $self->{height} = $height;
2169 2709
2170 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2710 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2171 2711
2172 delete $self->{texture}; 2712 delete $self->{texture};
2173 } 2713 }
2174 2714
2715 if (delete $self->{scroll_to_bottom}) {
2716 $self->{children}[1]->set_value (1e10);
2717 }
2718
2175 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2719 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2176 glClearColor 0, 0, 0, 0; 2720 glClearColor 0, 0, 0, 0;
2177 glClear GL_COLOR_BUFFER_BIT; 2721 glClear GL_COLOR_BUFFER_BIT;
2178 2722
2723 my $top = int $self->{children}[1]{range}[0];
2724
2725 my $y0 = $top;
2726 my $y1 = $top + $H;
2727
2728 my $y = 0;
2729
2179 glEnable GL_BLEND; 2730 glEnable GL_BLEND;
2731 #TODO# not correct in windows where rgba is forced off
2180 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2732 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2181 glEnable GL_TEXTURE_2D;
2182 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2183 2733
2184 my $top = int $self->{children}[1]{range}[0];
2185
2186 my $y0 = $top;
2187 my $y1 = $top + $self->{h};
2188
2189 my $y = 0;
2190
2191 my $layout = $self->{layout};
2192
2193 $layout->set_font ($self->{font}) if $self->{font};
2194
2195 for my $par (@{$self->{par}}) { 2734 for my $para (@{$self->{par}}) {
2196 my $h = $par->[0]; 2735 my $h = $para->{h};
2197 2736
2198 if ($y0 < $y + $h && $y < $y1) { 2737 if ($y0 < $y + $h && $y < $y1) {
2199 $layout->set_text ($par->[2]);
2200 2738
2201 glColor @{ $par->[1] }; 2739 my $layout = $self->get_layout ($para);
2202 my ($W, $H) = $layout->size; 2740
2203 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2741 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2742
2743 glRasterPos $para->{indent}, $y - $y0;
2744 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2745
2746 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes;
2748
2749 glDisable GL_BLEND;
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 glEnable GL_BLEND;
2759 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2760 }
2204 } 2761 }
2205 2762
2206 $y += $h; 2763 $y += $h;
2207 } 2764 }
2208 2765
2209 glDisable GL_TEXTURE_2D;
2210 glDisable GL_BLEND; 2766 glDisable GL_BLEND;
2211 }; 2767 };
2212 }); 2768 });
2213} 2769}
2214 2770
2771sub reconfigure {
2772 my ($self) = @_;
2773
2774 $self->SUPER::reconfigure;
2775
2776 $_->{w} = 1e10 for @{ $self->{par} };
2777 $self->reflow;
2778}
2779
2215sub _draw { 2780sub _draw {
2216 my ($self) = @_; 2781 my ($self) = @_;
2217 2782
2218 glEnable GL_BLEND;
2219 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2220 glEnable GL_TEXTURE_2D; 2783 glEnable GL_TEXTURE_2D;
2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2784 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222 glColor 1, 1, 1, 1; 2785 glColor 0, 0, 0, 1;
2223 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2786 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2224 glDisable GL_TEXTURE_2D; 2787 glDisable GL_TEXTURE_2D;
2225 glDisable GL_BLEND;
2226 2788
2227 $self->{children}[1]->draw; 2789 $self->{children}[1]->draw;
2228
2229} 2790}
2230 2791
2231############################################################################# 2792#############################################################################
2232 2793
2233package CFClient::UI::Animator; 2794package CFClient::UI::Animator;
… …
2278 2839
2279sub new { 2840sub new {
2280 my $class = shift; 2841 my $class = shift;
2281 2842
2282 my $self = $class->SUPER::new ( 2843 my $self = $class->SUPER::new (
2283 state => 0, 2844 state => 0,
2284 connect_activate => \&toggle_flopper, 2845 on_activate => \&toggle_flopper,
2285 @_ 2846 @_
2286 ); 2847 );
2287 2848
2288 if ($self->{state}) {
2289 $self->{state} = 0;
2290 $self->toggle_flopper;
2291 }
2292
2293 $self 2849 $self
2294} 2850}
2295 2851
2296sub toggle_flopper { 2852sub toggle_flopper {
2297 my ($self) = @_; 2853 my ($self) = @_;
2298 2854
2299 # TODO: use animation 2855 $self->{other}->toggle_visibility;
2300 if ($self->{state} = !$self->{state}) {
2301 $CFClient::UI::ROOT->add ($self->{other});
2302 $self->{other}->move ($self->coord2global (0, $self->{h}));
2303 $self->emit ("open");
2304 } else {
2305 $CFClient::UI::ROOT->remove ($self->{other});
2306 $self->emit ("close");
2307 }
2308
2309 $self->emit (changed => $self->{state});
2310} 2856}
2311 2857
2312############################################################################# 2858#############################################################################
2313 2859
2314package CFClient::UI::Tooltip; 2860package CFClient::UI::Tooltip;
… …
2324 @_, 2870 @_,
2325 can_events => 0, 2871 can_events => 0,
2326 ) 2872 )
2327} 2873}
2328 2874
2329sub set_markup { 2875sub set_tooltip_from {
2330 my ($self, $text) = @_; 2876 my ($self, $widget) = @_;
2331 2877
2332 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2878 my $tooltip = $widget->{tooltip};
2333 $self->{label}->set_markup ($text); 2879
2334 $self->add ($self->{label}); 2880 if ($ENV{CFPLUS_DEBUG} & 2) {
2881 $tooltip .= "\n\n" . (ref $widget) . "\n"
2882 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2883 . "req $widget->{req_w} $widget->{req_h}\n"
2884 . "visible $widget->{visible}";
2885 }
2886
2887 $tooltip =~ s/^\n+//;
2888 $tooltip =~ s/\n+$//;
2889
2890 $self->add (new CFClient::UI::Label
2891 markup => $tooltip,
2892 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2893 fontsize => 0.8,
2894 fg => [0, 0, 0, 1],
2895 ellipsise => 0,
2896 font => ($widget->{tooltip_font} || $::FONT_PROP),
2897 );
2335} 2898}
2336 2899
2337sub size_request { 2900sub size_request {
2338 my ($self) = @_; 2901 my ($self) = @_;
2339 2902
2340 $self->child->set_max_size ($::WIDTH * 0.3);
2341
2342 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2903 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2343 2904
2344 ($w + 4, $h + 4) 2905 ($w + 4, $h + 4)
2345} 2906}
2346 2907
2347sub size_allocate { 2908sub invoke_size_allocate {
2348 my ($self, $w, $h) = @_; 2909 my ($self, $w, $h) = @_;
2349 2910
2350 $self->SUPER::size_allocate ($w - 4, $h - 4); 2911 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2912}
2913
2914sub invoke_visibility_change {
2915 my ($self, $visible) = @_;
2916
2917 return unless $visible;
2918
2919 $self->{root}->on_post_alloc ("move_$self" => sub {
2920 my $widget = $self->{owner}
2921 or return;
2922
2923 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2924
2925 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2926 if $x + $self->{w} > $self->{root}{w};
2927
2928 $self->move_abs ($x, $y);
2929 });
2351} 2930}
2352 2931
2353sub _draw { 2932sub _draw {
2354 my ($self) = @_; 2933 my ($self) = @_;
2355 2934
2356 glPushMatrix;
2357 glTranslate 0.375, 0.375; 2935 glTranslate 0.375, 0.375;
2358 2936
2359 my ($w, $h) = @$self{qw(w h)}; 2937 my ($w, $h) = @$self{qw(w h)};
2360 2938
2361 glColor 1, 0.8, 0.4; 2939 glColor 1, 0.8, 0.4;
… …
2372 glVertex 0 , $h; 2950 glVertex 0 , $h;
2373 glVertex $w, $h; 2951 glVertex $w, $h;
2374 glVertex $w, 0; 2952 glVertex $w, 0;
2375 glEnd; 2953 glEnd;
2376 2954
2377 glPopMatrix; 2955 glTranslate 2 - 0.375, 2 - 0.375;
2378 2956
2379 glTranslate 2, 2;
2380 $self->SUPER::_draw; 2957 $self->SUPER::_draw;
2381} 2958}
2382 2959
2383############################################################################# 2960#############################################################################
2384 2961
… …
2389use CFClient::OpenGL; 2966use CFClient::OpenGL;
2390 2967
2391sub new { 2968sub new {
2392 my $class = shift; 2969 my $class = shift;
2393 2970
2394 $class->SUPER::new ( 2971 my $self = $class->SUPER::new (
2395 aspect => 1, 2972 aspect => 1,
2973 can_events => 0,
2974 @_,
2975 );
2976
2977 if ($self->{anim} && $self->{animspeed}) {
2978 Scalar::Util::weaken (my $widget = $self);
2979
2980 $self->{timer} = Event->timer (
2981 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2982 hard => 1,
2983 interval => $self->{animspeed},
2984 cb => sub {
2985 ++$widget->{frame};
2986 $widget->update;
2987 },
2988 );
2989 }
2990
2991 $self
2992}
2993
2994sub size_request {
2995 (32, 8)
2996}
2997
2998sub update {
2999 my ($self) = @_;
3000
3001 return unless $self->{visible};
3002
3003 $self->SUPER::update;
3004}
3005
3006sub _draw {
3007 my ($self) = @_;
3008
3009 return unless $::CONN;
3010
3011 my $face;
3012
3013 if ($self->{frame}) {
3014 my $anim = $::CONN->{anim}[$self->{anim}];
3015
3016 $face = $anim->[ $self->{frame} % @$anim ]
3017 if $anim && @$anim;
3018 }
3019
3020 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3021
3022 if ($tex) {
3023 glEnable GL_TEXTURE_2D;
3024 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3025 glColor 0, 0, 0, 1;
3026 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3027 glDisable GL_TEXTURE_2D;
3028 }
3029}
3030
3031sub destroy {
3032 my ($self) = @_;
3033
3034 $self->{timer}->cancel
3035 if $self->{timer};
3036
3037 $self->SUPER::destroy;
3038}
3039
3040#############################################################################
3041
3042package CFClient::UI::Buttonbar;
3043
3044our @ISA = CFClient::UI::HBox::;
3045
3046# TODO: should actualyl wrap buttons and other goodies.
3047
3048#############################################################################
3049
3050package CFClient::UI::Menu;
3051
3052our @ISA = CFClient::UI::FancyFrame::;
3053
3054use CFClient::OpenGL;
3055
3056sub new {
3057 my $class = shift;
3058
3059 my $self = $class->SUPER::new (
3060 items => [],
3061 z => 100,
3062 @_,
3063 );
3064
3065 $self->add ($self->{vbox} = new CFClient::UI::VBox);
3066
3067 for my $item (@{ $self->{items} }) {
3068 my ($widget, $cb, $tooltip) = @$item;
3069
3070 # handle various types of items, only text for now
3071 if (!ref $widget) {
3072 $widget = new CFClient::UI::Label
3073 can_hover => 1,
3074 can_events => 1,
3075 markup => $widget,
3076 tooltip => $tooltip
3077 }
3078
3079 $self->{item}{$widget} = $item;
3080
3081 $self->{vbox}->add ($widget);
3082 }
3083
3084 $self
3085}
3086
3087# popup given the event (must be a mouse button down event currently)
3088sub popup {
3089 my ($self, $ev) = @_;
3090
3091 $self->emit ("popdown");
3092
3093 # maybe save $GRAB? must be careful about events...
3094 $GRAB = $self;
3095 $self->{button} = $ev->{button};
3096
3097 $self->show;
3098 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3099}
3100
3101sub invoke_mouse_motion {
3102 my ($self, $ev, $x, $y) = @_;
3103
3104 # TODO: should use vbox->find_widget or so
3105 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3106 $self->{hover} = $self->{item}{$HOVER};
3107
3108 0
3109}
3110
3111sub invoke_button_up {
3112 my ($self, $ev, $x, $y) = @_;
3113
3114 if ($ev->{button} == $self->{button}) {
3115 undef $GRAB;
3116 $self->hide;
3117
3118 $self->emit ("popdown");
3119 $self->{hover}[1]->() if $self->{hover};
3120 } else {
3121 return 0
3122 }
3123
3124 1
3125}
3126
3127#############################################################################
3128
3129package CFClient::UI::Multiplexer;
3130
3131our @ISA = CFClient::UI::Container::;
3132
3133sub new {
3134 my $class = shift;
3135
3136 my $self = $class->SUPER::new (
3137 @_,
3138 );
3139
3140 $self->{current} = $self->{children}[0]
3141 if @{ $self->{children} };
3142
3143 $self
3144}
3145
3146sub add {
3147 my ($self, @widgets) = @_;
3148
3149 $self->SUPER::add (@widgets);
3150
3151 $self->{current} = $self->{children}[0]
3152 if @{ $self->{children} };
3153}
3154
3155sub set_current_page {
3156 my ($self, $page_or_widget) = @_;
3157
3158 my $widget = ref $page_or_widget
3159 ? $page_or_widget
3160 : $self->{children}[$page_or_widget];
3161
3162 $self->{current} = $widget;
3163 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3164
3165 $self->emit (page_changed => $self->{current});
3166
3167 $self->realloc;
3168}
3169
3170sub visible_children {
3171 $_[0]{current}
3172}
3173
3174sub size_request {
3175 my ($self) = @_;
3176
3177 $self->{current}->size_request
3178}
3179
3180sub invoke_size_allocate {
3181 my ($self, $w, $h) = @_;
3182
3183 $self->{current}->configure (0, 0, $w, $h);
3184
3185 1
3186}
3187
3188sub _draw {
3189 my ($self) = @_;
3190
3191 $self->{current}->draw;
3192}
3193
3194#############################################################################
3195
3196package CFClient::UI::Notebook;
3197
3198our @ISA = CFClient::UI::VBox::;
3199
3200sub new {
3201 my $class = shift;
3202
3203 my $self = $class->SUPER::new (
3204 buttonbar => (new CFClient::UI::Buttonbar),
3205 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3206 # filter => # will be put between multiplexer and $self
3207 @_,
3208 );
3209
3210 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3211 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3212
3213 $self
3214}
3215
3216sub add {
3217 my ($self, $title, $widget, $tooltip) = @_;
3218
3219 Scalar::Util::weaken $self;
3220
3221 $self->{buttonbar}->add (new CFClient::UI::Button
3222 markup => $title,
3223 tooltip => $tooltip,
3224 on_activate => sub { $self->set_current_page ($widget) },
3225 );
3226
3227 $self->{multiplexer}->add ($widget);
3228}
3229
3230sub set_current_page {
3231 my ($self, $page) = @_;
3232
3233 $self->{multiplexer}->set_current_page ($page);
3234 $self->emit (page_changed => $self->{multiplexer}{current});
3235}
3236
3237#############################################################################
3238
3239package CFClient::UI::Combobox;
3240
3241use utf8;
3242
3243our @ISA = CFClient::UI::Button::;
3244
3245sub new {
3246 my $class = shift;
3247
3248 my $self = $class->SUPER::new (
3249 options => [], # [value, title, longdesc], ...
3250 value => undef,
3251 @_,
3252 );
3253
3254 $self->_set_value ($self->{value});
3255
3256 $self
3257}
3258
3259sub invoke_button_down {
3260 my ($self, $ev) = @_;
3261
3262 my @menu_items;
3263
3264 for (@{ $self->{options} }) {
3265 my ($value, $title, $tooltip) = @$_;
3266
3267 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3268 }
3269
3270 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3271}
3272
3273sub _set_value {
3274 my ($self, $value) = @_;
3275
3276 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3277 or return;
3278
3279 $self->{value} = $item->[0];
3280 $self->set_markup ("$item->[1] ⇓");
3281 $self->set_tooltip ($item->[2]);
3282}
3283
3284sub set_value {
3285 my ($self, $value) = @_;
3286
3287 return unless $self->{value} ne $value;
3288
3289 $self->_set_value ($value);
3290 $self->emit (changed => $value);
3291}
3292
3293#############################################################################
3294
3295package CFClient::UI::Statusbox;
3296
3297our @ISA = CFClient::UI::VBox::;
3298
3299sub new {
3300 my $class = shift;
3301
3302 my $self = $class->SUPER::new (
3303 fontsize => 0.8,
3304 @_,
3305 );
3306
3307 Scalar::Util::weaken (my $this = $self);
3308
3309 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3310
3311 $self
3312}
3313
3314sub reorder {
3315 my ($self) = @_;
3316 my $NOW = Time::HiRes::time;
3317
3318 # freeze display when hovering over any label
3319 return if $CFClient::UI::TOOLTIP->{owner}
3320 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3321 values %{ $self->{item} };
3322
3323 while (my ($k, $v) = each %{ $self->{item} }) {
3324 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3325 }
3326
3327 my @widgets;
3328
3329 my @items = sort {
3330 $a->{pri} <=> $b->{pri}
3331 or $b->{id} <=> $a->{id}
3332 } values %{ $self->{item} };
3333
3334 $self->{timer}->interval (1);
3335
3336 my $count = 10 + 1;
3337 for my $item (@items) {
3338 last unless --$count;
3339
3340 my $label = $item->{label} ||= do {
3341 # TODO: doesn't handle markup well (read as: at all)
3342 my $short = $item->{count} > 1
3343 ? "<b>$item->{count} ×</b> $item->{text}"
3344 : $item->{text};
3345
3346 for ($short) {
3347 s/^\s+//;
3348 s/\s+/ /g;
3349 }
3350
3351 new CFClient::UI::Label
3352 markup => $short,
3353 tooltip => $item->{tooltip},
3354 tooltip_font => $::FONT_PROP,
3355 tooltip_width => 0.67,
3356 fontsize => $item->{fontsize} || $self->{fontsize},
3357 max_w => $::WIDTH * 0.44,
3358 fg => [@{ $item->{fg} }],
3359 can_events => 1,
3360 can_hover => 1
3361 };
3362
3363 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3364 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3365 $label->update;
3366 $label->set_max_size (undef, $label->{req_h} * $diff)
3367 if $diff < 1;
3368 $self->{timer}->interval (1/30);
3369 } else {
3370 $label->{fg}[3] = $item->{fg}[3] || 1;
3371 }
3372
3373 push @widgets, $label;
3374 }
3375
3376 $self->clear;
3377 $self->SUPER::add (reverse @widgets);
3378}
3379
3380sub add {
3381 my ($self, $text, %arg) = @_;
3382
3383 $text =~ s/^\s+//;
3384 $text =~ s/\s+$//;
3385
3386 return unless $text;
3387
3388 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3389
3390 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3391
3392 if (my $item = $self->{item}{$group}) {
3393 if ($item->{text} eq $text) {
3394 $item->{count}++;
3395 } else {
3396 $item->{count} = 1;
3397 $item->{text} = $item->{tooltip} = $text;
3398 }
3399 $item->{id} += 0.2;#d#
3400 $item->{timeout} = $timeout;
3401 delete $item->{label};
3402 } else {
3403 $self->{item}{$group} = {
3404 id => ++$self->{id},
3405 text => $text,
3406 timeout => $timeout,
3407 tooltip => $text,
3408 fg => [0.8, 0.8, 0.8, 0.8],
3409 pri => 0,
3410 count => 1,
3411 %arg,
3412 };
3413 }
3414
3415 $self->reorder;
3416}
3417
3418sub reconfigure {
3419 my ($self) = @_;
3420
3421 delete $_->{label}
3422 for values %{ $self->{item} || {} };
3423
3424 $self->reorder;
3425 $self->SUPER::reconfigure;
3426}
3427
3428sub destroy {
3429 my ($self) = @_;
3430
3431 $self->{timer}->cancel;
3432
3433 $self->SUPER::destroy;
3434}
3435
3436#############################################################################
3437
3438package CFClient::UI::Inventory;
3439
3440our @ISA = CFClient::UI::ScrolledWindow::;
3441
3442sub new {
3443 my $class = shift;
3444
3445 my $self = $class->SUPER::new (
3446 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3447 @_,
3448 );
3449
3450 $self
3451}
3452
3453sub set_items {
3454 my ($self, $items) = @_;
3455
3456 $self->{child}->clear;
3457 return unless $items;
3458
3459 my @items = sort {
3460 ($a->{type} <=> $b->{type})
3461 or ($a->{name} cmp $b->{name})
3462 } @$items;
3463
3464 $self->{real_items} = \@items;
3465
3466 my $row = 0;
3467 for my $item (@items) {
3468 CFClient::Item::update_widgets $item;
3469
3470 $self->{child}->add (0, $row, $item->{face_widget});
3471 $self->{child}->add (1, $row, $item->{desc_widget});
3472 $self->{child}->add (2, $row, $item->{weight_widget});
3473
3474 $row++;
3475 }
3476}
3477
3478#############################################################################
3479
3480package CFClient::UI::SpellList;
3481
3482our @ISA = CFClient::UI::Table::;
3483
3484sub new {
3485 my $class = shift;
3486
3487 my $self = $class->SUPER::new (
3488 binding => [],
3489 commands => [],
2396 @_, 3490 @_,
2397 ) 3491 )
2398} 3492}
2399 3493
3494my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3495
3496my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3497 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3498my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3499 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3500my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3501 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3502my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3503 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3504my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3505 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3506
3507sub rebuild_spell_list {
3508 my ($self) = @_;
3509
3510 $CFClient::UI::ROOT->on_refresh ($self => sub {
3511 $self->clear;
3512
3513 return unless $::CONN;
3514
3515 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3516 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3517 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3518 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3519 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3520
3521 my $row = 0;
3522
3523 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3524 my $spell = $self->{spell}{$_};
3525
3526 $row++;
3527
3528 my $spell_cb = sub {
3529 my ($widget, $ev) = @_;
3530
3531 if ($ev->{button} == 1) {
3532 $::CONN->user_send ("cast $spell->{name}");
3533 } elsif ($ev->{button} == 2) {
3534 $::CONN->user_send ("invoke $spell->{name}");
3535 } elsif ($ev->{button} == 3) {
3536 (new CFClient::UI::Menu
3537 items => [
3538 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3539 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3540 ],
3541 )->popup ($ev);
3542 } else {
3543 return 0;
3544 }
3545
3546 1
3547 };
3548
3549 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3550
3551 #TODO: add path info to tooltip
3552 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3553
3554 $self->add (0, $row, new CFClient::UI::Face
3555 face => $spell->{face},
3556 can_hover => 1,
3557 can_events => 1,
3558 tooltip => $tooltip,
3559 on_button_down => $spell_cb,
3560 );
3561
3562 $self->add (1, $row, new CFClient::UI::Label
3563 expand => 1,
3564 text => $spell->{name},
3565 can_hover => 1,
3566 can_events => 1,
3567 tooltip => $tooltip,
3568 on_button_down => $spell_cb,
3569 );
3570
3571 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3572 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3573 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3574 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3575 }
3576 });
3577}
3578
3579sub add_spell {
3580 my ($self, $spell) = @_;
3581
3582 $self->{spell}->{$spell->{name}} = $spell;
3583 $self->rebuild_spell_list;
3584}
3585
3586sub remove_spell {
3587 my ($self, $spell) = @_;
3588
3589 delete $self->{spell}->{$spell->{name}};
3590 $self->rebuild_spell_list;
3591}
3592
3593sub clear_spells {
3594 my ($self) = @_;
3595
3596 $self->{spell} = {};
3597 $self->rebuild_spell_list;
3598}
3599
3600#############################################################################
3601
3602package CFClient::UI::Root;
3603
3604our @ISA = CFClient::UI::Container::;
3605
3606use List::Util qw(min max);
3607
3608use CFClient::OpenGL;
3609
3610sub new {
3611 my $class = shift;
3612
3613 my $self = $class->SUPER::new (
3614 visible => 1,
3615 @_,
3616 );
3617
3618 Scalar::Util::weaken ($self->{root} = $self);
3619
3620 $self
3621}
3622
2400sub size_request { 3623sub size_request {
2401 (32, 8)
2402}
2403
2404sub draw {
2405 my ($self) = @_; 3624 my ($self) = @_;
2406 3625
2407 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3626 ($self->{w}, $self->{h})
2408
2409 if ($tex) {
2410 glEnable GL_BLEND;
2411 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2412 glEnable GL_TEXTURE_2D;
2413 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2414 glColor 1, 1, 1, 1;
2415 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2416 glDisable GL_TEXTURE_2D;
2417 glDisable GL_BLEND;
2418 }
2419} 3627}
2420 3628
2421############################################################################# 3629sub _to_pixel {
3630 my ($coord, $size, $max) = @_;
2422 3631
2423package CFClient::UI::Root; 3632 $coord =
3633 $coord eq "center" ? ($max - $size) * 0.5
3634 : $coord eq "max" ? $max
3635 : $coord;
2424 3636
2425our @ISA = CFClient::UI::Container::; 3637 $coord = 0 if $coord < 0;
3638 $coord = $max - $size if $coord > $max - $size;
2426 3639
2427use CFClient::OpenGL; 3640 int $coord + 0.5
2428
2429sub check_size {
2430 my ($self) = @_;
2431
2432 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2433} 3641}
2434 3642
2435sub size_request { 3643sub invoke_size_allocate {
2436 ($::WIDTH, $::HEIGHT)
2437}
2438
2439sub configure {
2440 my ($self, $x, $y, $w, $h) = @_; 3644 my ($self, $w, $h) = @_;
2441 3645
2442 $self->SUPER::configure ($x, $y, $w, $h);
2443
2444 for my $child (@{$self->{children}}) { 3646 for my $child ($self->children) {
2445 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3647 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2446 3648
2447 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3649 $X = $child->{force_x} if exists $child->{force_x};
2448 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3650 $Y = $child->{force_y} if exists $child->{force_y};
3651
3652 $X = _to_pixel $X, $W, $self->{w};
3653 $Y = _to_pixel $Y, $H, $self->{h};
3654
2449 $child->configure ($X, $Y, $W,$H); 3655 $child->configure ($X, $Y, $W, $H);
3656 }
3657
2450 } 3658 1
2451} 3659}
2452 3660
2453sub _topleft { 3661sub coord2local {
2454 my ($self, $x, $y) = @_; 3662 my ($self, $x, $y) = @_;
2455 3663
2456 ($x, $y) 3664 ($x, $y)
2457} 3665}
2458 3666
3667sub coord2global {
3668 my ($self, $x, $y) = @_;
3669
3670 ($x, $y)
3671}
3672
2459sub update { 3673sub update {
2460 my ($self) = @_; 3674 my ($self) = @_;
2461 3675
2462 $self->check_size; 3676 $::WANT_REFRESH++;
2463 ::refresh ();
2464} 3677}
2465 3678
2466sub add { 3679sub add {
2467 my ($self, $child) = @_; 3680 my ($self, @children) = @_;
2468 3681
2469 # integerize window positions 3682 $_->{is_toplevel} = 1
2470 $child->{x} = int $child->{x}; 3683 for @children;
2471 $child->{y} = int $child->{y};
2472 3684
2473 $self->SUPER::add ($child); 3685 $self->SUPER::add (@children);
3686}
3687
3688sub remove {
3689 my ($self, @children) = @_;
3690
3691 $self->SUPER::remove (@children);
3692
3693 delete $self->{is_toplevel}
3694 for @children;
3695
3696 while (@children) {
3697 my $w = pop @children;
3698 push @children, $w->children;
3699 $w->set_invisible;
3700 }
2474} 3701}
2475 3702
2476sub on_refresh { 3703sub on_refresh {
2477 my ($self, $id, $cb) = @_; 3704 my ($self, $id, $cb) = @_;
2478 3705
2479 $self->{refresh_hook}{$id} = $cb; 3706 $self->{refresh_hook}{$id} = $cb;
2480} 3707}
2481 3708
3709sub on_post_alloc {
3710 my ($self, $id, $cb) = @_;
3711
3712 $self->{post_alloc_hook}{$id} = $cb;
3713}
3714
2482sub draw { 3715sub draw {
2483 my ($self) = @_; 3716 my ($self) = @_;
2484 3717
2485 while (my $rcb = delete $self->{refresh_hook}) { 3718 while ($self->{refresh_hook}) {
2486 $_->() for values %$rcb; 3719 $_->()
3720 for values %{delete $self->{refresh_hook}};
2487 } 3721 }
3722
3723 if ($self->{realloc}) {
3724 my %queue;
3725 my @queue;
3726 my $widget;
3727
3728 outer:
3729 while () {
3730 if (my $realloc = delete $self->{realloc}) {
3731 for $widget (values %$realloc) {
3732 $widget->{visible} or next; # do not resize invisible widgets
3733
3734 $queue{$widget+0}++ and next; # duplicates are common
3735
3736 push @{ $queue[$widget->{visible}] }, $widget;
3737 }
3738 }
3739
3740 while () {
3741 @queue or last outer;
3742
3743 $widget = pop @{ $queue[-1] || [] }
3744 and last;
3745
3746 pop @queue;
3747 }
3748
3749 delete $queue{$widget+0};
3750
3751 my ($w, $h) = $widget->size_request;
3752
3753 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3754 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3755
3756 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3757 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3758
3759 $w = $widget->{force_w} if exists $widget->{force_w};
3760 $h = $widget->{force_h} if exists $widget->{force_h};
3761
3762 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3763 || delete $widget->{force_realloc}) {
3764 $widget->{req_w} = $w;
3765 $widget->{req_h} = $h;
3766
3767 $self->{size_alloc}{$widget+0} = $widget;
3768
3769 if (my $parent = $widget->{parent}) {
3770 $self->{realloc}{$parent+0} = $parent
3771 unless $queue{$parent+0};
3772
3773 $parent->{force_size_alloc} = 1;
3774 $self->{size_alloc}{$parent+0} = $parent;
3775 }
3776 }
3777
3778 delete $self->{realloc}{$widget+0};
3779 }
3780 }
3781
3782 while (my $size_alloc = delete $self->{size_alloc}) {
3783 my @queue = sort { $b->{visible} <=> $a->{visible} }
3784 values %$size_alloc;
3785
3786 while () {
3787 my $widget = pop @queue || last;
3788
3789 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3790
3791 $w = 0 if $w < 0;
3792 $h = 0 if $h < 0;
3793
3794 $w = int $w + 0.5;
3795 $h = int $h + 0.5;
3796
3797 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3798 $widget->{old_w} = $widget->{w};
3799 $widget->{old_h} = $widget->{h};
3800
3801 $widget->{w} = $w;
3802 $widget->{h} = $h;
3803
3804 $widget->emit (size_allocate => $w, $h);
3805 }
3806 }
3807 }
3808
3809 while ($self->{post_alloc_hook}) {
3810 $_->()
3811 for values %{delete $self->{post_alloc_hook}};
3812 }
3813
2488 3814
2489 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3815 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2490 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3816 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2491 glClear GL_COLOR_BUFFER_BIT; 3817 glClear GL_COLOR_BUFFER_BIT;
2492 3818
2493 glMatrixMode GL_PROJECTION; 3819 glMatrixMode GL_PROJECTION;
2494 glLoadIdentity; 3820 glLoadIdentity;
2495 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3821 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2496 glMatrixMode GL_MODELVIEW; 3822 glMatrixMode GL_MODELVIEW;
2497 glLoadIdentity; 3823 glLoadIdentity;
2498 3824
3825 {
3826 package CFClient::UI::Base;
3827
3828 ($draw_x, $draw_y, $draw_w, $draw_h) =
3829 (0, 0, $self->{w}, $self->{h});
3830 }
3831
2499 $self->_draw; 3832 $self->_draw;
2500} 3833}
2501 3834
2502############################################################################# 3835#############################################################################
2503 3836
2504package CFClient::UI; 3837package CFClient::UI;
2505 3838
2506$ROOT = new CFClient::UI::Root; 3839$ROOT = new CFClient::UI::Root;
2507$TOOLTIP = new CFClient::UI::Tooltip; 3840$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2508 3841
25091 38421
2510 3843

Diff Legend

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