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

Diff Legend

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