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

Diff Legend

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