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

Diff Legend

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