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

Diff Legend

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