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.151 by root, Sun Apr 23 00:57:39 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;
13our $TOOLTIP; 17our $TOOLTIP;
14our $BUTTON_STATE; 18our $BUTTON_STATE;
15 19
16sub check_tooltip { 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
17 if (!$GRAB) { 23 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
22 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
23 $TOOLTIP->set_text ($widget->{tooltip}); 37 $TOOLTIP->set_tooltip_from ($widget);
24 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
25 $TOOLTIP->show; 38 $TOOLTIP->show;
26 } 39 }
27 40
28 return; 41 return;
29 } 42 }
30 } 43 }
31 } 44 }
32 45
33 $TOOLTIP->hide; 46 $TOOLTIP->hide;
34 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
35} 71}
36 72
37# class methods for events 73# class methods for events
38sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
39 $FOCUS->key_down ($_[0]) if $FOCUS; 75 $FOCUS->emit (key_down => $_[0])
76 if $FOCUS;
40} 77}
41 78
42sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
43 $FOCUS->key_up ($_[0]) if $FOCUS; 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS;
44} 82}
45 83
46sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
47 my ($ev) = @_; 85 my ($ev) = @_;
48 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
51 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
52 90
53 $GRAB = $widget; 91 $GRAB = $widget;
54 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
55 93
56 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
57 } 95 }
58 96
59 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
60 98
61 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
100 if $GRAB;
62} 101}
63 102
64sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
65 my ($ev) = @_; 104 my ($ev) = @_;
66 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
67 106
68 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
69 108
70 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
71 110
72 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
112 if $GRAB;
73 113
74 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
75 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
76 $grab->update if $grab; 116 $grab->update if $grab;
77 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
78 118
79 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
80 } 120 }
81} 121}
82 122
83sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
84 my ($ev) = @_; 124 my ($ev) = @_;
… …
90 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
91 131
92 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
93 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
94 134
95 check_tooltip; 135 $TOOLTIP_WATCHER->start;
96 } 136 }
97 137
98 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER;
99} 140}
100 141
101# convert position array to integers 142# convert position array to integers
102sub harmonize { 143sub harmonize {
103 my ($vals) = @_; 144 my ($vals) = @_;
… …
109 $rem += $_ - $i; 150 $rem += $_ - $i;
110 $_ = $i; 151 $_ = $i;
111 } 152 }
112} 153}
113 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
114############################################################################# 196#############################################################################
115 197
116package CFClient::UI::Base; 198package CFClient::UI::Base;
117 199
118use strict; 200use strict;
… …
121 203
122sub new { 204sub new {
123 my $class = shift; 205 my $class = shift;
124 206
125 my $self = bless { 207 my $self = bless {
126 x => 0, 208 x => "center",
127 y => 0, 209 y => "center",
128 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
129 can_events => 1, 213 can_events => 1,
130 @_ 214 @_
131 }, $class; 215 }, $class;
132 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
133 for (keys %$self) { 219 for (keys %$self) {
134 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
135 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
136 } 222 }
137 } 223 }
138 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
139 $self 237 $self
140} 238}
141 239
240sub destroy {
241 my ($self) = @_;
242
243 $self->hide;
244 %$self = ();
245}
246
142sub show { 247sub show {
143 my ($self) = @_; 248 my ($self) = @_;
144 249
145 return if $self->{parent}; 250 return if $self->{parent};
146 251
147 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
148} 253}
149 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
150sub hide { 308sub hide {
151 my ($self) = @_; 309 my ($self) = @_;
152 310
153 return unless $self->{parent}; 311 $self->set_invisible;
154 312
155 $self->{parent}->remove ($self); 313 $self->{parent}->remove ($self)
314 if $self->{parent};
156} 315}
157 316
158sub move { 317sub move_abs {
159 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
160 319
161 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
162 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
163 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
164 323
165 $self->update; 324 $self->update;
166} 325}
167 326
168sub needs_redraw { 327sub set_size {
169 0 328 my ($self, $w, $h) = @_;
329
330 $self->{force_w} = $w;
331 $self->{force_h} = $h;
332
333 $self->realloc;
170} 334}
171 335
172sub size_request { 336sub size_request {
173 require Carp; 337 require Carp;
174 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
176 340
177sub configure { 341sub configure {
178 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
179 343
180 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
181 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
182 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
183 349
184 # use alignment to adjust x, y 350 # use alignment to adjust x, y
185 351
186 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
187 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
188
189 ($w, $h) = ($w2, $h2);
190 } 354 }
191 355
192 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
193 $self->{x} = $x; 357 $self->{x} = $x;
194 $self->{y} = $y; 358 $self->{y} = $y;
195 $self->update; 359 $self->update;
196 } 360 }
197 361
198 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
363 return unless $self->{visible};
364
199 $self->{w} = $w; 365 $self->{alloc_w} = $w;
200 $self->{h} = $h; 366 $self->{alloc_h} = $h;
201 367
202 $self->size_allocate ($w, $h); 368 $self->{root}{size_alloc}{$self+0} = $self;
203 $self->update;
204 } 369 }
205} 370}
206 371
207sub size_allocate { 372sub size_allocate {
208 # nothing to be done 373 # nothing to be done
209} 374}
210 375
211# return top left coordinates 376sub children {
212sub _topleft { 377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
382}
383
384sub set_max_size {
213 my ($self, $x, $y) = @_; 385 my ($self, $w, $h) = @_;
214 386
215 $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 }
216} 407}
217 408
218# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
219sub coord2local { 410sub coord2local {
220 my ($self, $x, $y) = @_; 411 my ($self, $x, $y) = @_;
221 412
222 my ($X, $Y) = $self->_topleft; 413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
223 ($x - $X, $y - $Y)
224} 414}
225 415
226# translate local coordinates to global coordinate system 416# translate local coordinates to global coordinate system
227sub coord2global { 417sub coord2global {
228 my ($self, $x, $y) = @_; 418 my ($self, $x, $y) = @_;
229 419
230 my ($X, $Y) = $self->_topleft; 420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
231 ($x + $X, $y + $Y)
232} 421}
233 422
234sub focus_in { 423sub focus_in {
235 my ($self) = @_; 424 my ($self) = @_;
236 425
237 return if $FOCUS == $self; 426 return if $FOCUS == $self;
238 return unless $self->{can_focus}; 427 return unless $self->{can_focus};
239 428
240 my $focus = $FOCUS; $FOCUS = $self; 429 my $focus = $FOCUS; $FOCUS = $self;
241 430
242 $self->emit (focus_in => $focus); 431 $self->_emit (focus_in => $focus);
243 432
244 $focus->update if $focus; 433 $focus->update if $focus;
245 $FOCUS->update; 434 $FOCUS->update;
246} 435}
247 436
… …
250 439
251 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
252 441
253 my $focus = $FOCUS; undef $FOCUS; 442 my $focus = $FOCUS; undef $FOCUS;
254 443
255 $self->emit (focus_out => $focus); 444 $self->_emit (focus_out => $focus);
256 445
257 $focus->update if $focus; #? 446 $focus->update if $focus; #?
258}
259 447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
449 unless $FOCUS;
450}
451
260sub mouse_motion { } 452sub mouse_motion { 0 }
261sub button_up { } 453sub button_up { 0 }
262sub key_down { } 454sub key_down { 0 }
263sub key_up { } 455sub key_up { 0 }
264 456
265sub button_down { 457sub button_down {
266 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
267 459
268 $self->focus_in; 460 $self->focus_in;
269}
270 461
271sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
272sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
273sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
274sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
275sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
276
277sub draw {
278 my ($self) = @_;
279
280 return unless $self->{h} && $self->{w};
281
282 glPushMatrix;
283 glTranslate $self->{x}, $self->{y}, 0;
284 $self->_draw;
285 glPopMatrix;
286
287 if ($self == $HOVER && $self->{can_hover}) {
288 my ($x, $y) = @$self{qw(x y)};
289
290 glColor 1, 0.8, 0.5, 0.2;
291 glEnable GL_BLEND;
292 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
293 glBegin GL_QUADS;
294 glVertex $x , $y;
295 glVertex $x + $self->{w}, $y;
296 glVertex $x + $self->{w}, $y + $self->{h};
297 glVertex $x , $y + $self->{h};
298 glEnd;
299 glDisable GL_BLEND;
300 } 462 0
301}
302
303sub _draw {
304 my ($self) = @_;
305
306 warn "no draw defined for $self\n";
307} 463}
308 464
309sub find_widget { 465sub find_widget {
310 my ($self, $x, $y) = @_; 466 my ($self, $x, $y) = @_;
311 467
… …
320 476
321sub set_parent { 477sub set_parent {
322 my ($self, $parent) = @_; 478 my ($self, $parent) = @_;
323 479
324 Scalar::Util::weaken ($self->{parent} = $parent); 480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
325} 482}
326 483
327sub 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 {
328 my ($self) = @_; 504 #my ($self, $visible) = @_;
505}
329 506
330 return unless $self->{parent}; 507sub realloc {
508 my ($self) = @_;
331 509
332 my ($w, $h) = $self->size_request; 510 if ($self->{visible}) {
511 return if $self->{root}{realloc}{$self+0};
333 512
334 if ($w != $self->{req_w} || $h != $self->{req_h}) { 513 $self->{root}{realloc}{$self+0} = $self;
514 $self->{root}->update;
515 } else {
335 $self->{req_w} = $w; 516 delete $self->{req_w};
336 $self->{req_h} = $h; 517 delete $self->{req_h};
337
338 $self->{parent}->check_size;
339 } 518 }
340} 519}
341 520
342sub update { 521sub update {
343 my ($self) = @_; 522 my ($self) = @_;
344 523
345 $self->{parent}->update 524 $self->{parent}->update
346 if $self->{parent}; 525 if $self->{parent};
347} 526}
348 527
349sub connect { 528sub reconfigure {
350 my ($self, $signal, $cb) = @_; 529 my ($self) = @_;
351 530
352 push @{ $self->{signal_cb}{$signal} }, $cb; 531 # some widgets cache req_w and req_h
353} 532 delete $self->{req_w};
533 delete $self->{req_h};
354 534
355sub emit { 535 $self->realloc;
356 my ($self, $signal, @args) = @_; 536 $self->update;
537}
357 538
358 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 539# using global variables seems a bit hacky, but passing through all drawing
359 $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;
360 } 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";
361} 596}
362 597
363sub DESTROY { 598sub DESTROY {
364 my ($self) = @_; 599 my ($self) = @_;
365 600
601 delete $WIDGET{$self+0};
366 #$self->deactivate; 602 #$self->deactivate;
367} 603}
368 604
369############################################################################# 605#############################################################################
370 606
… …
379 my $class = shift; 615 my $class = shift;
380 616
381 # range [value, low, high, page] 617 # range [value, low, high, page]
382 618
383 $class->SUPER::new ( 619 $class->SUPER::new (
384 bg => [0, 0, 0, 0.2], 620 #bg => [0, 0, 0, 0.2],
385 active_bg => [1, 1, 1, 0.5], 621 #active_bg => [1, 1, 1, 0.5],
386 @_ 622 @_
387 ) 623 )
388} 624}
389 625
390sub _draw { 626sub _draw {
391 my ($self) = @_; 627 my ($self) = @_;
392 628
629 my $color = $FOCUS == $self && $self->{active_bg}
630 ? $self->{active_bg}
631 : $self->{bg};
632
633 if ($color && (@$color < 4 || $color->[3])) {
393 my ($w, $h) = @$self{qw(w h)}; 634 my ($w, $h) = @$self{qw(w h)};
394 635
395 glEnable GL_BLEND; 636 glEnable GL_BLEND;
396 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 637 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
397 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 638 glColor_premultiply @$color;
398 639
399 glBegin GL_QUADS; 640 glBegin GL_QUADS;
400 glVertex 0 , 0; 641 glVertex 0 , 0;
401 glVertex 0 , $h; 642 glVertex 0 , $h;
402 glVertex $w, $h; 643 glVertex $w, $h;
403 glVertex $w, 0; 644 glVertex $w, 0;
404 glEnd; 645 glEnd;
405 646
406 glDisable GL_BLEND; 647 glDisable GL_BLEND;
648 }
407} 649}
408 650
409############################################################################# 651#############################################################################
410 652
411package CFClient::UI::Empty; 653package CFClient::UI::Empty;
… …
416 my ($class, %arg) = @_; 658 my ($class, %arg) = @_;
417 $class->SUPER::new (can_events => 0, %arg); 659 $class->SUPER::new (can_events => 0, %arg);
418} 660}
419 661
420sub size_request { 662sub size_request {
421 (0, 0) 663 my ($self) = @_;
664
665 ($self->{w} + 0, $self->{h} + 0)
422} 666}
423 667
424sub draw { } 668sub draw { }
425 669
426############################################################################# 670#############################################################################
… …
430our @ISA = CFClient::UI::Base::; 674our @ISA = CFClient::UI::Base::;
431 675
432sub new { 676sub new {
433 my ($class, %arg) = @_; 677 my ($class, %arg) = @_;
434 678
435 my $children = delete $arg{children} || []; 679 my $children = delete $arg{children};
436 680
437 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 681 my $self = $class->SUPER::new (
682 children => [],
683 can_events => 0,
684 %arg,
685 );
686
438 $self->add ($_) for @$children; 687 $self->add (@$children)
688 if $children;
439 689
440 $self 690 $self
441} 691}
442 692
443sub add { 693sub add {
444 my ($self, $child) = @_; 694 my ($self, @widgets) = @_;
445 695
446 $child->set_parent ($self); 696 $_->set_parent ($self)
697 for @widgets;
447 698
448 use sort 'stable'; 699 use sort 'stable';
449 700
450 $self->{children} = [ 701 $self->{children} = [
451 sort { $a->{z} <=> $b->{z} } 702 sort { $a->{z} <=> $b->{z} }
452 @{$self->{children}}, $child 703 @{$self->{children}}, @widgets
453 ]; 704 ];
454 705
455 $child->check_size; 706 $self->realloc;
707}
708
709sub children {
710 @{ $_[0]{children} }
456} 711}
457 712
458sub remove { 713sub remove {
459 my ($self, $child) = @_; 714 my ($self, $child) = @_;
460 715
461 delete $child->{parent}; 716 delete $child->{parent};
717 $child->hide;
462 718
463 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 719 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
464 720
465 $self->check_size; 721 $self->realloc;
466 $self->update; 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;
467} 736}
468 737
469sub find_widget { 738sub find_widget {
470 my ($self, $x, $y) = @_; 739 my ($self, $x, $y) = @_;
471 740
472 $x -= $self->{x}; 741 $x -= $self->{x};
473 $y -= $self->{y}; 742 $y -= $self->{y};
474 743
475 my $res; 744 my $res;
476 745
477 for (reverse @{ $self->{children} }) { 746 for (reverse $self->visible_children) {
478 $res = $_->find_widget ($x, $y) 747 $res = $_->find_widget ($x, $y)
479 and return $res; 748 and return $res;
480 } 749 }
481 750
482 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 751 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
531 $self->{children}[0]->configure (0, 0, $w, $h); 800 $self->{children}[0]->configure (0, 0, $w, $h);
532} 801}
533 802
534############################################################################# 803#############################################################################
535 804
805# back-buffered drawing area
806
536package CFClient::UI::Window; 807package CFClient::UI::Window;
537 808
538our @ISA = CFClient::UI::Bin::; 809our @ISA = CFClient::UI::Bin::;
539 810
540use CFClient::OpenGL; 811use CFClient::OpenGL;
… …
546} 817}
547 818
548sub update { 819sub update {
549 my ($self) = @_; 820 my ($self) = @_;
550 821
551 # we want to do this delayed... 822 $ROOT->on_post_alloc ($self => sub { $self->render_child });
552 $self->render_chld;
553 $self->SUPER::update; 823 $self->SUPER::update;
554}
555
556sub render_chld {
557 my ($self) = @_;
558
559 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
560 glClearColor 0, 0, 0, 1;
561 glClear GL_COLOR_BUFFER_BIT;
562 $self->child->draw;
563 };
564} 824}
565 825
566sub size_allocate { 826sub size_allocate {
567 my ($self, $w, $h) = @_; 827 my ($self, $w, $h) = @_;
568 828
569 $self->child->configure (0, 0, $w, $h); 829 $self->SUPER::size_allocate ($w, $h);
830 $self->update;
831}
570 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
571 $self->render_chld; 853 $self->_render;
854 };
572} 855}
573 856
574sub _draw { 857sub _draw {
575 my ($self) = @_; 858 my ($self) = @_;
576 859
577 my ($w, $h) = ($self->w, $self->h); 860 my ($w, $h) = @$self{qw(w h)};
578 861
579 my $tex = $self->{texture} 862 my $tex = $self->{texture}
580 or return; 863 or return;
581 864
582 glEnable GL_BLEND;
583 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
584 glEnable GL_TEXTURE_2D; 865 glEnable GL_TEXTURE_2D;
585 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;
586 868
587 $tex->draw_quad (0, 0, $w, $h); 869 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
588 870
589 glDisable GL_BLEND;
590 glDisable GL_TEXTURE_2D; 871 glDisable GL_TEXTURE_2D;
591} 872}
592 873
593############################################################################# 874#############################################################################
594 875
595package CFClient::UI::ViewPort; 876package CFClient::UI::ViewPort;
596 877
597our @ISA = CFClient::UI::Window::; 878our @ISA = CFClient::UI::Window::;
598
599sub new { die }
600
601sub size_request {
602 my ($self) = @_;
603
604 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
605 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
606
607 @$self{qw(child_w child_h)}
608}
609
610sub _draw {
611 my ($self) = @_;
612
613 $self->{children}[1]->draw;
614}
615
616
617#############################################################################
618
619package CFClient::UI::Frame;
620
621our @ISA = CFClient::UI::Bin::;
622
623use CFClient::OpenGL;
624 879
625sub new { 880sub new {
626 my $class = shift; 881 my $class = shift;
627 882
628 my $self = $class->SUPER::new ( 883 $class->SUPER::new (
629 bg => [1, 1, 1, 1], 884 scroll_x => 0,
630 border_bg => [1, 1, 1, 1], 885 scroll_y => 1,
631 border => 0.8,
632 @_ 886 @_,
633 ); 887 )
634
635 $self
636}
637
638sub set_size {
639 my ($self, $w, $h) = @_;
640 $self->{req_w} = $w;
641 $self->{req_h} = $h;
642 $self->check_size;
643} 888}
644 889
645sub size_request { 890sub size_request {
646 my ($self) = @_; 891 my ($self) = @_;
647 ($self->{req_w}, $self->{req_h}) 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)
648} 899}
649 900
650sub size_allocate { 901sub size_allocate {
651 my ($self, $w, $h) = @_; 902 my ($self, $w, $h) = @_;
652 $self->{w} = $w; 903
653 $self->{h} = $h; 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
654 $self->child->configure (0, 0, $w, $h); 909 $self->child->configure (0, 0, $w, $h);
910 $self->update;
655} 911}
656 912
657sub _draw { 913sub set_offset {
658 my ($self) = @_; 914 my ($self, $x, $y) = @_;
659 915
660 my ($w, $h) = ($self->{w}, $self->{h}); 916 $self->{view_x} = int $x;
917 $self->{view_y} = int $y;
661 918
662 glEnable GL_BLEND; 919 $self->update;
663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 920}
664 glEnable GL_TEXTURE_2D;
665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
666 921
667# glBegin GL_QUADS; 922# hmm, this does not work for topleft of $self... but we should not ask for that
668# glColor 0, 0, 0, 0; 923sub coord2local {
669# glVertex 0 , 0; 924 my ($self, $x, $y) = @_;
670# glVertex 0 , $h;
671# glVertex $w, $h;
672# glVertex $w, 0;
673# glEnd;
674 925
926 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
927}
675 928
676 $self->child->draw; 929sub coord2global {
677 glDisable GL_BLEND; 930 my ($self, $x, $y) = @_;
678 glDisable GL_TEXTURE_2D; 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;
679} 959}
680 960
681############################################################################# 961#############################################################################
682 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
683package CFClient::UI::FancyFrame; 1024package CFClient::UI::Frame;
684 1025
685our @ISA = CFClient::UI::Bin::; 1026our @ISA = CFClient::UI::Bin::;
686 1027
687use CFClient::OpenGL; 1028use CFClient::OpenGL;
688
689my @tex =
690 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
691 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
692 1029
693sub new { 1030sub new {
694 my $class = shift; 1031 my $class = shift;
695 1032
696 # TODO: user_x, user_y, overwrite moveto? 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};
697 1082
698 my $self = $class->SUPER::new ( 1083 my $self = $class->SUPER::new (
699 bg => [1, 1, 1, 1], 1084 bg => [1, 1, 1, 1],
700 border_bg => [1, 1, 1, 1], 1085 border_bg => [1, 1, 1, 1],
701 border => 0.8, 1086 border => 0.6,
702 can_events => 1, 1087 can_events => 1,
703 @_ 1088 min_w => 16,
1089 min_h => 16,
1090 %arg,
704 ); 1091 );
705 1092
706 $self->{title} &&= new CFClient::UI::Label 1093 $self->{title} = new CFClient::UI::Label
707 align => 0, 1094 align => 0,
708 valign => 1, 1095 valign => 1,
709 text => $self->{title}, 1096 text => $title,
710 fontsize => 1; 1097 fontsize => $self->{border}
1098 if defined $title;
711 1099
712 $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};
713} 1108}
714 1109
715sub border { 1110sub border {
716 int $_[0]{border} * $::FONTSIZE 1111 int $_[0]{border} * $::FONTSIZE
717} 1112}
718 1113
719sub size_request { 1114sub size_request {
720 my ($self) = @_; 1115 my ($self) = @_;
721 1116
722 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h}; 1117 $self->{title}->size_request
1118 if $self->{title};
723 1119
724 my ($w, $h) = $self->SUPER::size_request; 1120 my ($w, $h) = $self->SUPER::size_request;
725 1121
726 ( 1122 (
727 $w + $self->border * 2, 1123 $w + $self->border * 2,
… …
730} 1126}
731 1127
732sub size_allocate { 1128sub size_allocate {
733 my ($self, $w, $h) = @_; 1129 my ($self, $w, $h) = @_;
734 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
735 $h -= List::Util::max 0, $self->border * 2; 1139 $h -= List::Util::max 0, $border * 2;
736 $w -= List::Util::max 0, $self->border * 2; 1140 $w -= List::Util::max 0, $border * 2;
737 1141
738 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
739 if $self->{title};
740
741 $self->child->configure ($self->border, $self->border, $w, $h); 1142 $self->child->configure ($border, $border, $w, $h);
742} 1143}
743 1144
744sub button_down { 1145sub button_down {
745 my ($self, $ev, $x, $y) = @_; 1146 my ($self, $ev, $x, $y) = @_;
746 1147
1148 my ($w, $h) = @$self{qw(w h)};
747 my $border = $self->border; 1149 my $border = $self->border;
748 1150
749 if ($x < $self->{w} && $x >= $self->{w} - $border 1151 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
750 && $y < $self->{h} && $y >= $self->{h} - $border) { 1152 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
751 1153
1154 if ($lr & $td) {
1155 my ($wx, $wy) = ($self->{x}, $self->{y});
752 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1156 my ($ox, $oy) = ($ev->{x}, $ev->{y});
753 my ($bw, $bh) = ($self->{w}, $self->{h}); 1157 my ($bw, $bh) = ($self->{w}, $self->{h});
754 1158
1159 my $mx = $x < $border;
1160 my $my = $y < $border;
1161
755 $self->{motion} = sub { 1162 $self->{motion} = sub {
756 my ($ev, $x, $y) = @_; 1163 my ($ev, $x, $y) = @_;
757 1164
758 ($x, $y) = ($ev->{x}, $ev->{y}); 1165 my $dx = $ev->{x} - $ox;
1166 my $dy = $ev->{y} - $oy;
759 1167
760 $self->{user_w} = $bw + $x - $ox; 1168 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
761 $self->{user_h} = $bh + $y - $oy; 1169 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
762 $self->check_size; 1170
1171 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1172 $self->realloc;
763 }; 1173 };
764 1174
765 } elsif ($x >= 0 && $x < $self->{w} 1175 } elsif ($lr ^ $td) {
766 && $y >= 0 && $y < $border) {
767
768 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1176 my ($ox, $oy) = ($ev->{x}, $ev->{y});
769 my ($bx, $by) = ($self->{x}, $self->{y}); 1177 my ($bx, $by) = ($self->{x}, $self->{y});
770 1178
771 $self->{motion} = sub { 1179 $self->{motion} = sub {
772 my ($ev, $x, $y) = @_; 1180 my ($ev, $x, $y) = @_;
773 1181
774 ($x, $y) = ($ev->{x}, $ev->{y}); 1182 ($x, $y) = ($ev->{x}, $ev->{y});
775 1183
776 $self->move ($bx + $x - $ox, $by + $y - $oy); 1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
777 $self->update; 1185 # HACK: the next line is required to enforce placement
1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
778 }; 1187 };
1188 } else {
1189 return 0;
1190 }
1191
779 } 1192 1
780} 1193}
781 1194
782sub button_up { 1195sub button_up {
783 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
784 1197
785 delete $self->{motion}; 1198 !!delete $self->{motion}
786} 1199}
787 1200
788sub mouse_motion { 1201sub mouse_motion {
789 my ($self, $ev, $x, $y) = @_; 1202 my ($self, $ev, $x, $y) = @_;
790 1203
791 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1204 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205
1206 !!$self->{motion}
792} 1207}
793 1208
794sub _draw { 1209sub _draw {
795 my ($self) = @_; 1210 my ($self) = @_;
796 1211
1212 my $child = $self->{children}[0];
1213
797 my ($w, $h ) = ($self->{w}, $self->{h}); 1214 my ($w, $h ) = ($self->{w}, $self->{h});
798 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1215 my ($cw, $ch) = ($child->{w}, $child->{h});
799 1216
800 glEnable GL_BLEND;
801 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
802 glEnable GL_TEXTURE_2D; 1217 glEnable GL_TEXTURE_2D;
803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
804 1219
805 my $border = $self->border; 1220 my $border = $self->border;
806 1221
807 glColor @{ $self->{border_bg} }; 1222 glColor @{ $self->{border_bg} };
808 $tex[1]->draw_quad (0, 0, $w, $border); 1223 $border[0]->draw_quad_alpha (0, 0, $w, $border);
809 $tex[3]->draw_quad (0, $border, $border, $ch); 1224 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
810 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1225 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
811 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1226 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
812 1227
813 my $bg = $tex[0]; 1228 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1229 glColor @{ $self->{bg} };
814 1230
815 # TODO: repeat texture not scale 1231 # TODO: repeat texture not scale
816 my $rep_x = $cw / $bg->{w}; 1232 # solve this better(?)
817 my $rep_y = $ch / $bg->{h}; 1233 $bg->{s} = $cw / $bg->{w};
818 1234 $bg->{t} = $ch / $bg->{h};
819 glColor @{ $self->{bg} };
820
821 $bg->{s} = $rep_x;
822 $bg->{t} = $rep_y;
823 $bg->{wrap_mode} = 1;
824 $bg->draw_quad ($border, $border, $cw, $ch); 1235 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1236 }
825 1237
826 glDisable GL_TEXTURE_2D; 1238 glDisable GL_TEXTURE_2D;
827 glDisable GL_BLEND;
828 1239
829 $self->{title}->draw if $self->{title};
830 $self->child->draw; 1240 $child->draw;
1241
1242 if ($self->{title}) {
1243 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw;
1245 }
831} 1246}
832 1247
833############################################################################# 1248#############################################################################
834 1249
835package CFClient::UI::Table; 1250package CFClient::UI::Table;
… …
843sub new { 1258sub new {
844 my $class = shift; 1259 my $class = shift;
845 1260
846 $class->SUPER::new ( 1261 $class->SUPER::new (
847 col_expand => [], 1262 col_expand => [],
848 @_ 1263 @_,
849 ) 1264 )
1265}
1266
1267sub children {
1268 grep $_, map @$_, grep $_, @{ $_[0]{children} }
850} 1269}
851 1270
852sub add { 1271sub add {
853 my ($self, $x, $y, $child) = @_; 1272 my ($self, $x, $y, $child) = @_;
854 1273
855 $child->set_parent ($self); 1274 $child->set_parent ($self);
856 $self->{children}[$y][$x] = $child; 1275 $self->{children}[$y][$x] = $child;
857 1276
858 $child->check_size; 1277 $self->realloc;
859} 1278}
860 1279
861# 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?
862sub clear { 1281sub clear {
863 my ($self) = @_; 1282 my ($self) = @_;
864 1283
1284 my @children = $self->children;
865 delete $self->{children}; 1285 delete $self->{children};
866 $self->update; 1286
1287 for (@children) {
1288 delete $_->{parent};
1289 $_->hide;
1290 }
1291
1292 $self->realloc;
867} 1293}
868 1294
869sub get_wh { 1295sub get_wh {
870 my ($self) = @_; 1296 my ($self) = @_;
871 1297
… …
902sub size_allocate { 1328sub size_allocate {
903 my ($self, $w, $h) = @_; 1329 my ($self, $w, $h) = @_;
904 1330
905 my ($ws, $hs) = $self->get_wh; 1331 my ($ws, $hs) = $self->get_wh;
906 1332
907 my $req_w = sum @$ws; 1333 my $req_w = (sum @$ws) || 1;
908 my $req_h = sum @$hs; 1334 my $req_h = (sum @$hs) || 1;
909 1335
910 # TODO: nicer code && do row_expand 1336 # TODO: nicer code && do row_expand
911 my @col_expand = @{$self->{col_expand}}; 1337 my @col_expand = @{$self->{col_expand}};
912 @col_expand = (1) x @$ws unless @col_expand; 1338 @col_expand = (1) x @$ws unless @col_expand;
913 my $col_expand = (sum @col_expand) || 1; 1339 my $col_expand = (sum @col_expand) || 1;
… …
967 } 1393 }
968} 1394}
969 1395
970############################################################################# 1396#############################################################################
971 1397
972package CFClient::UI::HBox; 1398package CFClient::UI::Box;
973
974# TODO: wrap into common Box base class
975 1399
976our @ISA = CFClient::UI::Container::; 1400our @ISA = CFClient::UI::Container::;
977 1401
978sub size_request { 1402sub size_request {
979 my ($self) = @_; 1403 my ($self) = @_;
980 1404
981 my @alloc = map [$_->size_request], @{$self->{children}}; 1405 $self->{vertical}
982 1406 ? (
983 ( 1407 (List::Util::max map $_->{req_w}, @{$self->{children}}),
984 (List::Util::sum map $_->[0], @alloc), 1408 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
985 (List::Util::max map $_->[1], @alloc), 1409 )
986 ) 1410 : (
1411 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1412 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1413 )
987} 1414}
988 1415
989sub size_allocate { 1416sub size_allocate {
990 my ($self, $w, $h) = @_; 1417 my ($self, $w, $h) = @_;
991 1418
992 ($h, $w) = ($w, $h); 1419 my $space = $self->{vertical} ? $h : $w;
993
994 my $children = $self->{children}; 1420 my $children = $self->{children};
995 1421
996 my @h = map $_->{req_w}, @$children; 1422 my @req;
997 1423
998 my $req_h = List::Util::sum @h; 1424 if ($self->{homogeneous}) {
999 1425 @req = ($space / (@$children || 1)) x @$children;
1000 if ($req_h > $h) {
1001 # ah well, not enough space
1002 $_ *= $h / $req_h for @h;
1003 } 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 {
1004 my $exp = List::Util::sum map $_->{expand}, @$children; 1434 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1005 $exp ||= 1;
1006 1435
1436 $space = ($space - $req) / $expand; # remaining space to give away
1437
1438 $req[$_] += $space * $children->[$_]{expand}
1007 for (0 .. $#$children) { 1439 for 0 .. $#$children;
1008 my $child = $children->[$_];
1009
1010 my $alloc_h = $h[$_];
1011 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1012 $h[$_] = $alloc_h;
1013 } 1440 }
1014 } 1441 }
1015 1442
1016 CFClient::UI::harmonize \@h; 1443 CFClient::UI::harmonize \@req;
1017 1444
1018 my $y = 0; 1445 my $pos = 0;
1019 for (0 .. $#$children) { 1446 for (0 .. $#$children) {
1020 my $child = $children->[$_];
1021 my $h = $h[$_]; 1447 my $alloc = $req[$_];
1022 $child->configure ($y, 0, $h, $w); 1448 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1023 1449
1024 $y += $h; 1450 $pos += $alloc;
1025 } 1451 }
1026 1452
1027 1 1453 1
1028} 1454}
1029 1455
1030############################################################################# 1456#############################################################################
1031 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
1032package CFClient::UI::VBox; 1473package CFClient::UI::VBox;
1033 1474
1034# TODO: wrap into common Box base class
1035
1036our @ISA = CFClient::UI::Container::; 1475our @ISA = CFClient::UI::Box::;
1037 1476
1038sub size_request { 1477sub new {
1039 my ($self) = @_; 1478 my $class = shift;
1040 1479
1041 my @alloc = map [$_->size_request], @{$self->{children}}; 1480 $class->SUPER::new (
1042 1481 vertical => 1,
1043 ( 1482 @_,
1044 (List::Util::max map $_->[0], @alloc),
1045 (List::Util::sum map $_->[1], @alloc),
1046 ) 1483 )
1047} 1484}
1048 1485
1049sub size_allocate {
1050 my ($self, $w, $h) = @_;
1051
1052 my $children = $self->{children};
1053
1054 my @h = map $_->{req_h}, @$children;
1055
1056 my $req_h = List::Util::sum @h;
1057
1058 if ($req_h > $h) {
1059 # ah well, not enough space
1060 $_ *= $h / $req_h for @h;
1061 } else {
1062 my $exp = List::Util::sum map $_->{expand}, @$children;
1063 $exp ||= 1;
1064
1065 for (0 .. $#$children) {
1066 my $child = $children->[$_];
1067
1068 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1069 }
1070 }
1071
1072 CFClient::UI::harmonize \@h;
1073
1074 my $y = 0;
1075 for (0 .. $#$children) {
1076 my $child = $children->[$_];
1077 my $h = $h[$_];
1078 $child->configure (0, $y, $w, $h);
1079
1080 $y += $h;
1081 }
1082
1083 1
1084}
1085
1086############################################################################# 1486#############################################################################
1087 1487
1088package CFClient::UI::Label; 1488package CFClient::UI::Label;
1089 1489
1090our @ISA = CFClient::UI::Base::; 1490our @ISA = CFClient::UI::DrawBG::;
1091 1491
1092use CFClient::OpenGL; 1492use CFClient::OpenGL;
1093 1493
1094sub new { 1494sub new {
1095 my ($class, %arg) = @_; 1495 my ($class, %arg) = @_;
1096 1496
1097 my $self = $class->SUPER::new ( 1497 my $self = $class->SUPER::new (
1098 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),
1099 fontsize => 1, 1507 fontsize => 1,
1100 text => "",
1101 align => -1, 1508 align => -1,
1102 valign => -1, 1509 valign => -1,
1103 padding => 2, 1510 padding_x => 2,
1104 layout => new CFClient::Layout, 1511 padding_y => 2,
1105 can_events => 0, 1512 can_events => 0,
1106 %arg 1513 %arg
1107 ); 1514 );
1108 1515
1109 if (exists $self->{template}) { 1516 if (exists $self->{template}) {
1110 my $layout = new CFClient::Layout; 1517 my $layout = new CFClient::Layout;
1111 $layout->set_text (delete $self->{template}); 1518 $layout->set_text (delete $self->{template});
1112 $self->{template} = $layout; 1519 $self->{template} = $layout;
1113 } 1520 }
1114 1521
1115 $self->set_text (delete $self->{text}) if exists $self->{text}; 1522 if (exists $self->{markup}) {
1116 $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 }
1117 1527
1118 $self 1528 $self
1119} 1529}
1120 1530
1121sub escape_text { 1531sub escape($) {
1122 local $_ = $_[1]; 1532 local $_ = $_[0];
1123 1533
1124 s/&/&amp;/g; 1534 s/&/&amp;/g;
1125 s/>/&gt;/g; 1535 s/>/&gt;/g;
1126 s/</&lt;/g; 1536 s/</&lt;/g;
1127 1537
1128 $_[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;
1129} 1553}
1130 1554
1131sub set_text { 1555sub set_text {
1132 my ($self, $text) = @_; 1556 my ($self, $text) = @_;
1133 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;
1134 $self->{layout}->set_text ($text); 1562 $self->{layout}->set_text ($text);
1135 1563
1136 delete $self->{texture}; 1564 delete $self->{req_h};
1137 $self->check_size; 1565 $self->realloc;
1138 $self->update; 1566 $self->update;
1139} 1567}
1140 1568
1141sub set_markup { 1569sub set_markup {
1142 my ($self, $markup) = @_; 1570 my ($self, $markup) = @_;
1143 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;
1144 $self->{layout}->set_markup ($markup); 1578 $self->{layout}->set_markup ($markup);
1145 1579
1146 delete $self->{texture}; 1580 delete $self->{req_h};
1147 $self->check_size; 1581 $self->realloc;
1148 $self->update; 1582 $self->update;
1149} 1583}
1150 1584
1151sub size_request { 1585sub size_request {
1152 my ($self) = @_; 1586 my ($self) = @_;
1153 1587
1154 $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});
1155 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1156 1596
1157 my ($w, $h) = $self->{layout}->size; 1597 my ($w, $h) = $self->{layout}->size;
1158 1598
1159 if (exists $self->{template}) { 1599 if (exists $self->{template}) {
1600 $self->{template}->set_font ($self->{font}) if $self->{font};
1160 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1602
1162 my ($w2, $h2) = $self->{template}->size; 1603 my ($w2, $h2) = $self->{template}->size;
1163 1604
1164 $w = List::Util::max $w, $w2; 1605 $w = List::Util::max $w, $w2;
1165 $h = List::Util::max $h, $h2; 1606 $h = List::Util::max $h, $h2;
1166 } 1607 }
1167 1608
1609 ($w, $h)
1168 ( 1610 }
1169 $w + $self->{padding} * 2,
1170 $h + $self->{padding} * 2,
1171 )
1172} 1611}
1173 1612
1174sub size_allocate { 1613sub size_allocate {
1175 my ($self, $w, $h) = @_; 1614 my ($self, $w, $h) = @_;
1176 1615
1616 delete $self->{ox};
1617
1177 delete $self->{texture}; 1618 delete $self->{texture}
1619 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1178} 1620}
1179 1621
1180sub set_fontsize { 1622sub set_fontsize {
1181 my ($self, $fontsize) = @_; 1623 my ($self, $fontsize) = @_;
1182 1624
1183 $self->{fontsize} = $fontsize; 1625 $self->{fontsize} = $fontsize;
1184 $self->check_size; 1626 delete $self->{texture};
1627
1628 $self->realloc;
1185} 1629}
1186 1630
1187sub _draw { 1631sub _draw {
1188 my ($self) = @_; 1632 my ($self) = @_;
1189 1633
1634 $self->SUPER::_draw; # draw background, if applicable
1635
1190 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};
1191 $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});
1192 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1642 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1643
1193 new_from_layout CFClient::Texture $self->{layout} 1644 new_from_layout CFClient::Texture $self->{layout}
1194 }; 1645 };
1195 1646
1196 glEnable GL_BLEND; 1647 unless (exists $self->{ox}) {
1197 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
1198 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 {
1199 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1200
1201 glColor @{$self->{fg}};
1202
1203 $self->{ox} = int (
1204 $self->{align} < 0 ? $self->{padding}
1205 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1206 : ($self->{w} - $tex->{w}) * 0.5
1207 );
1208
1209 $self->{oy} = int (
1210 $self->{valign} < 0 ? $self->{padding}
1211 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1212 : ($self->{h} - $tex->{h}) * 0.5
1213 );
1214
1215 $tex->draw_quad ($self->{ox}, $self->{oy}); 1665 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1666 }
1216 1667
1217 glDisable GL_TEXTURE_2D; 1668 glDisable GL_TEXTURE_2D;
1218 glDisable GL_BLEND;
1219} 1669}
1220 1670
1221############################################################################# 1671#############################################################################
1222 1672
1223package CFClient::UI::EntryBase; 1673package CFClient::UI::EntryBase;
… …
1228 1678
1229sub new { 1679sub new {
1230 my $class = shift; 1680 my $class = shift;
1231 1681
1232 $class->SUPER::new ( 1682 $class->SUPER::new (
1233 fg => [1, 1, 1], 1683 fg => [1, 1, 1],
1234 bg => [0, 0, 0, 0.2], 1684 bg => [0, 0, 0, 0.2],
1235 active_bg => [1, 1, 1, 0.5], 1685 active_bg => [1, 1, 1, 0.5],
1236 active_fg => [0, 0, 0], 1686 active_fg => [0, 0, 0],
1237 can_hover => 1, 1687 can_hover => 1,
1238 can_focus => 1, 1688 can_focus => 1,
1239 valign => 0, 1689 valign => 0,
1240 can_events => 1, 1690 can_events => 1,
1691 #text => ...
1241 @_ 1692 @_
1242 ) 1693 )
1243} 1694}
1244 1695
1245sub _set_text { 1696sub _set_text {
… …
1247 1698
1248 delete $self->{cur_h}; 1699 delete $self->{cur_h};
1249 1700
1250 return if $self->{text} eq $text; 1701 return if $self->{text} eq $text;
1251 1702
1252 delete $self->{texture};
1253
1254 $self->{last_activity} = $::NOW; 1703 $self->{last_activity} = $::NOW;
1255 $self->{text} = $text; 1704 $self->{text} = $text;
1256 1705
1257 $text =~ s/./*/g if $self->{hidden}; 1706 $text =~ s/./*/g if $self->{hidden};
1258 $self->{layout}->set_text ("$text "); 1707 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h};
1259 1709
1260 $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);
1261} 1721}
1262 1722
1263sub get_text { 1723sub get_text {
1264 $_[0]{text} 1724 $_[0]{text}
1265} 1725}
… …
1268 my ($self) = @_; 1728 my ($self) = @_;
1269 1729
1270 my ($w, $h) = $self->SUPER::size_request; 1730 my ($w, $h) = $self->SUPER::size_request;
1271 1731
1272 ($w + 1, $h) # add 1 for cursor 1732 ($w + 1, $h) # add 1 for cursor
1273}
1274
1275sub size_allocate {
1276 my ($self, $w, $h) = @_;
1277
1278 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1279}
1280
1281sub set_text {
1282 my ($self, $text) = @_;
1283
1284 $self->{cursor} = length $text;
1285 $self->_set_text ($text);
1286 $self->update;
1287} 1733}
1288 1734
1289sub key_down { 1735sub key_down {
1290 my ($self, $ev) = @_; 1736 my ($self, $ev) = @_;
1291 1737
… …
1293 my $sym = $ev->{sym}; 1739 my $sym = $ev->{sym};
1294 my $uni = $ev->{unicode}; 1740 my $uni = $ev->{unicode};
1295 1741
1296 my $text = $self->get_text; 1742 my $text = $self->get_text;
1297 1743
1298 if ($sym == 8) { 1744 if ($uni == 8) {
1299 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1745 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1300 } elsif ($sym == 127) { 1746 } elsif ($uni == 127) {
1301 substr $text, $self->{cursor}, 1, ""; 1747 substr $text, $self->{cursor}, 1, "";
1302 } elsif ($sym == CFClient::SDLK_LEFT) { 1748 } elsif ($sym == CFClient::SDLK_LEFT) {
1303 --$self->{cursor} if $self->{cursor}; 1749 --$self->{cursor} if $self->{cursor};
1304 } elsif ($sym == CFClient::SDLK_RIGHT) { 1750 } elsif ($sym == CFClient::SDLK_RIGHT) {
1305 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1751 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1306 } elsif ($sym == CFClient::SDLK_HOME) { 1752 } elsif ($sym == CFClient::SDLK_HOME) {
1307 $self->{cursor} = 0; 1753 $self->{cursor} = 0;
1308 } elsif ($sym == CFClient::SDLK_END) { 1754 } elsif ($sym == CFClient::SDLK_END) {
1309 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1310 } elsif ($sym == 27) { 1756 } elsif ($uni == 27) {
1311 $self->emit ('escape'); 1757 $self->_emit ('escape');
1312 } elsif ($uni) { 1758 } elsif ($uni) {
1313 substr $text, $self->{cursor}++, 0, chr $uni; 1759 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else {
1761 return 0;
1314 } 1762 }
1315 1763
1316 $self->_set_text ($text); 1764 $self->_set_text ($text);
1317 $self->update; 1765
1766 $self->realloc;
1767
1768 1
1318} 1769}
1319 1770
1320sub focus_in { 1771sub focus_in {
1321 my ($self) = @_; 1772 my ($self) = @_;
1322 1773
… …
1337 utf8::encode $text; 1788 utf8::encode $text;
1338 $self->{cursor} = length substr $text, 0, $idx; 1789 $self->{cursor} = length substr $text, 0, $idx;
1339 1790
1340 $self->_set_text ($self->{text}); 1791 $self->_set_text ($self->{text});
1341 $self->update; 1792 $self->update;
1793
1794 1
1342} 1795}
1343 1796
1344sub mouse_motion { 1797sub mouse_motion {
1345 my ($self, $ev, $x, $y) = @_; 1798 my ($self, $ev, $x, $y) = @_;
1346# 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
1347} 1802}
1348 1803
1349sub _draw { 1804sub _draw {
1350 my ($self) = @_; 1805 my ($self) = @_;
1351 1806
1352 local $self->{fg} = $self->{fg}; 1807 local $self->{fg} = $self->{fg};
1353 1808
1354 if ($FOCUS == $self) { 1809 if ($FOCUS == $self) {
1355 glColor @{$self->{active_bg}}; 1810 glColor_premultiply @{$self->{active_bg}};
1356 $self->{fg} = $self->{active_fg}; 1811 $self->{fg} = $self->{active_fg};
1357 } else { 1812 } else {
1358 glColor @{$self->{bg}}; 1813 glColor_premultiply @{$self->{bg}};
1359 } 1814 }
1360 1815
1361 glEnable GL_BLEND; 1816 glEnable GL_BLEND;
1362 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1817 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1363 glBegin GL_QUADS; 1818 glBegin GL_QUADS;
1364 glVertex 0 , 0; 1819 glVertex 0 , 0;
1365 glVertex 0 , $self->{h}; 1820 glVertex 0 , $self->{h};
1366 glVertex $self->{w}, $self->{h}; 1821 glVertex $self->{w}, $self->{h};
1367 glVertex $self->{w}, 0; 1822 glVertex $self->{w}, 0;
… …
1398 my ($self, $ev) = @_; 1853 my ($self, $ev) = @_;
1399 1854
1400 my $sym = $ev->{sym}; 1855 my $sym = $ev->{sym};
1401 1856
1402 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} = '';
1403 $self->emit (activate => $self->get_text); 1862 $self->_emit (activate => $txt);
1404 $self->update; 1863 $self->update;
1405 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
1406 } else { 1887 } else {
1407 $self->SUPER::key_down ($ev); 1888 return $self->SUPER::key_down ($ev)
1889 }
1890
1408 } 1891 1
1409
1410} 1892}
1411 1893
1412############################################################################# 1894#############################################################################
1413 1895
1414package CFClient::UI::Button; 1896package CFClient::UI::Button;
… …
1423 1905
1424sub new { 1906sub new {
1425 my $class = shift; 1907 my $class = shift;
1426 1908
1427 $class->SUPER::new ( 1909 $class->SUPER::new (
1428 padding => 4, 1910 padding_x => 4,
1911 padding_y => 4,
1429 fg => [1, 1, 1], 1912 fg => [1, 1, 1],
1430 bg => [1, 1, 1, 0.2],
1431 active_fg => [0, 0, 1], 1913 active_fg => [0, 0, 1],
1432 can_hover => 1, 1914 can_hover => 1,
1433 align => 0, 1915 align => 0,
1434 valign => 0, 1916 valign => 0,
1435 can_events => 1, 1917 can_events => 1,
1436 @_ 1918 @_
1437 ) 1919 )
1438} 1920}
1439 1921
1922sub activate { }
1923
1440sub button_up { 1924sub button_up {
1441 my ($self, $ev, $x, $y) = @_; 1925 my ($self, $ev, $x, $y) = @_;
1442 1926
1927 $self->emit ("activate")
1443 if ($x >= 0 && $x < $self->{w} 1928 if $x >= 0 && $x < $self->{w}
1444 && $y >= 0 && $y < $self->{h}) { 1929 && $y >= 0 && $y < $self->{h};
1445 $self->emit ("activate"); 1930
1446 } 1931 1
1447} 1932}
1448 1933
1449sub _draw { 1934sub _draw {
1450 my ($self) = @_; 1935 my ($self) = @_;
1451 1936
1452 local $self->{fg} = $self->{fg}; 1937 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1453 1938
1454 if ($GRAB == $self) {
1455 $self->{fg} = $self->{active_fg};
1456 }
1457
1458 glEnable GL_BLEND;
1459 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1460 glEnable GL_TEXTURE_2D; 1939 glEnable GL_TEXTURE_2D;
1461 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1940 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1462 glColor 0, 0, 0, 1; 1941 glColor 0, 0, 0, 1;
1463 1942
1464 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1943 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1465 1944
1466 glDisable GL_TEXTURE_2D; 1945 glDisable GL_TEXTURE_2D;
1467 glDisable GL_BLEND;
1468 1946
1469 $self->SUPER::_draw; 1947 $self->SUPER::_draw;
1470} 1948}
1471 1949
1472############################################################################# 1950#############################################################################
… …
1483 1961
1484sub new { 1962sub new {
1485 my $class = shift; 1963 my $class = shift;
1486 1964
1487 $class->SUPER::new ( 1965 $class->SUPER::new (
1488 padding => 2, 1966 padding_x => 2,
1967 padding_y => 2,
1489 fg => [1, 1, 1], 1968 fg => [1, 1, 1],
1490 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],
1491 state => 0, 1972 state => 0,
1492 can_hover => 1, 1973 can_hover => 1,
1493 @_ 1974 @_
1494 ) 1975 )
1495} 1976}
1496 1977
1497sub size_request { 1978sub size_request {
1498 my ($self) = @_; 1979 my ($self) = @_;
1499 1980
1500 ($self->{padding} * 2 + 6) x 2 1981 (6) x 2
1501} 1982}
1502 1983
1503sub button_down { 1984sub button_down {
1504 my ($self, $ev, $x, $y) = @_; 1985 my ($self, $ev, $x, $y) = @_;
1505 1986
1506 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1507 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1508 $self->{state} = !$self->{state}; 1989 $self->{state} = !$self->{state};
1509 $self->emit (changed => $self->{state}); 1990 $self->_emit (changed => $self->{state});
1991 } else {
1992 return 0
1993 }
1994
1510 } 1995 1
1511} 1996}
1512 1997
1513sub _draw { 1998sub _draw {
1514 my ($self) = @_; 1999 my ($self) = @_;
1515 2000
1516 $self->SUPER::_draw; 2001 $self->SUPER::_draw;
1517 2002
1518 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2003 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1519 2004
1520 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;
1521 2008
1522 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2009 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1523 2010
1524 glEnable GL_BLEND; 2011 my $tex = $self->{state} ? $tex[1] : $tex[0];
2012
1525 glEnable GL_TEXTURE_2D; 2013 glEnable GL_TEXTURE_2D;
1526 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1527
1528 my $tex = $self->{state} ? $tex[1] : $tex[0];
1529
1530 $tex->draw_quad (0, 0, $s, $s); 2014 $tex->draw_quad_alpha (0, 0, $s, $s);
1531
1532 glDisable GL_TEXTURE_2D; 2015 glDisable GL_TEXTURE_2D;
1533 glDisable GL_BLEND;
1534} 2016}
1535 2017
1536############################################################################# 2018#############################################################################
1537 2019
1538package CFClient::UI::Image; 2020package CFClient::UI::Image;
… …
1581 glTranslate 0, -$self->{w}, 0; 2063 glTranslate 0, -$self->{w}, 0;
1582 2064
1583 ($w, $h) = ($h, $w); 2065 ($w, $h) = ($h, $w);
1584 } 2066 }
1585 2067
1586 glEnable GL_BLEND;
1587 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1588 glEnable GL_TEXTURE_2D; 2068 glEnable GL_TEXTURE_2D;
1589 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2069 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1590 2070
1591 $tex->draw_quad (0, 0, $w, $h); 2071 $tex->draw_quad_alpha (0, 0, $w, $h);
1592 2072
1593 glDisable GL_BLEND;
1594 glDisable GL_TEXTURE_2D; 2073 glDisable GL_TEXTURE_2D;
1595} 2074}
1596 2075
1597############################################################################# 2076#############################################################################
1598 2077
1599package CFClient::UI::VGauge; 2078package CFClient::UI::VGauge;
1600 2079
1601our @ISA = CFClient::UI::Base::; 2080our @ISA = CFClient::UI::Base::;
2081
2082use List::Util qw(min max);
1602 2083
1603use CFClient::OpenGL; 2084use CFClient::OpenGL;
1604 2085
1605my %tex = ( 2086my %tex = (
1606 food => [ 2087 food => [
1607 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1608 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2089 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1609 ], 2090 ],
1610 grace => [ 2091 grace => [
1611 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2092 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1612 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/
1613 ], 2094 ],
1614 hp => [ 2095 hp => [
1615 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2096 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1616 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2097 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1617 ], 2098 ],
1618 mana => [ 2099 mana => [
1619 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2100 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1620 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/
1621 ], 2102 ],
1622); 2103);
1623 2104
1624# eg. VGauge->new (gauge => 'food'), default gauge: food 2105# eg. VGauge->new (gauge => 'food'), default gauge: food
1625sub new { 2106sub new {
… …
1644} 2125}
1645 2126
1646sub set_max { 2127sub set_max {
1647 my ($self, $max) = @_; 2128 my ($self, $max) = @_;
1648 2129
2130 return if $self->{max_val} == $max;
2131
1649 $self->{max_val} = $max; 2132 $self->{max_val} = $max;
2133 $self->update;
1650} 2134}
1651 2135
1652sub set_value { 2136sub set_value {
1653 my ($self, $val, $max) = @_; 2137 my ($self, $val, $max) = @_;
1654 2138
1655 $self->set_max ($max) 2139 $self->set_max ($max)
1656 if defined $max; 2140 if defined $max;
1657 2141
1658 $max = $self->{max_val}; 2142 return if $self->{val} == $val;
2143
1659 $self->{val} = $val; 2144 $self->{val} = $val;
1660
1661 $self->update; 2145 $self->update;
1662} 2146}
1663 2147
1664sub _draw { 2148sub _draw {
1665 my ($self) = @_; 2149 my ($self) = @_;
1666 2150
1667 my $tex = $tex{$self->{type}}; 2151 my $tex = $tex{$self->{type}};
2152 my ($t1, $t2, $t3) = @$tex;
1668 2153
1669 my ($w, $h) = ($self->{w}, $self->{h}); 2154 my ($w, $h) = ($self->{w}, $self->{h});
1670 2155
1671 if ($self->{vertical}) { 2156 if ($self->{vertical}) {
1672 glRotate 90, 0, 0, 1; 2157 glRotate 90, 0, 0, 1;
… …
1674 2159
1675 ($w, $h) = ($h, $w); 2160 ($w, $h) = ($h, $w);
1676 } 2161 }
1677 2162
1678 my $ycut = $self->{val} / ($self->{max_val} || 1); 2163 my $ycut = $self->{val} / ($self->{max_val} || 1);
1679 $ycut = 1 if $self->{val} > $self->{max_val};
1680 2164
1681 my $t1 = $tex->[0]; 2165 my $ycut1 = max 0, min 1, $ycut;
1682 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);
1683 2170
1684 glEnable GL_BLEND; 2171 glEnable GL_BLEND;
1685 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;
1686 glEnable GL_TEXTURE_2D; 2174 glEnable GL_TEXTURE_2D;
1687 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2175 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1688 2176
1689 my $h1 = $self->{h} - $ycut * $self->{h};
1690 my $h2 = $ycut * $self->{h};
1691
1692 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2177 glBindTexture GL_TEXTURE_2D, $t1->{name};
1693 glBegin GL_QUADS; 2178 glBegin GL_QUADS;
1694 glTexCoord 0 , 0; glVertex 0 , 0; 2179 glTexCoord 0 , 0; glVertex 0 , 0;
1695 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2180 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1696 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2181 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1697 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2182 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1698 glEnd; 2183 glEnd;
1699 2184
2185 my $ycut1 = List::Util::min 1, $ycut;
1700 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2186 glBindTexture GL_TEXTURE_2D, $t2->{name};
1701 glBegin GL_QUADS; 2187 glBegin GL_QUADS;
1702 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2188 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2189 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1704 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2190 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1705 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2191 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1706 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 }
1707 2203
1708 glDisable GL_BLEND; 2204 glDisable GL_BLEND;
1709 glDisable GL_TEXTURE_2D; 2205 glDisable GL_TEXTURE_2D;
1710} 2206}
1711 2207
… …
1717 2213
1718sub new { 2214sub new {
1719 my ($class, %arg) = @_; 2215 my ($class, %arg) = @_;
1720 2216
1721 my $self = $class->SUPER::new ( 2217 my $self = $class->SUPER::new (
1722 tooltip => $arg{type}, 2218 tooltip => $arg{type},
2219 can_hover => 1,
2220 can_events => 1,
1723 %arg, 2221 %arg,
1724 ); 2222 );
1725 2223
1726 $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");
1727 $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);
1728 $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");
1729 2227
1730 $self 2228 $self
1731} 2229}
1732 2230
… …
1735 2233
1736 $self->{value}->set_fontsize ($fsize); 2234 $self->{value}->set_fontsize ($fsize);
1737 $self->{max} ->set_fontsize ($fsize); 2235 $self->{max} ->set_fontsize ($fsize);
1738} 2236}
1739 2237
2238sub set_max {
2239 my ($self, $max) = @_;
2240
2241 $self->{gauge}->set_max ($max);
2242 $self->{max}->set_text ($max);
2243}
2244
1740sub set_value { 2245sub set_value {
1741 my ($self, $val, $max) = @_; 2246 my ($self, $val, $max) = @_;
1742 2247
1743 $self->set_max ($max) 2248 $self->set_max ($max)
1744 if defined $max; 2249 if defined $max;
1745 2250
1746 $self->{gauge}->set_value ($val, $max); 2251 $self->{gauge}->set_value ($val, $max);
1747 $self->{value}->set_text ($val); 2252 $self->{value}->set_text ($val);
1748}
1749
1750sub set_max {
1751 my ($self, $max) = @_;
1752
1753 $self->{gauge}->set_max ($max);
1754 $self->{max}->set_text ($max);
1755} 2253}
1756 2254
1757############################################################################# 2255#############################################################################
1758 2256
1759package CFClient::UI::Slider; 2257package CFClient::UI::Slider;
… …
1769 qw(s1_slider.png s1_slider_bg.png); 2267 qw(s1_slider.png s1_slider_bg.png);
1770 2268
1771sub new { 2269sub new {
1772 my $class = shift; 2270 my $class = shift;
1773 2271
1774 # range [value, low, high, page] 2272 # range [value, low, high, page, unit]
1775 2273
1776 # TODO: 0-width page 2274 # TODO: 0-width page
1777 # TODO: req_w/h are wrong with vertical 2275 # TODO: req_w/h are wrong with vertical
1778 # TODO: calculations are off 2276 # TODO: calculations are off
1779 my $self = $class->SUPER::new ( 2277 my $self = $class->SUPER::new (
1780 fg => [1, 1, 1], 2278 fg => [1, 1, 1],
1781 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],
1782 range => [0, 0, 100, 10], 2282 range => [0, 0, 100, 10, 0],
1783 req_w => 20, 2283 min_w => $::WIDTH / 80,
1784 req_h => 20, 2284 min_h => $::WIDTH / 80,
1785 vertical => 0, 2285 vertical => 0,
1786 can_hover => 1, 2286 can_hover => 1,
1787 inner_pad => 5, 2287 inner_pad => 0.02,
1788 @_ 2288 @_
1789 ); 2289 );
1790 2290
2291 $self->set_value ($self->{range}[0]);
2292 $self->update;
2293
1791 $self 2294 $self
1792} 2295}
1793 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
1794sub size_request { 2331sub size_request {
1795 my ($self) = @_; 2332 my ($self) = @_;
1796 2333
1797 my $w = $self->{req_w}; 2334 ($self->{req_w}, $self->{req_h})
1798 my $h = $self->{req_h};
1799
1800 $self->{vertical} ? ($h, $w) : ($w, $h)
1801} 2335}
1802 2336
1803sub button_down { 2337sub button_down {
1804 my ($self, $ev, $x, $y) = @_; 2338 my ($self, $ev, $x, $y) = @_;
1805 2339
1806 $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
1807 $self->mouse_motion ($ev, $x, $y); 2344 $self->mouse_motion ($ev, $x, $y)
1808} 2345}
1809 2346
1810sub mouse_motion { 2347sub mouse_motion {
1811 my ($self, $ev, $x, $y) = @_; 2348 my ($self, $ev, $x, $y) = @_;
1812 2349
1813 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
1814 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2378 my ($value, $lo, $hi, $page) = @{$self->{range}};
2379 my $range = ($hi - $page - $lo) || 1e-100;
1815 2380
1816 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2381 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1817 2382
1818 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2383 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1819 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2384 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1820 2385
1821 $x -= $inner_pad_px; # substract the padding 2386 $value = ($value - $lo) / $range;
1822 $x = $x * ($hi - $lo) / $inner_w + $lo; 2387 $value = $value * $self->{scale} + $self->{offset};
1823 $x = $lo if $x < $lo;
1824 $x = $hi - $page if $x > $hi - $page;
1825 $self->{range}[0] = $x;
1826 2388
1827 $self->emit (changed => $x); 2389 $self->{knob_x} = $value - $knob_w * 0.5;
1828 $self->update; 2390 $self->{knob_w} = $knob_w;
1829 } 2391 }
1830}
1831
1832# the inner_* stuff is for generating a padding for the slider handle,
1833# so that the handle doesn't leave the texture. This calculation isn't 100%
1834# correct propably, but it does the job for now
1835sub _calc_inner_pad_px {
1836 my ($self, $w) = @_;
1837 ($w / 100) * $self->{inner_pad} # % to pixels
1838}
1839
1840sub _draw {
1841 my ($self) = @_;
1842 2392
1843 $self->SUPER::_draw (); 2393 $self->SUPER::_draw ();
1844 2394
1845 my ($w, $h) = @$self{qw(w h)}; 2395 glScale $self->{w}, $self->{h};
1846 2396
1847 if ($self->{vertical}) { 2397 if ($self->{vertical}) {
1848 # draw a vertical slider like a rotated horizontal slider 2398 # draw a vertical slider like a rotated horizontal slider
1849 2399
2400 glTranslate 1, 0, 0;
1850 glRotate 90, 0, 0, 1; 2401 glRotate 90, 0, 0, 1;
1851 glTranslate 0, -$self->{w}, 0;
1852
1853 ($w, $h) = ($h, $w);
1854 } 2402 }
1855 2403
1856 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2404 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1857 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2405 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1858 2406
1859 my ($value, $lo, $hi, $page) = @{$self->{range}};
1860
1861 $hi = $value + 1 if $lo == $hi;
1862
1863 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1864 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1865
1866 $page = int $page * $inner_w / ($hi - $lo);
1867 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1868
1869 $w -= $page;
1870 $page &= ~1;
1871 glTranslate $page * 0.5, 0, 0;
1872 $page ||= 2;
1873
1874 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1875 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1876
1877 glEnable GL_BLEND;
1878 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1879 glEnable GL_TEXTURE_2D; 2407 glEnable GL_TEXTURE_2D;
1880 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1881 2409
1882 # draw background 2410 # draw background
1883 $tex[1]->draw_quad (0, 0, $w, $h); 2411 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1884 2412
1885 # draw handle 2413 # draw handle
1886 $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);
1887 2415
1888 glDisable GL_BLEND;
1889 glDisable GL_TEXTURE_2D; 2416 glDisable GL_TEXTURE_2D;
1890} 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 (@_) }
1891 2459
1892############################################################################# 2460#############################################################################
1893 2461
1894package CFClient::UI::TextView; 2462package CFClient::UI::TextView;
1895 2463
… …
1899 2467
1900sub new { 2468sub new {
1901 my $class = shift; 2469 my $class = shift;
1902 2470
1903 my $self = $class->SUPER::new ( 2471 my $self = $class->SUPER::new (
1904 fontsize => 1, 2472 fontsize => 1,
2473 can_events => 0,
2474 #font => default_font
1905 @_, 2475 @_,
1906 2476
1907 layout => (new CFClient::Layout), 2477 layout => (new CFClient::Layout 1),
1908 par => [], 2478 par => [],
1909 height => 0, 2479 height => 0,
1910 children => [ 2480 children => [
1911 (new CFClient::UI::Empty expand => 1), 2481 (new CFClient::UI::Empty expand => 1),
1912 (new CFClient::UI::Slider vertical => 1), 2482 (new CFClient::UI::Slider vertical => 1),
1913 ], 2483 ],
1914 ); 2484 );
1915 2485
1916 $self->{children}[1]->connect (changed => sub { 2486 $self->{children}[1]->connect (changed => sub { $self->update });
1917 $self->update;
1918 });
1919 2487
1920 $self 2488 $self
1921} 2489}
1922 2490
1923sub set_fontsize { 2491sub set_fontsize {
… …
1925 2493
1926 $self->{fontsize} = $fontsize; 2494 $self->{fontsize} = $fontsize;
1927 $self->reflow; 2495 $self->reflow;
1928} 2496}
1929 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
1930sub text_height { 2510sub text_size {
1931 my ($self, $text) = @_; 2511 my ($self, $text, $indent) = @_;
1932 2512
1933 my $layout = $self->{layout}; 2513 my $layout = $self->{layout};
1934 2514
1935 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2515 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1936 $layout->set_width ($self->{w}); 2516 $layout->set_width ($self->{children}[0]{w} - $indent);
1937 $layout->set_text ($text); 2517 $layout->set_markup ($text);
1938 2518
1939 ($layout->size)[1] 2519 $layout->size
1940} 2520}
1941 2521
1942sub reflow { 2522sub reflow {
1943 my ($self) = @_; 2523 my ($self) = @_;
1944 2524
1945 $self->{need_reflow}++; 2525 $self->{need_reflow}++;
1946 $self->update; 2526 $self->update;
1947} 2527}
1948 2528
1949sub 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 {
1950 my ($self, $w, $h) = @_; 2537 my ($self) = @_;
1951 2538
1952 $self->SUPER::size_allocate ($w, $h); 2539 $self->{par} = [];
1953 2540 $self->{height} = 0;
1954 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2541 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1955 $self->{layout}->set_width ($self->{children}[0]{w});
1956
1957 $self->reflow;
1958} 2542}
1959 2543
1960sub add_paragraph { 2544sub add_paragraph {
1961 my ($self, $color, $text) = @_; 2545 my ($self, $color, $text, $indent) = @_;
1962 2546
1963 #TODO: intelligently "reformat" paragraph 2547 for my $line (split /\n/, $text) {
1964 2548 my ($w, $h) = $self->text_size ($line);
1965 my $height = $self->text_height ($text);
1966
1967 $self->{height} += $height; 2549 $self->{height} += $h;
2550 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2551 }
1968 2552
1969 push @{$self->{par}}, [$height, $color, $text];
1970
1971 $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]);
1972 $self->{children}[1]->update;
1973} 2554}
1974 2555
1975sub update { 2556sub update {
1976 my ($self) = @_; 2557 my ($self) = @_;
1977 2558
… …
1979 2560
1980 return unless $self->{h} > 0; 2561 return unless $self->{h} > 0;
1981 2562
1982 delete $self->{texture}; 2563 delete $self->{texture};
1983 2564
1984 $ROOT->on_refresh ($self, sub { 2565 $ROOT->on_post_alloc ($self, sub {
2566 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2567
1985 if (delete $self->{need_reflow}) { 2568 if (delete $self->{need_reflow}) {
1986 my $height = 0; 2569 my $height = 0;
1987 2570
1988 $height += $_->[0] = $self->text_height ($_->[2]) 2571 my $layout = $self->{layout};
2572
2573 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2574
1989 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 }
1990 2586
1991 $self->{height} = $height; 2587 $self->{height} = $height;
1992 2588
1993 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2589 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1994 2590
1995 delete $self->{texture}; 2591 delete $self->{texture};
1996 } 2592 }
1997 2593
1998 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2594 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
1999 glClearColor 0, 0, 0, 1; 2595 glClearColor 0, 0, 0, 0;
2000 glClear GL_COLOR_BUFFER_BIT; 2596 glClear GL_COLOR_BUFFER_BIT;
2001 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
2002 glEnable GL_BLEND; 2609 glEnable GL_BLEND;
2610 #TODO# not correct in windows where rgba is forced off
2003 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2611 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2004 glEnable GL_TEXTURE_2D;
2005 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2006
2007 my $top = int $self->{children}[1]{range}[0];
2008
2009 my $y0 = $top;
2010 my $y1 = $top + $self->{h};
2011
2012 my $y = 0;
2013
2014 my $layout = $self->{layout};
2015 2612
2016 for my $par (@{$self->{par}}) { 2613 for my $par (@{$self->{par}}) {
2017 my $h = $par->[0]; 2614 my $h = $par->[1];
2018 2615
2019 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]);
2020 $layout->set_text ($par->[2]); 2619 $layout->set_markup ($par->[4]);
2021 2620
2022 glColor @{ $par->[1] }; 2621 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2023 my ($W, $H) = $layout->size; 2622
2024 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;
2025 } 2625 }
2026 2626
2027 $y += $h; 2627 $y += $h;
2028 } 2628 }
2029 2629
2030 glDisable GL_TEXTURE_2D;
2031 glDisable GL_BLEND; 2630 glDisable GL_BLEND;
2032 }; 2631 };
2033 }); 2632 });
2034} 2633}
2035 2634
2036sub _draw { 2635sub _draw {
2037 my ($self) = @_; 2636 my ($self) = @_;
2038 2637
2039 if ($self->{texture}) {
2040 glEnable GL_TEXTURE_2D; 2638 glEnable GL_TEXTURE_2D;
2041 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2042 $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});
2043 glDisable GL_TEXTURE_2D; 2642 glDisable GL_TEXTURE_2D;
2044 }
2045 2643
2046 $self->{children}[1]->draw; 2644 $self->{children}[1]->draw;
2047 2645
2048} 2646}
2049 2647
… …
2097 2695
2098sub new { 2696sub new {
2099 my $class = shift; 2697 my $class = shift;
2100 2698
2101 my $self = $class->SUPER::new ( 2699 my $self = $class->SUPER::new (
2102 state => 0, 2700 state => 0,
2103 connect_activate => \&toggle_flopper, 2701 on_activate => \&toggle_flopper,
2104 can_events => 1,
2105 @_ 2702 @_
2106 ); 2703 );
2107 2704
2108 if ($self->{state}) {
2109 $self->{state} = 0;
2110 $self->toggle_flopper;
2111 }
2112
2113 $self 2705 $self
2114} 2706}
2115 2707
2116sub toggle_flopper { 2708sub toggle_flopper {
2117 my ($self) = @_; 2709 my ($self) = @_;
2118 2710
2119 # TODO: use animation 2711 $self->{other}->toggle_visibility;
2120 if ($self->{state} = !$self->{state}) { 2712}
2121 $CFClient::UI::ROOT->add ($self->{other}); 2713
2122 $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
2123 $self->emit ("open"); 2970 $self->_emit ("popdown");
2971 $self->{hover}[1]->() if $self->{hover};
2124 } else { 2972 } else {
2125 $CFClient::UI::ROOT->remove ($self->{other}); 2973 return 0
2126 $self->emit ("close"); 2974 }
2975
2127 } 2976 1
2128
2129 $self->emit (changed => $self->{state});
2130} 2977}
2131 2978
2132############################################################################# 2979#############################################################################
2133 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
2134package CFClient::UI::Root; 3527package CFClient::UI::Root;
2135 3528
2136our @ISA = CFClient::UI::Container::; 3529our @ISA = CFClient::UI::Container::;
2137 3530
3531use List::Util qw(min max);
3532
2138use CFClient::OpenGL; 3533use CFClient::OpenGL;
2139 3534
2140sub check_size { 3535sub new {
2141 my ($self) = @_; 3536 my $class = shift;
2142 3537
2143 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3538 my $self = $class->SUPER::new (
3539 visible => 1,
3540 @_,
3541 );
3542
3543 Scalar::Util::weaken ($self->{root} = $self);
3544
3545 $self
2144} 3546}
2145 3547
2146sub size_request { 3548sub size_request {
2147 ($::WIDTH, $::HEIGHT) 3549 my ($self) = @_;
2148}
2149 3550
2150sub 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 {
2151 my ($self, $x, $y, $w, $h) = @_; 3569 my ($self, $w, $h) = @_;
2152 3570
2153 $self->SUPER::configure ($x, $y, $w, $h);
2154
2155 for my $child (@{$self->{children}}) { 3571 for my $child ($self->children) {
2156 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3572 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2157 3573
2158 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3574 $X = $child->{force_x} if exists $child->{force_x};
2159 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3575 $Y = $child->{force_y} if exists $child->{force_y};
3576
3577 $X = _to_pixel $X, $W, $self->{w};
3578 $Y = _to_pixel $Y, $H, $self->{h};
3579
2160 $child->configure ($X, $Y, $W,$H); 3580 $child->configure ($X, $Y, $W, $H);
2161 } 3581 }
2162} 3582}
2163 3583
2164sub _topleft { 3584sub coord2local {
2165 my ($self, $x, $y) = @_; 3585 my ($self, $x, $y) = @_;
2166 3586
2167 ($x, $y) 3587 ($x, $y)
2168} 3588}
2169 3589
3590sub coord2global {
3591 my ($self, $x, $y) = @_;
3592
3593 ($x, $y)
3594}
3595
2170sub update { 3596sub update {
2171 my ($self) = @_; 3597 my ($self) = @_;
2172 3598
2173 $self->check_size; 3599 $::WANT_REFRESH++;
2174 ::refresh ();
2175} 3600}
2176 3601
2177sub add { 3602sub add {
2178 my ($self, $child) = @_; 3603 my ($self, @children) = @_;
2179 3604
2180 # integerize window positions 3605 $_->{is_toplevel} = 1
2181 $child->{x} = int $child->{x}; 3606 for @children;
2182 $child->{y} = int $child->{y};
2183 3607
2184 $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 }
2185} 3624}
2186 3625
2187sub on_refresh { 3626sub on_refresh {
2188 my ($self, $id, $cb) = @_; 3627 my ($self, $id, $cb) = @_;
2189 3628
2190 $self->{refresh_hook}{$id} = $cb; 3629 $self->{refresh_hook}{$id} = $cb;
2191} 3630}
2192 3631
3632sub on_post_alloc {
3633 my ($self, $id, $cb) = @_;
3634
3635 $self->{post_alloc_hook}{$id} = $cb;
3636}
3637
2193sub draw { 3638sub draw {
2194 my ($self) = @_; 3639 my ($self) = @_;
2195 3640
2196 while (my $rcb = delete $self->{refresh_hook}) { 3641 while ($self->{refresh_hook}) {
2197 $_->() for values %$rcb; 3642 $_->()
3643 for values %{delete $self->{refresh_hook}};
2198 } 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
2199 3737
2200 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3738 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2201 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3739 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2202 glClear GL_COLOR_BUFFER_BIT; 3740 glClear GL_COLOR_BUFFER_BIT;
2203 3741
2204 glMatrixMode GL_PROJECTION; 3742 glMatrixMode GL_PROJECTION;
2205 glLoadIdentity; 3743 glLoadIdentity;
2206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3744 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2207 glMatrixMode GL_MODELVIEW; 3745 glMatrixMode GL_MODELVIEW;
2208 glLoadIdentity; 3746 glLoadIdentity;
2209 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
2210 $self->_draw; 3755 $self->_draw;
2211} 3756}
2212 3757
2213############################################################################# 3758#############################################################################
2214 3759
2215package CFClient::UI; 3760package CFClient::UI;
2216 3761
2217$ROOT = new CFClient::UI::Root; 3762$ROOT = new CFClient::UI::Root;
2218$TOOLTIP = new CFClient::UI::Label fontsize => 0.8, can_events => 0; 3763$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2219 3764
22201 37651
2221 3766

Diff Legend

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