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

Diff Legend

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