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.179 by elmex, Fri Apr 28 05:17:21 2006 UTC vs.
Revision 1.291 by root, Tue Jun 6 02:55:50 2006 UTC

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

Diff Legend

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