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.163 by root, Mon Apr 24 06:40:29 2006 UTC vs.
Revision 1.303 by elmex, Tue Jun 13 10:28:38 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 (children => [], can_events => 0, %arg); 679 my $self = $class->SUPER::new (
680 children => [],
681 can_events => 0,
682 %arg,
683 );
684
498 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
499 687
500 $self 688 $self
501} 689}
502 690
503sub add { 691sub add {
504 my ($self, $child) = @_; 692 my ($self, @widgets) = @_;
505 693
506 $child->set_parent ($self); 694 $_->set_parent ($self)
695 for @widgets;
507 696
508 use sort 'stable'; 697 use sort 'stable';
509 698
510 $self->{children} = [ 699 $self->{children} = [
511 sort { $a->{z} <=> $b->{z} } 700 sort { $a->{z} <=> $b->{z} }
512 @{$self->{children}}, $child 701 @{$self->{children}}, @widgets
513 ]; 702 ];
514 703
515 $child->check_size; 704 $self->realloc;
705}
706
707sub children {
708 @{ $_[0]{children} }
516} 709}
517 710
518sub remove { 711sub remove {
519 my ($self, $child) = @_; 712 my ($self, $child) = @_;
520 713
521 delete $child->{parent}; 714 delete $child->{parent};
522 $child->hide; 715 $child->hide;
523 716
524 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
525 718
526 $self->check_size; 719 $self->realloc;
527 $self->update;
528} 720}
529 721
530sub clear { 722sub clear {
531 my ($self) = @_; 723 my ($self) = @_;
532 724
… …
535 727
536 for (@$children) { 728 for (@$children) {
537 delete $_->{parent}; 729 delete $_->{parent};
538 $_->hide; 730 $_->hide;
539 } 731 }
732
733 $self->realloc;
540} 734}
541 735
542sub find_widget { 736sub find_widget {
543 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
544 738
545 $x -= $self->{x}; 739 $x -= $self->{x};
546 $y -= $self->{y}; 740 $y -= $self->{y};
547 741
548 my $res; 742 my $res;
549 743
550 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
551 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
552 and return $res; 746 and return $res;
553 } 747 }
554 748
555 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
576} 770}
577 771
578sub add { 772sub add {
579 my ($self, $child) = @_; 773 my ($self, $child) = @_;
580 774
581 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
582
583 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
584} 777}
585 778
586sub remove { 779sub remove {
587 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
604 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
605} 798}
606 799
607############################################################################# 800#############################################################################
608 801
802# back-buffered drawing area
803
609package CFClient::UI::Window; 804package CFClient::UI::Window;
610 805
611our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
612 807
613use CFClient::OpenGL; 808use CFClient::OpenGL;
… …
619} 814}
620 815
621sub update { 816sub update {
622 my ($self) = @_; 817 my ($self) = @_;
623 818
624 # we want to do this delayed... 819 $ROOT->on_post_alloc ($self => sub { $self->render_child });
625 $self->render_chld;
626 $self->SUPER::update; 820 $self->SUPER::update;
627}
628
629sub render_chld {
630 my ($self) = @_;
631
632 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
633 glClearColor 0, 0, 0, 1;
634 glClear GL_COLOR_BUFFER_BIT;
635 $self->child->draw;
636 };
637} 821}
638 822
639sub size_allocate { 823sub size_allocate {
640 my ($self, $w, $h) = @_; 824 my ($self, $w, $h) = @_;
641 825
642 $self->child->configure (0, 0, $w, $h); 826 $self->SUPER::size_allocate ($w, $h);
827 $self->update;
828}
643 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
644 $self->render_chld; 850 $self->_render;
851 };
645} 852}
646 853
647sub _draw { 854sub _draw {
648 my ($self) = @_; 855 my ($self) = @_;
649 856
650 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
651 858
652 my $tex = $self->{texture} 859 my $tex = $self->{texture}
653 or return; 860 or return;
654 861
655 glEnable GL_BLEND;
656 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
657 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
658 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;
659 865
660 $tex->draw_quad (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
661 867
662 glDisable GL_BLEND;
663 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
664} 869}
665 870
666############################################################################# 871#############################################################################
667 872
668package CFClient::UI::ViewPort; 873package CFClient::UI::ViewPort;
669 874
670our @ISA = CFClient::UI::Window::; 875our @ISA = CFClient::UI::Window::;
671
672sub new { die }
673
674sub size_request {
675 my ($self) = @_;
676
677 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
678 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
679
680 @$self{qw(child_w child_h)}
681}
682
683sub _draw {
684 my ($self) = @_;
685
686 $self->{children}[1]->draw;
687}
688
689
690#############################################################################
691
692package CFClient::UI::Frame;
693
694our @ISA = CFClient::UI::Bin::;
695
696use CFClient::OpenGL;
697 876
698sub new { 877sub new {
699 my $class = shift; 878 my $class = shift;
700 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
701 my $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
702 bg => [1, 1, 1, 1], 980 vp => (new CFClient::UI::ViewPort expand => 1),
703 border_bg => [1, 1, 1, 1], 981 slider => $slider,
704 border => 0.8, 982 %arg,
705 @_
706 ); 983 );
707 984
985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
987
708 $self 988 $self
709} 989}
710 990
711sub _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 {
712 my ($self) = @_; 1008 my ($self, $w, $h) = @_;
713 1009
714 my ($w, $h) = ($self->{w}, $self->{h}); 1010 $self->SUPER::size_allocate ($w, $h);
715 1011
716 glEnable GL_BLEND; 1012 my $child = $self->{vp}->child;
717 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]);
718 glEnable GL_TEXTURE_2D;
719 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
720
721# glBegin GL_QUADS;
722# glColor 0, 0, 0, 0;
723# glVertex 0 , 0;
724# glVertex 0 , $h;
725# glVertex $w, $h;
726# glVertex $w, 0;
727# glEnd;
728
729
730 $self->child->draw;
731 glDisable GL_BLEND;
732 glDisable GL_TEXTURE_2D;
733} 1014}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
734 1018
735############################################################################# 1019#############################################################################
736 1020
737package CFClient::UI::FancyFrame; 1021package CFClient::UI::Frame;
738 1022
739our @ISA = CFClient::UI::Bin::; 1023our @ISA = CFClient::UI::Bin::;
740 1024
741use CFClient::OpenGL; 1025use CFClient::OpenGL;
742
743my @tex =
744 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
745 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
746 1026
747sub new { 1027sub new {
748 my $class = shift; 1028 my $class = shift;
749 1029
750 # 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) = @_;
751 1077
752 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
753 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
754 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
755 border => 0.8, 1081 border => 0.6,
756 can_events => 1, 1082 can_events => 1,
757 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
758 ); 1086 );
759 1087
760 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
761 align => 0, 1089 align => 0,
762 valign => 1, 1090 valign => 1,
763 text => $self->{title}, 1091 text => $self->{title},
764 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 }
765 1103
766 $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};
767} 1113}
768 1114
769sub border { 1115sub border {
770 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
771} 1117}
772 1118
773sub size_request { 1119sub size_request {
774 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};
775 1127
776 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
777 1129
778 ( 1130 (
779 $w + $self->border * 2, 1131 $w + $self->border * 2,
… …
782} 1134}
783 1135
784sub size_allocate { 1136sub size_allocate {
785 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
786 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
787 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
788 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
789 1149
790 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
791 if $self->{title};
792
793 $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};
794} 1154}
795 1155
796sub button_down { 1156sub button_down {
797 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
798 1158
1159 my ($w, $h) = @$self{qw(w h)};
799 my $border = $self->border; 1160 my $border = $self->border;
800 1161
801 if ($x < $self->{w} && $x >= $self->{w} - $border 1162 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
802 && $y < $self->{h} && $y >= $self->{h} - $border) { 1163 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
803 1164
1165 if ($lr & $td) {
1166 my ($wx, $wy) = ($self->{x}, $self->{y});
804 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1167 my ($ox, $oy) = ($ev->{x}, $ev->{y});
805 my ($bw, $bh) = ($self->{w}, $self->{h}); 1168 my ($bw, $bh) = ($self->{w}, $self->{h});
806 1169
1170 my $mx = $x < $border;
1171 my $my = $y < $border;
1172
807 $self->{motion} = sub { 1173 $self->{motion} = sub {
808 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
809 1175
810 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 my $dx = $ev->{x} - $ox;
1177 my $dy = $ev->{y} - $oy;
811 1178
812 $self->{user_w} = $bw + $x - $ox; 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
813 $self->{user_h} = $bh + $y - $oy; 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
814 $self->check_size; 1181
1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1183 $self->realloc;
815 }; 1184 };
816 1185
817 } elsif ($x >= 0 && $x < $self->{w} 1186 } elsif ($lr ^ $td) {
818 && $y >= 0 && $y < $border) {
819
820 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
821 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
822 1189
823 $self->{motion} = sub { 1190 $self->{motion} = sub {
824 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
825 1192
826 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
827 1194
828 $self->move ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
829 $self->update; 1196 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
830 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
831 } 1203 1
832} 1204}
833 1205
834sub button_up { 1206sub button_up {
835 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
836 1208
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
837 delete $self->{motion}; 1212 !!delete $self->{motion}
838} 1213}
839 1214
840sub mouse_motion { 1215sub mouse_motion {
841 my ($self, $ev, $x, $y) = @_; 1216 my ($self, $ev, $x, $y) = @_;
842 1217
843 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1218 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219
1220 !!$self->{motion}
844} 1221}
845 1222
846sub _draw { 1223sub _draw {
847 my ($self) = @_; 1224 my ($self) = @_;
848 1225
1226 my $child = $self->{children}[0];
1227
849 my ($w, $h ) = ($self->{w}, $self->{h}); 1228 my ($w, $h ) = ($self->{w}, $self->{h});
850 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1229 my ($cw, $ch) = ($child->{w}, $child->{h});
851 1230
852 glEnable GL_BLEND;
853 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
854 glEnable GL_TEXTURE_2D; 1231 glEnable GL_TEXTURE_2D;
855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1232 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
856 1233
857 my $border = $self->border; 1234 my $border = $self->border;
858 1235
859 glColor @{ $self->{border_bg} }; 1236 glColor @{ $self->{border_bg} };
860 $tex[1]->draw_quad (0, 0, $w, $border); 1237 $border[0]->draw_quad_alpha (0, 0, $w, $border);
861 $tex[3]->draw_quad (0, $border, $border, $ch); 1238 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
862 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1239 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
863 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1240 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
864 1241
865 my $bg = $tex[0]; 1242 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1243 glColor @{ $self->{bg} };
866 1244
867 # TODO: repeat texture not scale 1245 # TODO: repeat texture not scale
868 my $rep_x = $cw / $bg->{w}; 1246 # solve this better(?)
869 my $rep_y = $ch / $bg->{h}; 1247 $bg->{s} = $cw / $bg->{w};
870 1248 $bg->{t} = $ch / $bg->{h};
871 glColor @{ $self->{bg} };
872
873 $bg->{s} = $rep_x;
874 $bg->{t} = $rep_y;
875 $bg->{wrap_mode} = 1;
876 $bg->draw_quad ($border, $border, $cw, $ch); 1249 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1250 }
877 1251
878 glDisable GL_TEXTURE_2D; 1252 glDisable GL_TEXTURE_2D;
879 glDisable GL_BLEND;
880 1253
881 $self->{title}->draw if $self->{title};
882 $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};
883} 1265}
884 1266
885############################################################################# 1267#############################################################################
886 1268
887package CFClient::UI::Table; 1269package CFClient::UI::Table;
… …
895sub new { 1277sub new {
896 my $class = shift; 1278 my $class = shift;
897 1279
898 $class->SUPER::new ( 1280 $class->SUPER::new (
899 col_expand => [], 1281 col_expand => [],
900 @_ 1282 @_,
901 ) 1283 )
1284}
1285
1286sub children {
1287 grep $_, map @$_, grep $_, @{ $_[0]{children} }
902} 1288}
903 1289
904sub add { 1290sub add {
905 my ($self, $x, $y, $child) = @_; 1291 my ($self, $x, $y, $child) = @_;
906 1292
907 $child->set_parent ($self); 1293 $child->set_parent ($self);
908 $self->{children}[$y][$x] = $child; 1294 $self->{children}[$y][$x] = $child;
909 1295
910 $child->check_size; 1296 $self->realloc;
911} 1297}
912 1298
1299sub remove {
1300 my ($self, $child) = @_;
1301
1302 # TODO: not yet implemented
1303}
1304
913# 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?
914sub clear { 1306sub clear {
915 my ($self) = @_; 1307 my ($self) = @_;
916 1308
917 my $children = delete $self->{children}; 1309 my @children = $self->children;
1310 delete $self->{children};
918 1311
919 for (grep $_, map @$_, grep $_, @$children) { 1312 for (@children) {
920 delete $_->{parent}; 1313 delete $_->{parent};
921 $_->hide; 1314 $_->hide;
922 } 1315 }
923 1316
924 $self->update; 1317 $self->realloc;
925} 1318}
926 1319
927sub get_wh { 1320sub get_wh {
928 my ($self) = @_; 1321 my ($self) = @_;
929 1322
… …
960sub size_allocate { 1353sub size_allocate {
961 my ($self, $w, $h) = @_; 1354 my ($self, $w, $h) = @_;
962 1355
963 my ($ws, $hs) = $self->get_wh; 1356 my ($ws, $hs) = $self->get_wh;
964 1357
965 my $req_w = sum @$ws; 1358 my $req_w = (sum @$ws) || 1;
966 my $req_h = sum @$hs; 1359 my $req_h = (sum @$hs) || 1;
967 1360
968 # TODO: nicer code && do row_expand 1361 # TODO: nicer code && do row_expand
969 my @col_expand = @{$self->{col_expand}}; 1362 my @col_expand = @{$self->{col_expand}};
970 @col_expand = (1) x @$ws unless @col_expand; 1363 @col_expand = (1) x @$ws unless @col_expand;
971 my $col_expand = (sum @col_expand) || 1; 1364 my $col_expand = (sum @col_expand) || 1;
… …
1025 } 1418 }
1026} 1419}
1027 1420
1028############################################################################# 1421#############################################################################
1029 1422
1030package CFClient::UI::HBox; 1423package CFClient::UI::Box;
1031
1032# TODO: wrap into common Box base class
1033 1424
1034our @ISA = CFClient::UI::Container::; 1425our @ISA = CFClient::UI::Container::;
1035 1426
1036sub size_request { 1427sub size_request {
1037 my ($self) = @_; 1428 my ($self) = @_;
1038 1429
1039 my @alloc = map [$_->size_request], @{$self->{children}}; 1430 $self->{vertical}
1040 1431 ? (
1041 ( 1432 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1042 (List::Util::sum map $_->[0], @alloc), 1433 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1043 (List::Util::max map $_->[1], @alloc), 1434 )
1044 ) 1435 : (
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 )
1045} 1439}
1046 1440
1047sub size_allocate { 1441sub size_allocate {
1048 my ($self, $w, $h) = @_; 1442 my ($self, $w, $h) = @_;
1049 1443
1050 ($h, $w) = ($w, $h); 1444 my $space = $self->{vertical} ? $h : $w;
1051
1052 my $children = $self->{children}; 1445 my $children = $self->{children};
1053 1446
1054 my @h = map $_->{req_w}, @$children; 1447 my @req;
1055 1448
1056 my $req_h = List::Util::sum @h; 1449 if ($self->{homogeneous}) {
1057 1450 @req = ($space / (@$children || 1)) x @$children;
1058 if ($req_h > $h) {
1059 # ah well, not enough space
1060 $_ *= $h / $req_h for @h;
1061 } 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 {
1062 my $exp = List::Util::sum map $_->{expand}, @$children; 1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1063 $exp ||= 1;
1064 1460
1461 $space = ($space - $req) / $expand; # remaining space to give away
1462
1463 $req[$_] += $space * $children->[$_]{expand}
1065 for (0 .. $#$children) { 1464 for 0 .. $#$children;
1066 my $child = $children->[$_];
1067
1068 my $alloc_h = $h[$_];
1069 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1070 $h[$_] = $alloc_h;
1071 } 1465 }
1072 } 1466 }
1073 1467
1074 CFClient::UI::harmonize \@h; 1468 CFClient::UI::harmonize \@req;
1075 1469
1076 my $y = 0; 1470 my $pos = 0;
1077 for (0 .. $#$children) { 1471 for (0 .. $#$children) {
1078 my $child = $children->[$_];
1079 my $h = $h[$_]; 1472 my $alloc = $req[$_];
1080 $child->configure ($y, 0, $h, $w); 1473 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1081 1474
1082 $y += $h; 1475 $pos += $alloc;
1083 } 1476 }
1084 1477
1085 1 1478 1
1086} 1479}
1087 1480
1088############################################################################# 1481#############################################################################
1089 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
1090package CFClient::UI::VBox; 1498package CFClient::UI::VBox;
1091 1499
1092# TODO: wrap into common Box base class
1093
1094our @ISA = CFClient::UI::Container::; 1500our @ISA = CFClient::UI::Box::;
1095 1501
1096sub size_request { 1502sub new {
1097 my ($self) = @_; 1503 my $class = shift;
1098 1504
1099 my @alloc = map [$_->size_request], @{$self->{children}}; 1505 $class->SUPER::new (
1100 1506 vertical => 1,
1101 ( 1507 @_,
1102 (List::Util::max map $_->[0], @alloc),
1103 (List::Util::sum map $_->[1], @alloc),
1104 ) 1508 )
1105} 1509}
1106 1510
1107sub size_allocate {
1108 my ($self, $w, $h) = @_;
1109
1110 my $children = $self->{children};
1111
1112 my @h = map $_->{req_h}, @$children;
1113
1114 my $req_h = List::Util::sum @h;
1115
1116 if ($req_h > $h) {
1117 # ah well, not enough space
1118 $_ *= $h / $req_h for @h;
1119 } else {
1120 my $exp = List::Util::sum map $_->{expand}, @$children;
1121 $exp ||= 1;
1122
1123 for (0 .. $#$children) {
1124 my $child = $children->[$_];
1125
1126 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1127 }
1128 }
1129
1130 CFClient::UI::harmonize \@h;
1131
1132 my $y = 0;
1133 for (0 .. $#$children) {
1134 my $child = $children->[$_];
1135 my $h = $h[$_];
1136 $child->configure (0, $y, $w, $h);
1137
1138 $y += $h;
1139 }
1140
1141 1
1142}
1143
1144############################################################################# 1511#############################################################################
1145 1512
1146package CFClient::UI::Label; 1513package CFClient::UI::Label;
1147 1514
1148our @ISA = CFClient::UI::Base::; 1515our @ISA = CFClient::UI::DrawBG::;
1149 1516
1150use CFClient::OpenGL; 1517use CFClient::OpenGL;
1151 1518
1152sub new { 1519sub new {
1153 my ($class, %arg) = @_; 1520 my ($class, %arg) = @_;
1154 1521
1155 my $self = $class->SUPER::new ( 1522 my $self = $class->SUPER::new (
1156 fg => [1, 1, 1], 1523 fg => [1, 1, 1],
1524 #bg => none
1525 #active_bg => none
1157 #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),
1158 fontsize => 1, 1532 fontsize => 1,
1159 text => "",
1160 align => -1, 1533 align => -1,
1161 valign => -1, 1534 valign => -1,
1162 padding => 2, 1535 padding_x => 2,
1163 layout => new CFClient::Layout, 1536 padding_y => 2,
1164 can_events => 0, 1537 can_events => 0,
1165 %arg 1538 %arg
1166 ); 1539 );
1167 1540
1168 if (exists $self->{template}) { 1541 if (exists $self->{template}) {
1169 my $layout = new CFClient::Layout; 1542 my $layout = new CFClient::Layout;
1170 $layout->set_text (delete $self->{template}); 1543 $layout->set_text (delete $self->{template});
1171 $self->{template} = $layout; 1544 $self->{template} = $layout;
1172 } 1545 }
1173 1546
1174 $self->set_text (delete $self->{text}) if exists $self->{text}; 1547 if (exists $self->{markup}) {
1175 $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 }
1176 1552
1177 $self 1553 $self
1178} 1554}
1179 1555
1180sub escape { 1556sub escape($) {
1181 local $_ = $_[1]; 1557 local $_ = $_[0];
1182 1558
1183 s/&/&amp;/g; 1559 s/&/&amp;/g;
1184 s/>/&gt;/g; 1560 s/>/&gt;/g;
1185 s/</&lt;/g; 1561 s/</&lt;/g;
1186 1562
1187 $_[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;
1188} 1578}
1189 1579
1190sub set_text { 1580sub set_text {
1191 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1192 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;
1193 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1194 1588
1195 delete $self->{texture}; 1589 delete $self->{size_req};
1196 $self->check_size; 1590 $self->realloc;
1197 $self->update; 1591 $self->update;
1198} 1592}
1199 1593
1200sub set_markup { 1594sub set_markup {
1201 my ($self, $markup) = @_; 1595 my ($self, $markup) = @_;
1202 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;
1203 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1204 1604
1205 delete $self->{texture}; 1605 delete $self->{size_req};
1206 $self->check_size; 1606 $self->realloc;
1207 $self->update; 1607 $self->update;
1208} 1608}
1209 1609
1210sub size_request { 1610sub size_request {
1211 my ($self) = @_; 1611 my ($self) = @_;
1212 1612
1613 $self->{size_req} ||= do {
1213 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1214 $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});
1215 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1216 1619
1217 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1218 1621
1219 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1220 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1221 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1222 1625
1223 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1224 1627
1225 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1226 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1227 } 1633 };
1228 1634
1229 ( 1635 @{ $self->{size_req} }
1230 $w + $self->{padding} * 2,
1231 $h + $self->{padding} * 2,
1232 )
1233} 1636}
1234 1637
1235sub size_allocate { 1638sub size_allocate {
1236 my ($self, $w, $h) = @_; 1639 my ($self, $w, $h) = @_;
1237 1640
1641 delete $self->{ox};
1642
1238 delete $self->{texture}; 1643 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1239} 1645}
1240 1646
1241sub set_fontsize { 1647sub set_fontsize {
1242 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1243 1649
1244 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1245 delete $self->{texture}; 1651 delete $self->{texture};
1246 $self->check_size; 1652
1247 $self->update; 1653 $self->realloc;
1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1248} 1662}
1249 1663
1250sub _draw { 1664sub _draw {
1251 my ($self) = @_; 1665 my ($self) = @_;
1252 1666
1667 $self->SUPER::_draw; # draw background, if applicable
1668
1253 my $tex = $self->{texture} ||= do { 1669 my $tex = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}});
1254 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1671 $self->{layout}->set_font ($self->{font}) if $self->{font};
1255 $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});
1256 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676
1257 new_from_layout CFClient::Texture $self->{layout} 1677 new_from_layout CFClient::Texture $self->{layout}
1258 }; 1678 };
1259 1679
1260 glEnable GL_BLEND; 1680 unless (exists $self->{ox}) {
1261 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
1262 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 {
1263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1264 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1265 glColor @{$self->{fg}}; 1702 }
1266
1267 $self->{ox} = int (
1268 $self->{align} < 0 ? $self->{padding}
1269 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1270 : ($self->{w} - $tex->{w}) * 0.5
1271 );
1272
1273 $self->{oy} = int (
1274 $self->{valign} < 0 ? $self->{padding}
1275 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1276 : ($self->{h} - $tex->{h}) * 0.5
1277 );
1278
1279 $tex->draw_quad ($self->{ox}, $self->{oy});
1280 1703
1281 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1282 glDisable GL_BLEND;
1283} 1705}
1284 1706
1285############################################################################# 1707#############################################################################
1286 1708
1287package CFClient::UI::EntryBase; 1709package CFClient::UI::EntryBase;
… …
1292 1714
1293sub new { 1715sub new {
1294 my $class = shift; 1716 my $class = shift;
1295 1717
1296 $class->SUPER::new ( 1718 $class->SUPER::new (
1297 fg => [1, 1, 1], 1719 fg => [1, 1, 1],
1298 bg => [0, 0, 0, 0.2], 1720 bg => [0, 0, 0, 0.2],
1299 active_bg => [1, 1, 1, 0.5], 1721 active_bg => [1, 1, 1, 0.5],
1300 active_fg => [0, 0, 0], 1722 active_fg => [0, 0, 0],
1301 can_hover => 1, 1723 can_hover => 1,
1302 can_focus => 1, 1724 can_focus => 1,
1303 valign => 0, 1725 valign => 0,
1304 can_events => 1, 1726 can_events => 1,
1727 #text => ...
1728 #hidden => "*",
1305 @_ 1729 @_
1306 ) 1730 )
1307} 1731}
1308 1732
1309sub _set_text { 1733sub _set_text {
… …
1311 1735
1312 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1313 1737
1314 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1315 1739
1316 delete $self->{texture};
1317
1318 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1319 $self->{text} = $text; 1741 $self->{text} = $text;
1320 1742
1321 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1322 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1323 1746
1324 $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);
1325} 1758}
1326 1759
1327sub get_text { 1760sub get_text {
1328 $_[0]{text} 1761 $_[0]{text}
1329} 1762}
… …
1332 my ($self) = @_; 1765 my ($self) = @_;
1333 1766
1334 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1335 1768
1336 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1337}
1338
1339sub size_allocate {
1340 my ($self, $w, $h) = @_;
1341
1342 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1343}
1344
1345sub set_text {
1346 my ($self, $text) = @_;
1347
1348 $self->{cursor} = length $text;
1349 $self->_set_text ($text);
1350 $self->update;
1351} 1770}
1352 1771
1353sub key_down { 1772sub key_down {
1354 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1355 1774
… …
1357 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1358 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
1359 1778
1360 my $text = $self->get_text; 1779 my $text = $self->get_text;
1361 1780
1362 if ($sym == 8) { 1781 if ($uni == 8) {
1363 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1782 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1364 } elsif ($sym == 127) { 1783 } elsif ($uni == 127) {
1365 substr $text, $self->{cursor}, 1, ""; 1784 substr $text, $self->{cursor}, 1, "";
1366 } elsif ($sym == CFClient::SDLK_LEFT) { 1785 } elsif ($sym == CFClient::SDLK_LEFT) {
1367 --$self->{cursor} if $self->{cursor}; 1786 --$self->{cursor} if $self->{cursor};
1368 } elsif ($sym == CFClient::SDLK_RIGHT) { 1787 } elsif ($sym == CFClient::SDLK_RIGHT) {
1369 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1788 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1370 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1371 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1372 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1373 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1374 } elsif ($sym == 27) { 1793 } elsif ($uni == 27) {
1375 $self->emit ('escape'); 1794 $self->_emit ('escape');
1376 } elsif ($uni) { 1795 } elsif ($uni) {
1377 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1378 } 1799 }
1379 1800
1380 $self->_set_text ($text); 1801 $self->_set_text ($text);
1381 $self->update; 1802
1803 $self->realloc;
1804
1805 1
1382} 1806}
1383 1807
1384sub focus_in { 1808sub focus_in {
1385 my ($self) = @_; 1809 my ($self) = @_;
1386 1810
… …
1401 utf8::encode $text; 1825 utf8::encode $text;
1402 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1403 1827
1404 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1405 $self->update; 1829 $self->update;
1830
1831 1
1406} 1832}
1407 1833
1408sub mouse_motion { 1834sub mouse_motion {
1409 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1410# 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
1411} 1839}
1412 1840
1413sub _draw { 1841sub _draw {
1414 my ($self) = @_; 1842 my ($self) = @_;
1415 1843
1416 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1417 1845
1418 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1419 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1420 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1421 } else { 1849 } else {
1422 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1423 } 1851 }
1424 1852
1425 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1426 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1427 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1428 glVertex 0 , 0; 1856 glVertex 0 , 0;
1429 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1430 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1431 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1462 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1463 1891
1464 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1465 1893
1466 if ($sym == 13) { 1894 if ($sym == 13) {
1895 unshift @{$self->{history}},
1896 my $txt = $self->get_text;
1897 $self->{history_pointer} = -1;
1898 $self->{history_saveback} = '';
1467 $self->emit (activate => $self->get_text); 1899 $self->_emit (activate => $txt);
1468 $self->update; 1900 $self->update;
1469 1901
1902 } elsif ($sym == CFClient::SDLK_UP) {
1903 if ($self->{history_pointer} < 0) {
1904 $self->{history_saveback} = $self->get_text;
1905 }
1906 if (@{$self->{history} || []} > 0) {
1907 $self->{history_pointer}++;
1908 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1909 $self->{history_pointer} = @{$self->{history} || []} - 1;
1910 }
1911 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1912 }
1913
1914 } elsif ($sym == CFClient::SDLK_DOWN) {
1915 $self->{history_pointer}--;
1916 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1917
1918 if ($self->{history_pointer} >= 0) {
1919 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1920 } else {
1921 $self->set_text ($self->{history_saveback});
1922 }
1923
1470 } else { 1924 } else {
1471 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::key_down ($ev)
1926 }
1927
1472 } 1928 1
1473
1474} 1929}
1475 1930
1476############################################################################# 1931#############################################################################
1477 1932
1478package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1487 1942
1488sub new { 1943sub new {
1489 my $class = shift; 1944 my $class = shift;
1490 1945
1491 $class->SUPER::new ( 1946 $class->SUPER::new (
1492 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1493 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1494 bg => [1, 1, 1, 0.2],
1495 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1496 can_hover => 1, 1951 can_hover => 1,
1497 align => 0, 1952 align => 0,
1498 valign => 0, 1953 valign => 0,
1499 can_events => 1, 1954 can_events => 1,
1500 @_ 1955 @_
1501 ) 1956 )
1502} 1957}
1503 1958
1959sub activate { }
1960
1504sub button_up { 1961sub button_up {
1505 my ($self, $ev, $x, $y) = @_; 1962 my ($self, $ev, $x, $y) = @_;
1506 1963
1964 $self->emit ("activate")
1507 if ($x >= 0 && $x < $self->{w} 1965 if $x >= 0 && $x < $self->{w}
1508 && $y >= 0 && $y < $self->{h}) { 1966 && $y >= 0 && $y < $self->{h};
1509 $self->emit ("activate"); 1967
1510 } 1968 1
1511} 1969}
1512 1970
1513sub _draw { 1971sub _draw {
1514 my ($self) = @_; 1972 my ($self) = @_;
1515 1973
1516 local $self->{fg} = $self->{fg}; 1974 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1517 1975
1518 if ($GRAB == $self) {
1519 $self->{fg} = $self->{active_fg};
1520 }
1521
1522 glEnable GL_BLEND;
1523 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1524 glEnable GL_TEXTURE_2D; 1976 glEnable GL_TEXTURE_2D;
1525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1526 glColor 0, 0, 0, 1; 1978 glColor 0, 0, 0, 1;
1527 1979
1528 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1980 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1529 1981
1530 glDisable GL_TEXTURE_2D; 1982 glDisable GL_TEXTURE_2D;
1531 glDisable GL_BLEND;
1532 1983
1533 $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
1534} 2023}
1535 2024
1536############################################################################# 2025#############################################################################
1537 2026
1538package CFClient::UI::CheckBox; 2027package CFClient::UI::CheckBox;
… …
1547 2036
1548sub new { 2037sub new {
1549 my $class = shift; 2038 my $class = shift;
1550 2039
1551 $class->SUPER::new ( 2040 $class->SUPER::new (
1552 padding => 2, 2041 padding_x => 2,
2042 padding_y => 2,
1553 fg => [1, 1, 1], 2043 fg => [1, 1, 1],
1554 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],
1555 state => 0, 2047 state => 0,
1556 can_hover => 1, 2048 can_hover => 1,
1557 @_ 2049 @_
1558 ) 2050 )
1559} 2051}
1560 2052
1561sub size_request { 2053sub size_request {
1562 my ($self) = @_; 2054 my ($self) = @_;
1563 2055
1564 ($self->{padding} * 2 + 6) x 2 2056 (6) x 2
1565} 2057}
1566 2058
1567sub button_down { 2059sub button_down {
1568 my ($self, $ev, $x, $y) = @_; 2060 my ($self, $ev, $x, $y) = @_;
1569 2061
1570 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1571 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1572 $self->{state} = !$self->{state}; 2064 $self->{state} = !$self->{state};
1573 $self->emit (changed => $self->{state}); 2065 $self->_emit (changed => $self->{state});
2066 } else {
2067 return 0
2068 }
2069
1574 } 2070 1
1575} 2071}
1576 2072
1577sub _draw { 2073sub _draw {
1578 my ($self) = @_; 2074 my ($self) = @_;
1579 2075
1580 $self->SUPER::_draw; 2076 $self->SUPER::_draw;
1581 2077
1582 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2078 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1583 2079
1584 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;
1585 2083
1586 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2084 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1587 2085
1588 glEnable GL_BLEND; 2086 my $tex = $self->{state} ? $tex[1] : $tex[0];
2087
1589 glEnable GL_TEXTURE_2D; 2088 glEnable GL_TEXTURE_2D;
1590 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1591
1592 my $tex = $self->{state} ? $tex[1] : $tex[0];
1593
1594 $tex->draw_quad (0, 0, $s, $s); 2089 $tex->draw_quad_alpha (0, 0, $s, $s);
1595
1596 glDisable GL_TEXTURE_2D; 2090 glDisable GL_TEXTURE_2D;
1597 glDisable GL_BLEND;
1598} 2091}
1599 2092
1600############################################################################# 2093#############################################################################
1601 2094
1602package CFClient::UI::Image; 2095package CFClient::UI::Image;
… …
1645 glTranslate 0, -$self->{w}, 0; 2138 glTranslate 0, -$self->{w}, 0;
1646 2139
1647 ($w, $h) = ($h, $w); 2140 ($w, $h) = ($h, $w);
1648 } 2141 }
1649 2142
1650 glEnable GL_BLEND;
1651 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1652 glEnable GL_TEXTURE_2D; 2143 glEnable GL_TEXTURE_2D;
1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2144 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1654 2145
1655 $tex->draw_quad (0, 0, $w, $h); 2146 $tex->draw_quad_alpha (0, 0, $w, $h);
1656 2147
1657 glDisable GL_BLEND;
1658 glDisable GL_TEXTURE_2D; 2148 glDisable GL_TEXTURE_2D;
1659} 2149}
1660 2150
1661############################################################################# 2151#############################################################################
1662 2152
… …
1710} 2200}
1711 2201
1712sub set_max { 2202sub set_max {
1713 my ($self, $max) = @_; 2203 my ($self, $max) = @_;
1714 2204
2205 return if $self->{max_val} == $max;
2206
1715 $self->{max_val} = $max; 2207 $self->{max_val} = $max;
2208 $self->update;
1716} 2209}
1717 2210
1718sub set_value { 2211sub set_value {
1719 my ($self, $val, $max) = @_; 2212 my ($self, $val, $max) = @_;
1720 2213
1721 $self->set_max ($max) 2214 $self->set_max ($max)
1722 if defined $max; 2215 if defined $max;
1723 2216
1724 $max = $self->{max_val}; 2217 return if $self->{val} == $val;
2218
1725 $self->{val} = $val; 2219 $self->{val} = $val;
1726
1727 $self->update; 2220 $self->update;
1728} 2221}
1729 2222
1730sub _draw { 2223sub _draw {
1731 my ($self) = @_; 2224 my ($self) = @_;
… …
1749 2242
1750 my $h1 = $self->{h} * (1 - $ycut1); 2243 my $h1 = $self->{h} * (1 - $ycut1);
1751 my $h2 = $self->{h} * (1 - $ycut2); 2244 my $h2 = $self->{h} * (1 - $ycut2);
1752 2245
1753 glEnable GL_BLEND; 2246 glEnable GL_BLEND;
1754 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;
1755 glEnable GL_TEXTURE_2D; 2249 glEnable GL_TEXTURE_2D;
1756 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2250 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1757 2251
1758 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2252 glBindTexture GL_TEXTURE_2D, $t1->{name};
1759 glBegin GL_QUADS; 2253 glBegin GL_QUADS;
… …
1794 2288
1795sub new { 2289sub new {
1796 my ($class, %arg) = @_; 2290 my ($class, %arg) = @_;
1797 2291
1798 my $self = $class->SUPER::new ( 2292 my $self = $class->SUPER::new (
1799 tooltip => $arg{type}, 2293 tooltip => $arg{type},
2294 can_hover => 1,
1800 can_events => 1, 2295 can_events => 1,
1801 can_hover => 1,
1802 %arg, 2296 %arg,
1803 ); 2297 );
1804 2298
1805 $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");
1806 $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);
… …
1814 2308
1815 $self->{value}->set_fontsize ($fsize); 2309 $self->{value}->set_fontsize ($fsize);
1816 $self->{max} ->set_fontsize ($fsize); 2310 $self->{max} ->set_fontsize ($fsize);
1817} 2311}
1818 2312
2313sub set_max {
2314 my ($self, $max) = @_;
2315
2316 $self->{gauge}->set_max ($max);
2317 $self->{max}->set_text ($max);
2318}
2319
1819sub set_value { 2320sub set_value {
1820 my ($self, $val, $max) = @_; 2321 my ($self, $val, $max) = @_;
1821 2322
1822 $self->set_max ($max) 2323 $self->set_max ($max)
1823 if defined $max; 2324 if defined $max;
1824 2325
1825 $self->{gauge}->set_value ($val, $max); 2326 $self->{gauge}->set_value ($val, $max);
1826 $self->{value}->set_text ($val); 2327 $self->{value}->set_text ($val);
1827}
1828
1829sub set_max {
1830 my ($self, $max) = @_;
1831
1832 $self->{gauge}->set_max ($max);
1833 $self->{max}->set_text ($max);
1834} 2328}
1835 2329
1836############################################################################# 2330#############################################################################
1837 2331
1838package CFClient::UI::Slider; 2332package CFClient::UI::Slider;
… …
1848 qw(s1_slider.png s1_slider_bg.png); 2342 qw(s1_slider.png s1_slider_bg.png);
1849 2343
1850sub new { 2344sub new {
1851 my $class = shift; 2345 my $class = shift;
1852 2346
1853 # range [value, low, high, page] 2347 # range [value, low, high, page, unit]
1854 2348
1855 # TODO: 0-width page 2349 # TODO: 0-width page
1856 # TODO: req_w/h are wrong with vertical 2350 # TODO: req_w/h are wrong with vertical
1857 # TODO: calculations are off 2351 # TODO: calculations are off
1858 my $self = $class->SUPER::new ( 2352 my $self = $class->SUPER::new (
1859 fg => [1, 1, 1], 2353 fg => [1, 1, 1],
1860 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],
1861 range => [0, 0, 100, 10], 2357 range => [0, 0, 100, 10, 0],
1862 req_w => 20, 2358 min_w => $::WIDTH / 80,
1863 req_h => 20, 2359 min_h => $::WIDTH / 80,
1864 vertical => 0, 2360 vertical => 0,
1865 can_hover => 1, 2361 can_hover => 1,
1866 inner_pad => 5, 2362 inner_pad => 0.02,
1867 @_ 2363 @_
1868 ); 2364 );
1869 2365
2366 $self->set_value ($self->{range}[0]);
2367 $self->update;
2368
1870 $self 2369 $self
1871} 2370}
1872 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
1873sub size_request { 2408sub size_request {
1874 my ($self) = @_; 2409 my ($self) = @_;
1875 2410
1876 my $w = $self->{req_w}; 2411 ($self->{req_w}, $self->{req_h})
1877 my $h = $self->{req_h};
1878
1879 $self->{vertical} ? ($h, $w) : ($w, $h)
1880} 2412}
1881 2413
1882sub button_down { 2414sub button_down {
1883 my ($self, $ev, $x, $y) = @_; 2415 my ($self, $ev, $x, $y) = @_;
1884 2416
1885 $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
1886 $self->mouse_motion ($ev, $x, $y); 2421 $self->mouse_motion ($ev, $x, $y)
1887} 2422}
1888 2423
1889sub mouse_motion { 2424sub mouse_motion {
1890 my ($self, $ev, $x, $y) = @_; 2425 my ($self, $ev, $x, $y) = @_;
1891 2426
1892 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
1893 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2455 my ($value, $lo, $hi, $page) = @{$self->{range}};
2456 my $range = ($hi - $page - $lo) || 1e-100;
1894 2457
1895 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2458 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1896 2459
1897 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2460 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1898 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2461 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1899 2462
1900 $x -= $inner_pad_px; # substract the padding 2463 $value = ($value - $lo) / $range;
1901 $x = $x * ($hi - $lo) / $inner_w + $lo; 2464 $value = $value * $self->{scale} + $self->{offset};
1902 $x = $lo if $x < $lo;
1903 $x = $hi - $page if $x > $hi - $page;
1904 $self->{range}[0] = $x;
1905 2465
1906 $self->emit (changed => $x); 2466 $self->{knob_x} = $value - $knob_w * 0.5;
1907 $self->update; 2467 $self->{knob_w} = $knob_w;
1908 } 2468 }
1909}
1910
1911# the inner_* stuff is for generating a padding for the slider handle,
1912# so that the handle doesn't leave the texture. This calculation isn't 100%
1913# correct propably, but it does the job for now
1914sub _calc_inner_pad_px {
1915 my ($self, $w) = @_;
1916 ($w / 100) * $self->{inner_pad} # % to pixels
1917}
1918
1919sub _draw {
1920 my ($self) = @_;
1921 2469
1922 $self->SUPER::_draw (); 2470 $self->SUPER::_draw ();
1923 2471
1924 my ($w, $h) = @$self{qw(w h)}; 2472 glScale $self->{w}, $self->{h};
1925 2473
1926 if ($self->{vertical}) { 2474 if ($self->{vertical}) {
1927 # draw a vertical slider like a rotated horizontal slider 2475 # draw a vertical slider like a rotated horizontal slider
1928 2476
2477 glTranslate 1, 0, 0;
1929 glRotate 90, 0, 0, 1; 2478 glRotate 90, 0, 0, 1;
1930 glTranslate 0, -$self->{w}, 0;
1931
1932 ($w, $h) = ($h, $w);
1933 } 2479 }
1934 2480
1935 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2481 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1936 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2482 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1937 2483
1938 my ($value, $lo, $hi, $page) = @{$self->{range}};
1939
1940 $hi = $value + 1 if $lo == $hi;
1941
1942 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1943 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1944
1945 $page = int $page * $inner_w / ($hi - $lo);
1946 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1947
1948 $w -= $page;
1949 $page &= ~1;
1950 glTranslate $page * 0.5, 0, 0;
1951 $page ||= 2;
1952
1953 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1954 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1955
1956 glEnable GL_BLEND;
1957 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1958 glEnable GL_TEXTURE_2D; 2484 glEnable GL_TEXTURE_2D;
1959 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2485 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1960 2486
1961 # draw background 2487 # draw background
1962 $tex[1]->draw_quad (0, 0, $w, $h); 2488 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1963 2489
1964 # draw handle 2490 # draw handle
1965 $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);
1966 2492
1967 glDisable GL_BLEND;
1968 glDisable GL_TEXTURE_2D; 2493 glDisable GL_TEXTURE_2D;
1969} 2494}
1970 2495
1971############################################################################# 2496#############################################################################
1972 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
1973package CFClient::UI::TextView; 2539package CFClient::UI::TextScroller;
1974 2540
1975our @ISA = CFClient::UI::HBox::; 2541our @ISA = CFClient::UI::HBox::;
1976 2542
1977use CFClient::OpenGL; 2543use CFClient::OpenGL;
1978 2544
1979sub new { 2545sub new {
1980 my $class = shift; 2546 my $class = shift;
1981 2547
1982 my $self = $class->SUPER::new ( 2548 my $self = $class->SUPER::new (
1983 fontsize => 1, 2549 fontsize => 1,
2550 can_events => 0,
2551 indent => 0,
1984 #font => default_font 2552 #font => default_font
1985 @_, 2553 @_,
1986 2554
1987 layout => (new CFClient::Layout), 2555 layout => (new CFClient::Layout 1),
1988 par => [], 2556 par => [],
1989 height => 0, 2557 height => 0,
1990 children => [ 2558 children => [
1991 (new CFClient::UI::Empty expand => 1), 2559 (new CFClient::UI::Empty expand => 1),
1992 (new CFClient::UI::Slider vertical => 1), 2560 (new CFClient::UI::Slider vertical => 1),
1993 ], 2561 ],
1994 ); 2562 );
1995 2563
1996 $self->{children}[1]->connect (changed => sub { 2564 $self->{children}[1]->connect (changed => sub { $self->update });
1997 $self->update;
1998 });
1999 2565
2000 $self 2566 $self
2001} 2567}
2002 2568
2003sub set_fontsize { 2569sub set_fontsize {
2004 my ($self, $fontsize) = @_; 2570 my ($self, $fontsize) = @_;
2005 2571
2006 $self->{fontsize} = $fontsize; 2572 $self->{fontsize} = $fontsize;
2007 $self->reflow; 2573 $self->reflow;
2008}
2009
2010sub text_height {
2011 my ($self, $text) = @_;
2012
2013 my $layout = $self->{layout};
2014
2015 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2016 $layout->set_width ($self->{w});
2017 $layout->set_text ($text);
2018
2019 ($layout->size)[1]
2020}
2021
2022sub reflow {
2023 my ($self) = @_;
2024
2025 $self->{need_reflow}++;
2026 $self->update;
2027} 2574}
2028 2575
2029sub size_allocate { 2576sub size_allocate {
2030 my ($self, $w, $h) = @_; 2577 my ($self, $w, $h) = @_;
2031 2578
2032 $self->SUPER::size_allocate ($w, $h); 2579 $self->SUPER::size_allocate ($w, $h);
2033 2580
2034 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2581 $self->{layout}->set_font ($self->{font}) if $self->{font};
2035 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2036 $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});
2037 2585
2038 $self->reflow; 2586 $self->reflow;
2039} 2587}
2040 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
2041sub add_paragraph { 2624sub add_paragraph {
2042 my ($self, $color, $text) = @_; 2625 my ($self, $color, $text, $indent) = @_;
2043 2626
2044 #TODO: intelligently "reformat" paragraph 2627 for my $line (split /\n/, $text) {
2045 2628 my ($w, $h) = $self->text_size ($line);
2046 my $height = $self->text_height ($text);
2047
2048 $self->{height} += $height; 2629 $self->{height} += $h;
2630 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2631 }
2049 2632
2050 push @{$self->{par}}, [$height, $color, $text];
2051
2052 $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]);
2053 $self->{children}[1]->update;
2054} 2634}
2055 2635
2056sub update { 2636sub update {
2057 my ($self) = @_; 2637 my ($self) = @_;
2058 2638
… …
2060 2640
2061 return unless $self->{h} > 0; 2641 return unless $self->{h} > 0;
2062 2642
2063 delete $self->{texture}; 2643 delete $self->{texture};
2064 2644
2065 $ROOT->on_refresh ($self, sub { 2645 $ROOT->on_post_alloc ($self => sub {
2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647
2066 if (delete $self->{need_reflow}) { 2648 if (delete $self->{need_reflow}) {
2067 my $height = 0; 2649 my $height = 0;
2068 2650
2069 $height += $_->[0] = $self->text_height ($_->[2]) 2651 my $layout = $self->{layout};
2652
2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2654
2070 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 }
2071 2667
2072 $self->{height} = $height; 2668 $self->{height} = $height;
2073 2669
2074 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2075 2671
2076 delete $self->{texture}; 2672 delete $self->{texture};
2077 } 2673 }
2078 2674
2079 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2080 glClearColor 0, 0, 0, 1; 2676 glClearColor 0, 0, 0, 0;
2081 glClear GL_COLOR_BUFFER_BIT; 2677 glClear GL_COLOR_BUFFER_BIT;
2082 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
2083 glEnable GL_BLEND; 2690 glEnable GL_BLEND;
2691 #TODO# not correct in windows where rgba is forced off
2084 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2692 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2085 glEnable GL_TEXTURE_2D;
2086 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2087
2088 my $top = int $self->{children}[1]{range}[0];
2089
2090 my $y0 = $top;
2091 my $y1 = $top + $self->{h};
2092
2093 my $y = 0;
2094
2095 my $layout = $self->{layout};
2096
2097 $layout->set_font ($self->{font}) if $self->{font};
2098 2693
2099 for my $par (@{$self->{par}}) { 2694 for my $par (@{$self->{par}}) {
2100 my $h = $par->[0]; 2695 my $h = $par->[1];
2101 2696
2102 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});
2103 $layout->set_text ($par->[2]); 2701 $layout->set_markup ($par->[4]);
2104 2702
2105 glColor @{ $par->[1] }; 2703 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2106 my ($W, $H) = $layout->size; 2704
2107 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;
2108 } 2707 }
2109 2708
2110 $y += $h; 2709 $y += $h;
2111 } 2710 }
2112 2711
2113 glDisable GL_TEXTURE_2D;
2114 glDisable GL_BLEND; 2712 glDisable GL_BLEND;
2115 }; 2713 };
2116 }); 2714 });
2117} 2715}
2118 2716
2119sub _draw { 2717sub _draw {
2120 my ($self) = @_; 2718 my ($self) = @_;
2121 2719
2122 if ($self->{texture}) {
2123 glEnable GL_TEXTURE_2D; 2720 glEnable GL_TEXTURE_2D;
2124 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2721 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2125 $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});
2126 glDisable GL_TEXTURE_2D; 2724 glDisable GL_TEXTURE_2D;
2127 }
2128 2725
2129 $self->{children}[1]->draw; 2726 $self->{children}[1]->draw;
2130 2727
2131} 2728}
2132 2729
… …
2180 2777
2181sub new { 2778sub new {
2182 my $class = shift; 2779 my $class = shift;
2183 2780
2184 my $self = $class->SUPER::new ( 2781 my $self = $class->SUPER::new (
2185 state => 0, 2782 state => 0,
2186 connect_activate => \&toggle_flopper, 2783 on_activate => \&toggle_flopper,
2187 can_events => 1,
2188 @_ 2784 @_
2189 ); 2785 );
2190 2786
2191 if ($self->{state}) {
2192 $self->{state} = 0;
2193 $self->toggle_flopper;
2194 }
2195
2196 $self 2787 $self
2197} 2788}
2198 2789
2199sub toggle_flopper { 2790sub toggle_flopper {
2200 my ($self) = @_; 2791 my ($self) = @_;
2201 2792
2202 # TODO: use animation 2793 $self->{other}->toggle_visibility;
2203 if ($self->{state} = !$self->{state}) {
2204 $CFClient::UI::ROOT->add ($self->{other});
2205 $self->{other}->move ($self->coord2global (0, $self->{h}));
2206 $self->emit ("open");
2207 } else {
2208 $CFClient::UI::ROOT->remove ($self->{other});
2209 $self->emit ("close");
2210 }
2211
2212 $self->emit (changed => $self->{state});
2213} 2794}
2214 2795
2215############################################################################# 2796#############################################################################
2216 2797
2217package CFClient::UI::Tooltip; 2798package CFClient::UI::Tooltip;
… …
2227 @_, 2808 @_,
2228 can_events => 0, 2809 can_events => 0,
2229 ) 2810 )
2230} 2811}
2231 2812
2232sub set_markup { 2813sub set_tooltip_from {
2233 my ($self, $text) = @_; 2814 my ($self, $widget) = @_;
2234 2815
2235 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2816 my $tooltip = $widget->{tooltip};
2236 $self->{label}->set_markup ($text); 2817
2237 $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 );
2238} 2836}
2239 2837
2240sub size_request { 2838sub size_request {
2241 my ($self) = @_; 2839 my ($self) = @_;
2242
2243 $self->child->set_max_size ($::WIDTH * 0.3);
2244 2840
2245 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2841 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2246 2842
2247 ($w + 4, $h + 4) 2843 ($w + 4, $h + 4)
2248} 2844}
… …
2251 my ($self, $w, $h) = @_; 2847 my ($self, $w, $h) = @_;
2252 2848
2253 $self->SUPER::size_allocate ($w - 4, $h - 4); 2849 $self->SUPER::size_allocate ($w - 4, $h - 4);
2254} 2850}
2255 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
2256sub _draw { 2870sub _draw {
2257 my ($self) = @_; 2871 my ($self) = @_;
2258 2872
2259 glPushMatrix;
2260 glTranslate 0.375, 0.375; 2873 glTranslate 0.375, 0.375;
2261 2874
2262 my ($w, $h) = @$self{qw(w h)}; 2875 my ($w, $h) = @$self{qw(w h)};
2263 2876
2264 glColor 1, 0.8, 0.4; 2877 glColor 1, 0.8, 0.4;
… …
2275 glVertex 0 , $h; 2888 glVertex 0 , $h;
2276 glVertex $w, $h; 2889 glVertex $w, $h;
2277 glVertex $w, 0; 2890 glVertex $w, 0;
2278 glEnd; 2891 glEnd;
2279 2892
2280 glPopMatrix; 2893 glTranslate 2 - 0.375, 2 - 0.375;
2281 2894
2282 glTranslate 2, 2;
2283 $self->SUPER::_draw; 2895 $self->SUPER::_draw;
2284} 2896}
2285 2897
2286############################################################################# 2898#############################################################################
2287 2899
… …
2292use CFClient::OpenGL; 2904use CFClient::OpenGL;
2293 2905
2294sub new { 2906sub new {
2295 my $class = shift; 2907 my $class = shift;
2296 2908
2297 $class->SUPER::new ( 2909 my $self = $class->SUPER::new (
2298 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) = @_;
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 });
3531}
3532
3533# $mod and $sym are the modifiers and key symbol
3534# $cmds is a array ref of strings (the commands)
3535# $cb is the callback that is executed on OK
3536# $ccb is the callback that is executed on CANCEL and
3537# when the binding was unsuccessful on OK
3538sub set_binding {
3539 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3540
3541 $self->clear_command_list;
3542 $self->{recording} = 0;
3543 $self->{rec_btn}->set_text ("start recording");
3544
3545 $self->{binding} = [$mod, $sym];
3546 $self->{commands} = $cmds;
3547
3548 $self->{binding_change} = $cb;
3549 $self->{binding_cancel} = $ccb;
3550
3551 $self->update_binding_widgets;
3552}
3553
3554# this is a shortcut method that asks for a binding
3555# and then just binds it.
3556sub do_quick_binding {
3557 my ($self, $cmds) = @_;
3558 $self->set_binding (undef, undef, $cmds, sub {
3559 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3560 });
3561 $self->ask_for_bind (1);
3562}
3563
3564sub update_binding_widgets {
3565 my ($self) = @_;
3566 my ($mod, $sym, $cmds) = $self->get_binding;
3567 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3568 $self->set_command_list ($cmds);
3569}
3570
3571sub get_binding {
3572 my ($self) = @_;
3573 return (
3574 $self->{binding}->[0],
3575 $self->{binding}->[1],
3576 [ grep { defined $_ } @{$self->{commands}} ]
3577 );
3578}
3579
3580sub clear_command_list {
3581 my ($self) = @_;
3582 $self->{cmdbox}->clear ();
3583}
3584
3585sub set_command_list {
3586 my ($self, $cmds) = @_;
3587
3588 $self->{cmdbox}->clear ();
3589 $self->{commands} = $cmds;
3590
3591 my $idx = 0;
3592
3593 for (@$cmds) {
3594 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3595
3596 my $i = $idx;
3597 $hb->add (new CFClient::UI::Label text => $_);
3598 $hb->add (new CFClient::UI::Button
3599 text => "delete",
3600 tooltip => "Deletes the action from the record",
3601 on_activate => sub {
3602 $self->{cmdbox}->remove ($hb);
3603 $cmds->[$i] = undef;
3604 });
3605
3606
3607 $idx++
3608 }
3609}
3610
3611#############################################################################
3612
3613package CFClient::UI::SpellList;
3614
3615our @ISA = CFClient::UI::Table::;
3616
3617sub new {
3618 my $class = shift;
3619
3620 my $self = $class->SUPER::new (
3621 binding => [],
3622 commands => [],
2299 @_, 3623 @_,
2300 ) 3624 )
2301} 3625}
2302 3626
3627my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3628
3629my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3630 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3631my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3633my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3635my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3636 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3637my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3638 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3639
3640sub rebuild_spell_list {
3641 my ($self) = @_;
3642
3643 $CFClient::UI::ROOT->on_refresh ($self => sub {
3644 $self->clear;
3645
3646 return unless $::CONN;
3647
3648 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3649 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3650 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3651 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3652 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3653
3654 my $row = 0;
3655
3656 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3657 my $spell = $self->{spell}{$_};
3658
3659 $row++;
3660
3661 my $spell_cb = sub {
3662 my ($widget, $ev) = @_;
3663
3664 if ($ev->{button} == 1) {
3665 $::CONN->user_send ("cast $spell->{name}");
3666 } elsif ($ev->{button} == 2) {
3667 $::CONN->user_send ("invoke $spell->{name}");
3668 } elsif ($ev->{button} == 3) {
3669 (new CFClient::UI::Menu
3670 items => [
3671 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3672 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3673 ],
3674 )->popup ($ev);
3675 } else {
3676 return 0;
3677 }
3678
3679 1
3680 };
3681
3682 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3683
3684 #TODO: add path info to tooltip
3685 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3686
3687 $self->add (0, $row, new CFClient::UI::Face
3688 face => $spell->{face},
3689 can_hover => 1,
3690 can_events => 1,
3691 tooltip => $tooltip,
3692 on_button_down => $spell_cb,
3693 );
3694
3695 $self->add (1, $row, new CFClient::UI::Label
3696 expand => 1,
3697 text => $spell->{name},
3698 can_hover => 1,
3699 can_events => 1,
3700 tooltip => $tooltip,
3701 on_button_down => $spell_cb,
3702 );
3703
3704 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3705 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3706 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3707 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3708 }
3709 });
3710}
3711
3712sub add_spell {
3713 my ($self, $spell) = @_;
3714
3715 $self->{spell}->{$spell->{name}} = $spell;
3716 $self->rebuild_spell_list;
3717}
3718
3719sub remove_spell {
3720 my ($self, $spell) = @_;
3721
3722 delete $self->{spell}->{$spell->{name}};
3723 $self->rebuild_spell_list;
3724}
3725
3726sub clear_spells {
3727 my ($self) = @_;
3728
3729 $self->{spell} = {};
3730 $self->rebuild_spell_list;
3731}
3732
3733#############################################################################
3734
3735package CFClient::UI::Root;
3736
3737our @ISA = CFClient::UI::Container::;
3738
3739use List::Util qw(min max);
3740
3741use CFClient::OpenGL;
3742
3743sub new {
3744 my $class = shift;
3745
3746 my $self = $class->SUPER::new (
3747 visible => 1,
3748 @_,
3749 );
3750
3751 Scalar::Util::weaken ($self->{root} = $self);
3752
3753 $self
3754}
3755
2303sub size_request { 3756sub size_request {
2304 (32, 8)
2305}
2306
2307sub draw {
2308 my ($self) = @_; 3757 my ($self) = @_;
2309 3758
2310 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3759 ($self->{w}, $self->{h})
2311
2312 if ($tex) {
2313 glEnable GL_BLEND;
2314 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2315 glEnable GL_TEXTURE_2D;
2316 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2317 glColor 1, 1, 1, 1;
2318 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2319 glDisable GL_TEXTURE_2D;
2320 glDisable GL_BLEND;
2321 }
2322} 3760}
2323 3761
2324############################################################################# 3762sub _to_pixel {
3763 my ($coord, $size, $max) = @_;
2325 3764
2326package CFClient::UI::Root; 3765 $coord =
3766 $coord eq "center" ? ($max - $size) * 0.5
3767 : $coord eq "max" ? $max
3768 : $coord;
2327 3769
2328our @ISA = CFClient::UI::Container::; 3770 $coord = 0 if $coord < 0;
3771 $coord = $max - $size if $coord > $max - $size;
2329 3772
2330use CFClient::OpenGL; 3773 int $coord + 0.5
2331
2332sub check_size {
2333 my ($self) = @_;
2334
2335 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2336} 3774}
2337 3775
2338sub size_request { 3776sub size_allocate {
2339 ($::WIDTH, $::HEIGHT)
2340}
2341
2342sub configure {
2343 my ($self, $x, $y, $w, $h) = @_; 3777 my ($self, $w, $h) = @_;
2344 3778
2345 $self->SUPER::configure ($x, $y, $w, $h);
2346
2347 for my $child (@{$self->{children}}) { 3779 for my $child ($self->children) {
2348 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3780 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2349 3781
2350 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3782 $X = $child->{force_x} if exists $child->{force_x};
2351 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3783 $Y = $child->{force_y} if exists $child->{force_y};
3784
3785 $X = _to_pixel $X, $W, $self->{w};
3786 $Y = _to_pixel $Y, $H, $self->{h};
3787
2352 $child->configure ($X, $Y, $W,$H); 3788 $child->configure ($X, $Y, $W, $H);
2353 } 3789 }
2354} 3790}
2355 3791
2356sub _topleft { 3792sub coord2local {
2357 my ($self, $x, $y) = @_; 3793 my ($self, $x, $y) = @_;
2358 3794
2359 ($x, $y) 3795 ($x, $y)
2360} 3796}
2361 3797
3798sub coord2global {
3799 my ($self, $x, $y) = @_;
3800
3801 ($x, $y)
3802}
3803
2362sub update { 3804sub update {
2363 my ($self) = @_; 3805 my ($self) = @_;
2364 3806
2365 $self->check_size; 3807 $::WANT_REFRESH++;
2366 ::refresh ();
2367} 3808}
2368 3809
2369sub add { 3810sub add {
2370 my ($self, $child) = @_; 3811 my ($self, @children) = @_;
2371 3812
2372 # integerize window positions 3813 $_->{is_toplevel} = 1
2373 $child->{x} = int $child->{x}; 3814 for @children;
2374 $child->{y} = int $child->{y};
2375 3815
2376 $self->SUPER::add ($child); 3816 $self->SUPER::add (@children);
3817}
3818
3819sub remove {
3820 my ($self, @children) = @_;
3821
3822 $self->SUPER::remove (@children);
3823
3824 delete $self->{is_toplevel}
3825 for @children;
3826
3827 while (@children) {
3828 my $w = pop @children;
3829 push @children, $w->children;
3830 $w->set_invisible;
3831 }
2377} 3832}
2378 3833
2379sub on_refresh { 3834sub on_refresh {
2380 my ($self, $id, $cb) = @_; 3835 my ($self, $id, $cb) = @_;
2381 3836
2382 $self->{refresh_hook}{$id} = $cb; 3837 $self->{refresh_hook}{$id} = $cb;
2383} 3838}
2384 3839
3840sub on_post_alloc {
3841 my ($self, $id, $cb) = @_;
3842
3843 $self->{post_alloc_hook}{$id} = $cb;
3844}
3845
2385sub draw { 3846sub draw {
2386 my ($self) = @_; 3847 my ($self) = @_;
2387 3848
2388 while (my $rcb = delete $self->{refresh_hook}) { 3849 while ($self->{refresh_hook}) {
2389 $_->() for values %$rcb; 3850 $_->()
3851 for values %{delete $self->{refresh_hook}};
2390 } 3852 }
3853
3854 if ($self->{realloc}) {
3855 my %queue;
3856 my @queue;
3857 my $widget;
3858
3859 outer:
3860 while () {
3861 if (my $realloc = delete $self->{realloc}) {
3862 for $widget (values %$realloc) {
3863 $widget->{visible} or next; # do not resize invisible widgets
3864
3865 $queue{$widget+0}++ and next; # duplicates are common
3866
3867 push @{ $queue[$widget->{visible}] }, $widget;
3868 }
3869 }
3870
3871 while () {
3872 @queue or last outer;
3873
3874 $widget = pop @{ $queue[-1] || [] }
3875 and last;
3876
3877 pop @queue;
3878 }
3879
3880 delete $queue{$widget+0};
3881
3882 my ($w, $h) = $widget->size_request;
3883
3884 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3885 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3886
3887 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3888 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3889
3890 $w = $widget->{force_w} if exists $widget->{force_w};
3891 $h = $widget->{force_h} if exists $widget->{force_h};
3892
3893 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3894 || delete $widget->{force_realloc}) {
3895 $widget->{req_w} = $w;
3896 $widget->{req_h} = $h;
3897
3898 $self->{size_alloc}{$widget+0} = $widget;
3899
3900 if (my $parent = $widget->{parent}) {
3901 $self->{realloc}{$parent+0} = $parent
3902 unless $queue{$parent+0};
3903
3904 $parent->{force_size_alloc} = 1;
3905 $self->{size_alloc}{$parent+0} = $parent;
3906 }
3907 }
3908
3909 delete $self->{realloc}{$widget+0};
3910 }
3911 }
3912
3913 while (my $size_alloc = delete $self->{size_alloc}) {
3914 my @queue = sort { $b->{visible} <=> $a->{visible} }
3915 values %$size_alloc;
3916
3917 while () {
3918 my $widget = pop @queue || last;
3919
3920 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3921
3922 $w = 0 if $w < 0;
3923 $h = 0 if $h < 0;
3924
3925 $w = int $w + 0.5;
3926 $h = int $h + 0.5;
3927
3928 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3929 $widget->{old_w} = $widget->{w};
3930 $widget->{old_h} = $widget->{h};
3931
3932 $widget->{w} = $w;
3933 $widget->{h} = $h;
3934
3935 $widget->emit (size_allocate => $w, $h);
3936 }
3937 }
3938 }
3939
3940 while ($self->{post_alloc_hook}) {
3941 $_->()
3942 for values %{delete $self->{post_alloc_hook}};
3943 }
3944
2391 3945
2392 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3946 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2393 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3947 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2394 glClear GL_COLOR_BUFFER_BIT; 3948 glClear GL_COLOR_BUFFER_BIT;
2395 3949
2396 glMatrixMode GL_PROJECTION; 3950 glMatrixMode GL_PROJECTION;
2397 glLoadIdentity; 3951 glLoadIdentity;
2398 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3952 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2399 glMatrixMode GL_MODELVIEW; 3953 glMatrixMode GL_MODELVIEW;
2400 glLoadIdentity; 3954 glLoadIdentity;
2401 3955
3956 {
3957 package CFClient::UI::Base;
3958
3959 ($draw_x, $draw_y, $draw_w, $draw_h) =
3960 (0, 0, $self->{w}, $self->{h});
3961 }
3962
2402 $self->_draw; 3963 $self->_draw;
2403} 3964}
2404 3965
2405############################################################################# 3966#############################################################################
2406 3967
2407package CFClient::UI; 3968package CFClient::UI;
2408 3969
2409$ROOT = new CFClient::UI::Root; 3970$ROOT = new CFClient::UI::Root;
2410$TOOLTIP = new CFClient::UI::Tooltip; 3971$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2411 3972
24121 39731
2413 3974

Diff Legend

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