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.197 by root, Fri May 12 01:47:04 2006 UTC vs.
Revision 1.310 by root, Fri Jun 23 20:28:20 2006 UTC

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

Diff Legend

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