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

Diff Legend

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