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

Diff Legend

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