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

Diff Legend

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