ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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