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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.198 by root, Fri May 12 02:08:52 2006 UTC vs.
Revision 1.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 (1);
258 $self->update;
259} 403}
260 404
261sub set_max_size { 405sub set_max_size {
262 my ($self, $w, $h) = @_; 406 my ($self, $w, $h) = @_;
263 407
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 408 $self->{max_w} = int $w if defined $w;
265 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 }
266} 428}
267 429
268# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
269sub coord2local { 431sub coord2local {
270 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
… …
277 my ($self, $x, $y) = @_; 439 my ($self, $x, $y) = @_;
278 440
279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 441 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
280} 442}
281 443
282sub focus_in { 444sub invoke_focus_in {
283 my ($self) = @_; 445 my ($self) = @_;
284 446
285 return if $FOCUS == $self; 447 return if $FOCUS == $self;
286 return unless $self->{can_focus}; 448 return unless $self->{can_focus};
287 449
288 my $focus = $FOCUS; $FOCUS = $self; 450 $FOCUS = $self;
289 451
290 $self->emit (focus_in => $focus); 452 $self->update;
291 453
292 $focus->update if $focus; 454 0
293 $FOCUS->update;
294} 455}
295 456
296sub focus_out { 457sub invoke_focus_out {
297 my ($self) = @_; 458 my ($self) = @_;
298 459
299 return unless $FOCUS == $self; 460 return unless $FOCUS == $self;
300 461
301 my $focus = $FOCUS; undef $FOCUS; 462 undef $FOCUS;
302 463
303 $self->emit (focus_out => $focus); 464 $self->update;
304 465
305 $focus->update if $focus; #? 466 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
306} 467 unless $FOCUS;
307 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
308sub mouse_motion { } 479sub invoke_mouse_motion { 0 }
309sub button_up { } 480sub invoke_button_up { 0 }
310sub key_down { } 481sub invoke_key_down { 0 }
311sub key_up { } 482sub invoke_key_up { 0 }
483sub invoke_mouse_wheel { 0 }
312 484
313sub button_down { 485sub invoke_button_down {
314 my ($self, $ev, $x, $y) = @_; 486 my ($self, $ev, $x, $y) = @_;
315 487
316 $self->focus_in; 488 $self->grab_focus;
317}
318 489
319sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 490 0
320sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 491}
321sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 492
322sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 493sub connect {
323sub 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
324 565
325sub draw { 566sub draw {
326 my ($self) = @_; 567 my ($self) = @_;
327 568
328 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);
329 578
330 glPushMatrix; 579 glPushMatrix;
331 glTranslate $self->{x}, $self->{y}, 0; 580 glTranslate $self->{x}, $self->{y}, 0;
332 $self->_draw;
333 glPopMatrix;
334 581
335 if ($self == $HOVER && $self->{can_hover}) { 582 if ($self == $HOVER && $self->{can_hover}) {
336 my ($x, $y) = @$self{qw(x y)};
337
338 glColor 1, 0.8, 0.5, 0.2; 583 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
339 glEnable GL_BLEND; 584 glEnable GL_BLEND;
340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 585 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
341 glBegin GL_QUADS; 586 glBegin GL_QUADS;
342 glVertex $x , $y;
343 glVertex $x + $self->{w}, $y;
344 glVertex $x + $self->{w}, $y + $self->{h};
345 glVertex $x , $y + $self->{h};
346 glEnd;
347 glDisable GL_BLEND;
348 }
349
350 if ($ENV{PCLIENT_DEBUG}) {
351 glPushMatrix;
352 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0; 587 glVertex 0 , 0;
356 glVertex $self->{w}, 0; 588 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h}; 589 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h}; 590 glVertex 0 , $self->{h};
359 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;
360 glPopMatrix; 605 glPopMatrix;
361 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;
362 } 607 }
608
609 $self->_draw;
610 glPopMatrix;
363} 611}
364 612
365sub _draw { 613sub _draw {
366 my ($self) = @_; 614 my ($self) = @_;
367 615
368 warn "no draw defined for $self\n"; 616 warn "no draw defined for $self\n";
369} 617}
370 618
371sub find_widget {
372 my ($self, $x, $y) = @_;
373
374 return () unless $self->{can_events};
375
376 return $self
377 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
378 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
379
380 ()
381}
382
383sub set_parent {
384 my ($self, $parent) = @_;
385
386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388
389 # TODO: req_w _does_change after ->reconfigure
390 $self->check_size
391 unless exists $self->{req_w};
392}
393
394sub check_size {
395 my ($self, $forced) = @_;
396
397 $self->{force_alloc} = 1 if $forced;
398 $CFClient::UI::ROOT->{check_size}{$self} = $self;
399}
400
401sub update {
402 my ($self) = @_;
403
404 $self->{parent}->update
405 if $self->{parent};
406}
407
408sub connect {
409 my ($self, $signal, $cb) = @_;
410
411 push @{ $self->{signal_cb}{$signal} }, $cb;
412}
413
414sub emit {
415 my ($self, $signal, @args) = @_;
416
417 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
418}
419
420sub DESTROY { 619sub DESTROY {
421 my ($self) = @_; 620 my ($self) = @_;
422 621
423 #$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/;
424} 628}
425 629
426############################################################################# 630#############################################################################
427 631
428package CFClient::UI::DrawBG; 632package CFClient::UI::DrawBG;
… …
436 my $class = shift; 640 my $class = shift;
437 641
438 # range [value, low, high, page] 642 # range [value, low, high, page]
439 643
440 $class->SUPER::new ( 644 $class->SUPER::new (
441 bg => [0, 0, 0, 0.2], 645 #bg => [0, 0, 0, 0.2],
442 active_bg => [1, 1, 1, 0.5], 646 #active_bg => [1, 1, 1, 0.5],
443 @_ 647 @_
444 ) 648 )
445} 649}
446 650
447sub _draw { 651sub _draw {
448 my ($self) = @_; 652 my ($self) = @_;
449 653
654 my $color = $FOCUS == $self && $self->{active_bg}
655 ? $self->{active_bg}
656 : $self->{bg};
657
658 if ($color && (@$color < 4 || $color->[3])) {
450 my ($w, $h) = @$self{qw(w h)}; 659 my ($w, $h) = @$self{qw(w h)};
451 660
452 glEnable GL_BLEND; 661 glEnable GL_BLEND;
453 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 662 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
454 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 663 glColor_premultiply @$color;
455 664
456 glBegin GL_QUADS; 665 glBegin GL_QUADS;
457 glVertex 0 , 0; 666 glVertex 0 , 0;
458 glVertex 0 , $h; 667 glVertex 0 , $h;
459 glVertex $w, $h; 668 glVertex $w, $h;
460 glVertex $w, 0; 669 glVertex $w, 0;
461 glEnd; 670 glEnd;
462 671
463 glDisable GL_BLEND; 672 glDisable GL_BLEND;
673 }
464} 674}
465 675
466############################################################################# 676#############################################################################
467 677
468package CFClient::UI::Empty; 678package CFClient::UI::Empty;
… …
473 my ($class, %arg) = @_; 683 my ($class, %arg) = @_;
474 $class->SUPER::new (can_events => 0, %arg); 684 $class->SUPER::new (can_events => 0, %arg);
475} 685}
476 686
477sub size_request { 687sub size_request {
478 (0, 0) 688 my ($self) = @_;
689
690 ($self->{w} + 0, $self->{h} + 0)
479} 691}
480 692
481sub draw { } 693sub draw { }
482 694
483############################################################################# 695#############################################################################
… …
487our @ISA = CFClient::UI::Base::; 699our @ISA = CFClient::UI::Base::;
488 700
489sub new { 701sub new {
490 my ($class, %arg) = @_; 702 my ($class, %arg) = @_;
491 703
492 my $children = delete $arg{children} || []; 704 my $children = delete $arg{children};
493 705
494 my $self = $class->SUPER::new ( 706 my $self = $class->SUPER::new (
495 children => [], 707 children => [],
496 can_events => 0, 708 can_events => 0,
497 %arg, 709 %arg,
498 ); 710 );
711
499 $self->add ($_) for @$children; 712 $self->add (@$children)
713 if $children;
500 714
501 $self 715 $self
502} 716}
503 717
504sub add { 718sub add {
… …
512 $self->{children} = [ 726 $self->{children} = [
513 sort { $a->{z} <=> $b->{z} } 727 sort { $a->{z} <=> $b->{z} }
514 @{$self->{children}}, @widgets 728 @{$self->{children}}, @widgets
515 ]; 729 ];
516 730
517 $self->check_size (1); 731 $self->realloc;
518 $self->update;
519} 732}
520 733
521sub children { 734sub children {
522 @{ $_[0]{children} } 735 @{ $_[0]{children} }
523} 736}
… …
528 delete $child->{parent}; 741 delete $child->{parent};
529 $child->hide; 742 $child->hide;
530 743
531 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 744 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
532 745
533 $self->check_size; 746 $self->realloc;
534 $self->update;
535} 747}
536 748
537sub clear { 749sub clear {
538 my ($self) = @_; 750 my ($self) = @_;
539 751
… …
543 for (@$children) { 755 for (@$children) {
544 delete $_->{parent}; 756 delete $_->{parent};
545 $_->hide; 757 $_->hide;
546 } 758 }
547 759
548 $self->check_size; 760 $self->realloc;
549 $self->update;
550} 761}
551 762
552sub find_widget { 763sub find_widget {
553 my ($self, $x, $y) = @_; 764 my ($self, $x, $y) = @_;
554 765
555 $x -= $self->{x}; 766 $x -= $self->{x};
556 $y -= $self->{y}; 767 $y -= $self->{y};
557 768
558 my $res; 769 my $res;
559 770
560 for (reverse @{ $self->{children} }) { 771 for (reverse $self->visible_children) {
561 $res = $_->find_widget ($x, $y) 772 $res = $_->find_widget ($x, $y)
562 and return $res; 773 and return $res;
563 } 774 }
564 775
565 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 776 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
586} 797}
587 798
588sub add { 799sub add {
589 my ($self, $child) = @_; 800 my ($self, $child) = @_;
590 801
591 $self->{children} = []; 802 $self->SUPER::remove ($_) for @{ $self->{children} };
592
593 $self->SUPER::add ($child); 803 $self->SUPER::add ($child);
594} 804}
595 805
596sub remove { 806sub remove {
597 my ($self, $widget) = @_; 807 my ($self, $widget) = @_;
… …
606 816
607sub size_request { 817sub size_request {
608 $_[0]{children}[0]->size_request 818 $_[0]{children}[0]->size_request
609} 819}
610 820
611sub size_allocate { 821sub invoke_size_allocate {
612 my ($self, $w, $h) = @_; 822 my ($self, $w, $h) = @_;
613 823
614 $self->{children}[0]->configure (0, 0, $w, $h); 824 $self->{children}[0]->configure (0, 0, $w, $h);
825
826 1
615} 827}
616 828
617############################################################################# 829#############################################################################
830
831# back-buffered drawing area
618 832
619package CFClient::UI::Window; 833package CFClient::UI::Window;
620 834
621our @ISA = CFClient::UI::Bin::; 835our @ISA = CFClient::UI::Bin::;
622 836
… …
633 847
634 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 848 $ROOT->on_post_alloc ($self => sub { $self->render_child });
635 $self->SUPER::update; 849 $self->SUPER::update;
636} 850}
637 851
638sub size_allocate { 852sub invoke_size_allocate {
639 my ($self, $w, $h) = @_; 853 my ($self, $w, $h) = @_;
640 854
641 $self->SUPER::size_allocate ($w, $h);
642 $self->update; 855 $self->update;
856
857 $self->SUPER::invoke_size_allocate ($w, $h)
643} 858}
644 859
645sub _render { 860sub _render {
861 my ($self) = @_;
862
646 $_[0]{children}[0]->draw; 863 $self->{children}[0]->draw;
647} 864}
648 865
649sub render_child { 866sub render_child {
650 my ($self) = @_; 867 my ($self) = @_;
651 868
652 $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 {
653 glClearColor 0, 0, 0, 0; 870 glClearColor 0, 0, 0, 0;
654 glClear GL_COLOR_BUFFER_BIT; 871 glClear GL_COLOR_BUFFER_BIT;
655 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
656 $self->_render; 880 $self->_render;
657# glColorMask 1, 1, 1, 0;
658# glEnable GL_BLEND;
659# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
660# glRasterPos 0, 0;
661# glCopyPixels 0, 0, $self->{w}, $self->{h};
662# glDisable GL_BLEND;
663# glColorMask 1, 1, 1, 1;
664 }; 881 };
665} 882}
666 883
667sub _draw { 884sub _draw {
668 my ($self) = @_; 885 my ($self) = @_;
669 886
670 my ($w, $h) = ($self->w, $self->h); 887 my ($w, $h) = @$self{qw(w h)};
671 888
672 my $tex = $self->{texture} 889 my $tex = $self->{texture}
673 or return; 890 or return;
674 891
675 glEnable GL_TEXTURE_2D; 892 glEnable GL_TEXTURE_2D;
… …
685 902
686package CFClient::UI::ViewPort; 903package CFClient::UI::ViewPort;
687 904
688our @ISA = CFClient::UI::Window::; 905our @ISA = CFClient::UI::Window::;
689 906
907sub new {
908 my $class = shift;
909
910 $class->SUPER::new (
911 scroll_x => 0,
912 scroll_y => 1,
913 @_,
914 )
915}
916
690sub size_request { 917sub size_request {
691 my ($self) = @_; 918 my ($self) = @_;
692 919
693 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 920 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
694 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
695 921
696 @$self{qw(child_w child_h)} 922 $w = 10 if $self->{scroll_x};
697} 923 $h = 10 if $self->{scroll_y};
698 924
925 ($w, $h)
926}
927
699sub size_allocate { 928sub invoke_size_allocate {
700 my ($self, $w, $h) = @_; 929 my ($self, $w, $h) = @_;
701 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);
702 $self->update; 937 $self->update;
938
939 1
703} 940}
704 941
705sub set_offset { 942sub set_offset {
706 my ($self, $x, $y) = @_; 943 my ($self, $x, $y) = @_;
707 944
… …
740} 977}
741 978
742sub _render { 979sub _render {
743 my ($self) = @_; 980 my ($self) = @_;
744 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
745 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 985 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
746 986
747 $self->SUPER::_render; 987 $self->SUPER::_render;
748} 988}
749 989
750############################################################################# 990#############################################################################
751 991
752package CFClient::UI::ScrolledWindow; 992package CFClient::UI::ScrolledWindow;
753 993
754our @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;
755 1071
756sub new { 1072sub new {
757 my $class = shift; 1073 my $class = shift;
758 1074
759 my $self;
760
761 my $slider = new CFClient::UI::Slider
762 vertical => 1,
763 range => [0, 0, 1, 0.01], # HACK fix
764 connect_changed => sub {
765 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
766 },
767 ;
768
769 $self = $class->SUPER::new ( 1075 $class->SUPER::new (
770 vp => (new CFClient::UI::ViewPort), 1076 bg => undef,
771 slider => $slider,
772 @_, 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,
773 ); 1131 );
774 1132
775 $self->{vp}->add ($self->{scrolled});
776 $self->add ($self->{vp});
777 $self->add ($self->{slider});
778
779 $self
780}
781
782#TODO# update range on size_allocate depeneing on child
783# update viewport offset on scroll
784
785#############################################################################
786
787package CFClient::UI::Frame;
788
789our @ISA = CFClient::UI::Bin::;
790
791use CFClient::OpenGL;
792
793#############################################################################
794
795package CFClient::UI::FancyFrame;
796
797our @ISA = CFClient::UI::Bin::;
798
799use CFClient::OpenGL;
800
801my @tex =
802 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
803 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
804
805sub new {
806 my $class = shift;
807
808 # TODO: user_x, user_y, overwrite moveto?
809
810 my $self = $class->SUPER::new (
811 bg => [1, 1, 1, 1],
812 border_bg => [1, 1, 1, 1],
813 border => 0.6,
814 can_events => 1,
815 @_
816 );
817
818 $self->{title} &&= new CFClient::UI::Label 1133 $self->{title_widget} = new CFClient::UI::Label
819 align => 0, 1134 align => 0,
820 valign => 1, 1135 valign => 1,
821 text => $self->{title}, 1136 text => $self->{title},
822 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 }
823 1148
824 $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};
825} 1158}
826 1159
827sub border { 1160sub border {
828 int $_[0]{border} * $::FONTSIZE 1161 int $_[0]{border} * $::FONTSIZE
829} 1162}
830 1163
831sub size_request { 1164sub size_request {
832 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};
833 1172
834 my ($w, $h) = $self->SUPER::size_request; 1173 my ($w, $h) = $self->SUPER::size_request;
835 1174
836 ( 1175 (
837 $w + $self->border * 2, 1176 $w + $self->border * 2,
838 $h + $self->border * 2, 1177 $h + $self->border * 2,
839 ) 1178 )
840} 1179}
841 1180
842sub size_allocate { 1181sub invoke_size_allocate {
843 my ($self, $w, $h) = @_; 1182 my ($self, $w, $h) = @_;
844 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
845 $h -= List::Util::max 0, $self->border * 2; 1192 $h -= List::Util::max 0, $border * 2;
846 $w -= List::Util::max 0, $self->border * 2; 1193 $w -= List::Util::max 0, $border * 2;
847 1194
848 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
849 if $self->{title};
850
851 $self->child->configure ($self->border, $self->border, $w, $h); 1195 $self->child->configure ($border, $border, $w, $h);
852}
853 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
854sub button_down { 1211sub invoke_button_down {
855 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
856 1213
857 my ($w, $h) = @$self{qw(w h)}; 1214 my ($w, $h) = @$self{qw(w h)};
858 my $border = $self->border; 1215 my $border = $self->border;
859 1216
… …
872 my ($ev, $x, $y) = @_; 1229 my ($ev, $x, $y) = @_;
873 1230
874 my $dx = $ev->{x} - $ox; 1231 my $dx = $ev->{x} - $ox;
875 my $dy = $ev->{y} - $oy; 1232 my $dy = $ev->{y} - $oy;
876 1233
877 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1234 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
878 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1235 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1236
879 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1237 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
880 $self->check_size; 1238 $self->realloc;
881 }; 1239 };
882 1240
883 } elsif ($lr ^ $td) { 1241 } elsif ($lr ^ $td) {
884 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1242 my ($ox, $oy) = ($ev->{x}, $ev->{y});
885 my ($bx, $by) = ($self->{x}, $self->{y}); 1243 my ($bx, $by) = ($self->{x}, $self->{y});
… …
887 $self->{motion} = sub { 1245 $self->{motion} = sub {
888 my ($ev, $x, $y) = @_; 1246 my ($ev, $x, $y) = @_;
889 1247
890 ($x, $y) = ($ev->{x}, $ev->{y}); 1248 ($x, $y) = ($ev->{x}, $ev->{y});
891 1249
892 $self->move ($bx + $x - $ox, $by + $y - $oy); 1250 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
893 $self->update; 1251 # HACK: the next line is required to enforce placement
1252 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
894 }; 1253 };
1254 } else {
1255 return 0;
1256 }
1257
895 } 1258 1
896} 1259}
897 1260
898sub button_up { 1261sub invoke_button_up {
899 my ($self, $ev, $x, $y) = @_; 1262 my ($self, $ev, $x, $y) = @_;
900 1263
901 delete $self->{motion}; 1264 ! ! delete $self->{motion}
902} 1265}
903 1266
904sub mouse_motion { 1267sub invoke_mouse_motion {
905 my ($self, $ev, $x, $y) = @_; 1268 my ($self, $ev, $x, $y) = @_;
906 1269
907 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1270 $self->{motion}->($ev, $x, $y) if $self->{motion};
1271
1272 ! ! $self->{motion}
908} 1273}
909 1274
910sub _draw { 1275sub _draw {
911 my ($self) = @_; 1276 my ($self) = @_;
912 1277
1278 my $child = $self->{children}[0];
1279
913 my ($w, $h ) = ($self->{w}, $self->{h}); 1280 my ($w, $h ) = ($self->{w}, $self->{h});
914 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1281 my ($cw, $ch) = ($child->{w}, $child->{h});
915 1282
916 glEnable GL_TEXTURE_2D; 1283 glEnable GL_TEXTURE_2D;
917 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
918 1285
919 my $border = $self->border; 1286 my $border = $self->border;
920 1287
921 glColor @{ $self->{border_bg} }; 1288 glColor @{ $self->{border_bg} };
922 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1289 $border[0]->draw_quad_alpha (0, 0, $w, $border);
923 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1290 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
924 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1291 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
925 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1292 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
926 1293
927 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1294 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
928 my $bg = $tex[0]; 1295 glColor @{ $self->{bg} };
929 1296
930 # TODO: repeat texture not scale 1297 # TODO: repeat texture not scale
1298 # solve this better(?)
931 my $rep_x = $cw / $bg->{w}; 1299 $bg->{s} = $cw / $bg->{w};
932 my $rep_y = $ch / $bg->{h}; 1300 $bg->{t} = $ch / $bg->{h};
933
934 glColor @{ $self->{bg} };
935
936 $bg->{s} = $rep_x;
937 $bg->{t} = $rep_y;
938 $bg->{wrap_mode} = 1;
939 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1301 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
940 } 1302 }
941 1303
942 glDisable GL_TEXTURE_2D; 1304 glDisable GL_TEXTURE_2D;
943 1305
944 $self->{title}->draw if $self->{title};
945
946 $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};
947} 1317}
948 1318
949############################################################################# 1319#############################################################################
950 1320
951package CFClient::UI::Table; 1321package CFClient::UI::Table;
… …
959sub new { 1329sub new {
960 my $class = shift; 1330 my $class = shift;
961 1331
962 $class->SUPER::new ( 1332 $class->SUPER::new (
963 col_expand => [], 1333 col_expand => [],
964 @_ 1334 @_,
965 ) 1335 )
1336}
1337
1338sub children {
1339 grep $_, map @$_, grep $_, @{ $_[0]{children} }
966} 1340}
967 1341
968sub add { 1342sub add {
969 my ($self, $x, $y, $child) = @_; 1343 my ($self, $x, $y, $child) = @_;
970 1344
971 $child->set_parent ($self); 1345 $child->set_parent ($self);
972 $self->{children}[$y][$x] = $child; 1346 $self->{children}[$y][$x] = $child;
973 1347
974 $child->check_size; 1348 $self->realloc;
975} 1349}
976 1350
977sub children { 1351sub remove {
978 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1352 my ($self, $child) = @_;
979}
980 1353
1354 # TODO: not yet implemented
1355}
1356
981# 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?
982sub clear { 1358sub clear {
983 my ($self) = @_; 1359 my ($self) = @_;
984 1360
985 my @children = $self->children; 1361 my @children = $self->children;
986 delete $self->{children}; 1362 delete $self->{children};
… …
988 for (@children) { 1364 for (@children) {
989 delete $_->{parent}; 1365 delete $_->{parent};
990 $_->hide; 1366 $_->hide;
991 } 1367 }
992 1368
993 $self->update; 1369 $self->realloc;
994} 1370}
995 1371
996sub get_wh { 1372sub get_wh {
997 my ($self) = @_; 1373 my ($self) = @_;
998 1374
… …
1024 (sum @$ws), 1400 (sum @$ws),
1025 (sum @$hs), 1401 (sum @$hs),
1026 ) 1402 )
1027} 1403}
1028 1404
1029sub size_allocate { 1405sub invoke_size_allocate {
1030 my ($self, $w, $h) = @_; 1406 my ($self, $w, $h) = @_;
1031 1407
1032 my ($ws, $hs) = $self->get_wh; 1408 my ($ws, $hs) = $self->get_wh;
1033 1409
1034 my $req_w = sum @$ws; 1410 my $req_w = (sum @$ws) || 1;
1035 my $req_h = sum @$hs; 1411 my $req_h = (sum @$hs) || 1;
1036 1412
1037 # TODO: nicer code && do row_expand 1413 # TODO: nicer code && do row_expand
1038 my @col_expand = @{$self->{col_expand}}; 1414 my @col_expand = @{$self->{col_expand}};
1039 @col_expand = (1) x @$ws unless @col_expand; 1415 @col_expand = (1) x @$ws unless @col_expand;
1040 my $col_expand = (sum @col_expand) || 1; 1416 my $col_expand = (sum @col_expand) || 1;
… …
1066 } 1442 }
1067 1443
1068 $y += $row_h; 1444 $y += $row_h;
1069 } 1445 }
1070 1446
1447 1
1071} 1448}
1072 1449
1073sub find_widget { 1450sub find_widget {
1074 my ($self, $x, $y) = @_; 1451 my ($self, $x, $y) = @_;
1075 1452
… …
1094 } 1471 }
1095} 1472}
1096 1473
1097############################################################################# 1474#############################################################################
1098 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
1099package CFClient::UI::HBox; 1536package CFClient::UI::HBox;
1100 1537
1101# TODO: wrap into common Box base class
1102
1103our @ISA = CFClient::UI::Container::; 1538our @ISA = CFClient::UI::Box::;
1104 1539
1105sub size_request { 1540sub new {
1106 my ($self) = @_; 1541 my $class = shift;
1107 1542
1108 my @alloc = map [$_->size_request], @{$self->{children}}; 1543 $class->SUPER::new (
1109 1544 vertical => 0,
1110 ( 1545 @_,
1111 (List::Util::sum map $_->[0], @alloc),
1112 (List::Util::max map $_->[1], @alloc),
1113 ) 1546 )
1114} 1547}
1115 1548
1116sub size_allocate {
1117 my ($self, $w, $h) = @_;
1118
1119 ($h, $w) = ($w, $h);
1120
1121 my $children = $self->{children};
1122
1123 my @h = map $_->{req_w}, @$children;
1124
1125 my $req_h = List::Util::sum @h;
1126
1127 if ($req_h > $h) {
1128 # ah well, not enough space
1129 $_ *= $h / $req_h for @h;
1130 } else {
1131 my $exp = List::Util::sum map $_->{expand}, @$children;
1132 $exp ||= 1;
1133
1134 for (0 .. $#$children) {
1135 my $child = $children->[$_];
1136
1137 my $alloc_h = $h[$_];
1138 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1139 $h[$_] = $alloc_h;
1140 }
1141 }
1142
1143 CFClient::UI::harmonize \@h;
1144
1145 my $y = 0;
1146 for (0 .. $#$children) {
1147 my $child = $children->[$_];
1148 my $h = $h[$_];
1149 $child->configure ($y, 0, $h, $w);
1150
1151 $y += $h;
1152 }
1153
1154 1
1155}
1156
1157############################################################################# 1549#############################################################################
1158 1550
1159package CFClient::UI::VBox; 1551package CFClient::UI::VBox;
1160 1552
1161# TODO: wrap into common Box base class
1162
1163our @ISA = CFClient::UI::Container::; 1553our @ISA = CFClient::UI::Box::;
1164 1554
1165sub size_request { 1555sub new {
1166 my ($self) = @_; 1556 my $class = shift;
1167 1557
1168 my @alloc = map [$_->size_request], @{$self->{children}}; 1558 $class->SUPER::new (
1169 1559 vertical => 1,
1170 ( 1560 @_,
1171 (List::Util::max map $_->[0], @alloc),
1172 (List::Util::sum map $_->[1], @alloc),
1173 ) 1561 )
1174} 1562}
1175 1563
1176sub size_allocate {
1177 my ($self, $w, $h) = @_;
1178
1179 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1180
1181 my $children = $self->{children};
1182
1183 my @h = map $_->{req_h}, @$children;
1184
1185 my $req_h = List::Util::sum @h;
1186
1187 if ($req_h > $h) {
1188 # ah well, not enough space
1189 $_ *= $h / $req_h for @h;
1190 } else {
1191 my $exp = List::Util::sum map $_->{expand}, @$children;
1192 $exp ||= 1;
1193
1194 for (0 .. $#$children) {
1195 my $child = $children->[$_];
1196
1197 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1198 }
1199 }
1200
1201 CFClient::UI::harmonize \@h;
1202
1203 my $y = 0;
1204 for (0 .. $#$children) {
1205 my $child = $children->[$_];
1206 my $h = $h[$_];
1207 $child->configure (0, $y, $w, $h);
1208
1209 $y += $h;
1210 }
1211
1212 1
1213}
1214
1215############################################################################# 1564#############################################################################
1216 1565
1217package CFClient::UI::Label; 1566package CFClient::UI::Label;
1218 1567
1219our @ISA = CFClient::UI::Base::; 1568our @ISA = CFClient::UI::DrawBG::;
1220 1569
1221use CFClient::OpenGL; 1570use CFClient::OpenGL;
1222 1571
1223sub new { 1572sub new {
1224 my ($class, %arg) = @_; 1573 my ($class, %arg) = @_;
1225 1574
1226 my $self = $class->SUPER::new ( 1575 my $self = $class->SUPER::new (
1227 fg => [1, 1, 1], 1576 fg => [1, 1, 1],
1577 #bg => none
1578 #active_bg => none
1228 #font => default_font 1579 #font => default_font
1229 #text => initial text 1580 #text => initial text
1230 #markup => initial narkup 1581 #markup => initial narkup
1582 #max_w => maximum pixel width
1583 ellipsise => 3, # end
1231 layout => (new CFClient::Layout), 1584 layout => (new CFClient::Layout),
1232 fontsize => 1, 1585 fontsize => 1,
1233 align => -1, 1586 align => -1,
1234 valign => -1, 1587 valign => -1,
1235 padding => 2, 1588 padding_x => 2,
1589 padding_y => 2,
1236 can_events => 0, 1590 can_events => 0,
1237 %arg 1591 %arg
1238 ); 1592 );
1239 1593
1240 if (exists $self->{template}) { 1594 if (exists $self->{template}) {
… …
1250 } 1604 }
1251 1605
1252 $self 1606 $self
1253} 1607}
1254 1608
1255sub escape { 1609sub escape($) {
1256 local $_ = $_[1]; 1610 local $_ = $_[0];
1257 1611
1258 s/&/&amp;/g; 1612 s/&/&amp;/g;
1259 s/>/&gt;/g; 1613 s/>/&gt;/g;
1260 s/</&lt;/g; 1614 s/</&lt;/g;
1261 1615
1262 $_[1] 1616 $_
1263} 1617}
1264 1618
1265sub update { 1619sub update {
1266 my ($self) = @_; 1620 my ($self) = @_;
1267 1621
1268 delete $self->{texture}; 1622 delete $self->{texture};
1269 $self->SUPER::update; 1623 $self->SUPER::update;
1270} 1624}
1271 1625
1626sub realloc {
1627 my ($self) = @_;
1628
1629 delete $self->{ox};
1630 $self->SUPER::realloc;
1631}
1632
1272sub set_text { 1633sub set_text {
1273 my ($self, $text) = @_; 1634 my ($self, $text) = @_;
1274 1635
1275 return if $self->{text} eq "T$text"; 1636 return if $self->{text} eq "T$text";
1276 $self->{text} = "T$text"; 1637 $self->{text} = "T$text";
1277 1638
1278 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1279 $self->{layout}->set_text ($text); 1639 $self->{layout}->set_text ($text);
1280 1640
1641 delete $self->{size_req};
1642 $self->realloc;
1281 $self->update; 1643 $self->update;
1282 $self->check_size;
1283} 1644}
1284 1645
1285sub set_markup { 1646sub set_markup {
1286 my ($self, $markup) = @_; 1647 my ($self, $markup) = @_;
1287 1648
1288 return if $self->{text} eq "M$markup"; 1649 return if $self->{text} eq "M$markup";
1289 $self->{text} = "M$markup"; 1650 $self->{text} = "M$markup";
1290 1651
1291 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1652 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1292 1653
1293 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1294 $self->{layout}->set_markup ($markup); 1654 $self->{layout}->set_markup ($markup);
1295 1655
1656 delete $self->{size_req};
1657 $self->realloc;
1296 $self->update; 1658 $self->update;
1297 $self->check_size;
1298} 1659}
1299 1660
1300sub size_request { 1661sub size_request {
1301 my ($self) = @_; 1662 my ($self) = @_;
1302 1663
1664 $self->{size_req} ||= do {
1303 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1665 $self->{layout}->set_font ($self->{font}) if $self->{font};
1304 $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});
1305 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1669 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1306 1670
1307 my ($w, $h) = $self->{layout}->size; 1671 my ($w, $h) = $self->{layout}->size;
1308 1672
1309 if (exists $self->{template}) { 1673 if (exists $self->{template}) {
1310 $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);
1311 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1676 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1312 1677
1313 my ($w2, $h2) = $self->{template}->size; 1678 my ($w2, $h2) = $self->{template}->size;
1314 1679
1315 $w = List::Util::max $w, $w2; 1680 $w = List::Util::max $w, $w2;
1316 $h = List::Util::max $h, $h2; 1681 $h = List::Util::max $h, $h2;
1682 }
1683
1684 [$w, $h]
1317 } 1685 };
1318 1686
1319 ( 1687 @{ $self->{size_req} }
1320 $w + $self->{padding} * 2,
1321 $h + $self->{padding} * 2,
1322 )
1323} 1688}
1324 1689
1690sub baseline_shift {
1691 $_[0]{layout}->descent
1692}
1693
1325sub size_allocate { 1694sub invoke_size_allocate {
1326 my ($self, $w, $h) = @_; 1695 my ($self, $w, $h) = @_;
1327 1696
1697 delete $self->{ox};
1698
1328 delete $self->{texture}; 1699 delete $self->{texture}
1700 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1701
1702 1
1329} 1703}
1330 1704
1331sub set_fontsize { 1705sub set_fontsize {
1332 my ($self, $fontsize) = @_; 1706 my ($self, $fontsize) = @_;
1333 1707
1334 $self->{fontsize} = $fontsize; 1708 $self->{fontsize} = $fontsize;
1709 delete $self->{size_req};
1335 delete $self->{texture}; 1710 delete $self->{texture};
1336 1711
1337 $self->update; 1712 $self->realloc;
1338 $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;
1339} 1722}
1340 1723
1341sub _draw { 1724sub _draw {
1342 my ($self) = @_; 1725 my ($self) = @_;
1343 1726
1727 $self->SUPER::_draw; # draw background, if applicable
1728
1344 my $tex = $self->{texture} ||= do { 1729 my $size = $self->{texture} ||= do {
1345 $self->{layout}->set_foreground (@{$self->{fg}}); 1730 $self->{layout}->set_foreground (@{$self->{fg}});
1346 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1731 $self->{layout}->set_font ($self->{font}) if $self->{font};
1347 $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});
1348 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1735 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1349 1736
1350 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1737 [$self->{layout}->size]
1351
1352 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1353 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1354 : ($self->{w} - $tex->{w}) * 0.5;
1355
1356 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1357 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1358 : ($self->{h} - $tex->{h}) * 0.5;
1359
1360 $tex
1361 }; 1738 };
1362 1739
1363 glEnable GL_TEXTURE_2D; 1740 unless (exists $self->{ox}) {
1364 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);
1365 1744
1366 if ($tex->{format} == GL_ALPHA) { 1745 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1367 glColor @{$self->{fg}}; 1746 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1368 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1747 : ($self->{h} - $size->[1]) * 0.5);
1369 } else {
1370 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1371 } 1748 };
1372 1749
1373 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});
1374} 1754}
1375 1755
1376############################################################################# 1756#############################################################################
1377 1757
1378package CFClient::UI::EntryBase; 1758package CFClient::UI::EntryBase;
… …
1391 active_fg => [0, 0, 0], 1771 active_fg => [0, 0, 0],
1392 can_hover => 1, 1772 can_hover => 1,
1393 can_focus => 1, 1773 can_focus => 1,
1394 valign => 0, 1774 valign => 0,
1395 can_events => 1, 1775 can_events => 1,
1776 #text => ...
1777 #hidden => "*",
1396 @_ 1778 @_
1397 ) 1779 )
1398} 1780}
1399 1781
1400sub _set_text { 1782sub _set_text {
… …
1402 1784
1403 delete $self->{cur_h}; 1785 delete $self->{cur_h};
1404 1786
1405 return if $self->{text} eq $text; 1787 return if $self->{text} eq $text;
1406 1788
1407 delete $self->{texture};
1408
1409 $self->{last_activity} = $::NOW; 1789 $self->{last_activity} = $::NOW;
1410 $self->{text} = $text; 1790 $self->{text} = $text;
1411 1791
1412 $text =~ s/./*/g if $self->{hidden}; 1792 $text =~ s/./*/g if $self->{hidden};
1413 $self->{layout}->set_text ("$text "); 1793 $self->{layout}->set_text ("$text ");
1794 delete $self->{size_req};
1414 1795
1415 $self->emit (changed => $self->{text}); 1796 $self->emit (changed => $self->{text});
1797
1798 $self->realloc;
1799 $self->update;
1416} 1800}
1417 1801
1418sub set_text { 1802sub set_text {
1419 my ($self, $text) = @_; 1803 my ($self, $text) = @_;
1420 1804
1421 $self->{cursor} = length $text; 1805 $self->{cursor} = length $text;
1422 $self->_set_text ($text); 1806 $self->_set_text ($text);
1423 $self->check_size;
1424 $self->update;
1425} 1807}
1426 1808
1427sub get_text { 1809sub get_text {
1428 $_[0]{text} 1810 $_[0]{text}
1429} 1811}
… …
1434 my ($w, $h) = $self->SUPER::size_request; 1816 my ($w, $h) = $self->SUPER::size_request;
1435 1817
1436 ($w + 1, $h) # add 1 for cursor 1818 ($w + 1, $h) # add 1 for cursor
1437} 1819}
1438 1820
1439sub size_allocate {
1440 my ($self, $w, $h) = @_;
1441
1442 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1443}
1444
1445sub key_down { 1821sub invoke_key_down {
1446 my ($self, $ev) = @_; 1822 my ($self, $ev) = @_;
1447 1823
1448 my $mod = $ev->{mod}; 1824 my $mod = $ev->{mod};
1449 my $sym = $ev->{sym}; 1825 my $sym = $ev->{sym};
1450 my $uni = $ev->{unicode}; 1826 my $uni = $ev->{unicode};
1451 1827
1452 my $text = $self->get_text; 1828 my $text = $self->get_text;
1453 1829
1454 if ($sym == 8) { 1830 if ($uni == 8) {
1455 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1831 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1456 } elsif ($sym == 127) { 1832 } elsif ($uni == 127) {
1457 substr $text, $self->{cursor}, 1, ""; 1833 substr $text, $self->{cursor}, 1, "";
1458 } elsif ($sym == CFClient::SDLK_LEFT) { 1834 } elsif ($sym == CFClient::SDLK_LEFT) {
1459 --$self->{cursor} if $self->{cursor}; 1835 --$self->{cursor} if $self->{cursor};
1460 } elsif ($sym == CFClient::SDLK_RIGHT) { 1836 } elsif ($sym == CFClient::SDLK_RIGHT) {
1461 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1837 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1462 } elsif ($sym == CFClient::SDLK_HOME) { 1838 } elsif ($sym == CFClient::SDLK_HOME) {
1463 $self->{cursor} = 0; 1839 $self->{cursor} = 0;
1464 } elsif ($sym == CFClient::SDLK_END) { 1840 } elsif ($sym == CFClient::SDLK_END) {
1465 $self->{cursor} = length $text; 1841 $self->{cursor} = length $text;
1466 } elsif ($sym == 27) { 1842 } elsif ($uni == 27) {
1467 $self->emit ('escape'); 1843 $self->emit ('escape');
1468 } elsif ($uni) { 1844 } elsif ($uni) {
1469 substr $text, $self->{cursor}++, 0, chr $uni; 1845 substr $text, $self->{cursor}++, 0, chr $uni;
1846 } else {
1847 return 0;
1470 } 1848 }
1471 1849
1472 $self->_set_text ($text); 1850 $self->_set_text ($text);
1473 $self->update;
1474}
1475 1851
1852 $self->realloc;
1853
1854 1
1855}
1856
1476sub focus_in { 1857sub invoke_focus_in {
1477 my ($self) = @_; 1858 my ($self) = @_;
1478 1859
1479 $self->{last_activity} = $::NOW; 1860 $self->{last_activity} = $::NOW;
1480 1861
1481 $self->SUPER::focus_in; 1862 $self->SUPER::invoke_focus_in
1482} 1863}
1483 1864
1484sub button_down { 1865sub invoke_button_down {
1485 my ($self, $ev, $x, $y) = @_; 1866 my ($self, $ev, $x, $y) = @_;
1486 1867
1487 $self->SUPER::button_down ($ev, $x, $y); 1868 $self->SUPER::invoke_button_down ($ev, $x, $y);
1488 1869
1489 my $idx = $self->{layout}->xy_to_index ($x, $y); 1870 my $idx = $self->{layout}->xy_to_index ($x, $y);
1490 1871
1491 # byte-index to char-index 1872 # byte-index to char-index
1492 my $text = $self->{text}; 1873 my $text = $self->{text};
1493 utf8::encode $text; 1874 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1494 $self->{cursor} = length substr $text, 0, $idx; 1875 $self->{cursor} = length $text;
1495 1876
1496 $self->_set_text ($self->{text}); 1877 $self->_set_text ($self->{text});
1497 $self->update; 1878 $self->update;
1879
1880 1
1498} 1881}
1499 1882
1500sub mouse_motion { 1883sub invoke_mouse_motion {
1501 my ($self, $ev, $x, $y) = @_; 1884 my ($self, $ev, $x, $y) = @_;
1502# 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
1503} 1888}
1504 1889
1505sub _draw { 1890sub _draw {
1506 my ($self) = @_; 1891 my ($self) = @_;
1507 1892
1508 local $self->{fg} = $self->{fg}; 1893 local $self->{fg} = $self->{fg};
1509 1894
1510 if ($FOCUS == $self) { 1895 if ($FOCUS == $self) {
1511 glColor @{$self->{active_bg}}; 1896 glColor_premultiply @{$self->{active_bg}};
1512 $self->{fg} = $self->{active_fg}; 1897 $self->{fg} = $self->{active_fg};
1513 } else { 1898 } else {
1514 glColor @{$self->{bg}}; 1899 glColor_premultiply @{$self->{bg}};
1515 } 1900 }
1516 1901
1517 glEnable GL_BLEND; 1902 glEnable GL_BLEND;
1518 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1903 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1519 glBegin GL_QUADS; 1904 glBegin GL_QUADS;
1520 glVertex 0 , 0; 1905 glVertex 0 , 0;
1521 glVertex 0 , $self->{h}; 1906 glVertex 0 , $self->{h};
1522 glVertex $self->{w}, $self->{h}; 1907 glVertex $self->{w}, $self->{h};
1523 glVertex $self->{w}, 0; 1908 glVertex $self->{w}, 0;
… …
1548 1933
1549our @ISA = CFClient::UI::EntryBase::; 1934our @ISA = CFClient::UI::EntryBase::;
1550 1935
1551use CFClient::OpenGL; 1936use CFClient::OpenGL;
1552 1937
1553sub key_down { 1938sub invoke_key_down {
1554 my ($self, $ev) = @_; 1939 my ($self, $ev) = @_;
1555 1940
1556 my $sym = $ev->{sym}; 1941 my $sym = $ev->{sym};
1557 1942
1558 if ($sym == 13) { 1943 if ($sym == 13) {
1559 unshift @{$self->{history}}, 1944 unshift @{$self->{history}},
1560 my $txt = $self->get_text; 1945 my $txt = $self->get_text;
1946
1561 $self->{history_pointer} = -1; 1947 $self->{history_pointer} = -1;
1562 $self->{history_saveback} = ''; 1948 $self->{history_saveback} = '';
1563 $self->emit (activate => $txt); 1949 $self->emit (activate => $txt);
1564 $self->update; 1950 $self->update;
1565 1951
… …
1584 } else { 1970 } else {
1585 $self->set_text ($self->{history_saveback}); 1971 $self->set_text ($self->{history_saveback});
1586 } 1972 }
1587 1973
1588 } else { 1974 } else {
1589 $self->SUPER::key_down ($ev); 1975 return $self->SUPER::invoke_key_down ($ev)
1976 }
1977
1590 } 1978 1
1591
1592} 1979}
1593 1980
1594############################################################################# 1981#############################################################################
1595 1982
1596package CFClient::UI::Button; 1983package CFClient::UI::Button;
… …
1605 1992
1606sub new { 1993sub new {
1607 my $class = shift; 1994 my $class = shift;
1608 1995
1609 $class->SUPER::new ( 1996 $class->SUPER::new (
1610 padding => 4, 1997 padding_x => 4,
1998 padding_y => 4,
1611 fg => [1, 1, 1], 1999 fg => [1, 1, 1],
1612 bg => [1, 1, 1, 0.2],
1613 active_fg => [0, 0, 1], 2000 active_fg => [0, 0, 1],
1614 can_hover => 1, 2001 can_hover => 1,
1615 align => 0, 2002 align => 0,
1616 valign => 0, 2003 valign => 0,
1617 can_events => 1, 2004 can_events => 1,
1618 @_ 2005 @_
1619 ) 2006 )
1620} 2007}
1621 2008
1622sub button_up { 2009sub invoke_button_up {
1623 my ($self, $ev, $x, $y) = @_; 2010 my ($self, $ev, $x, $y) = @_;
1624 2011
2012 $self->emit ("activate")
1625 if ($x >= 0 && $x < $self->{w} 2013 if $x >= 0 && $x < $self->{w}
1626 && $y >= 0 && $y < $self->{h}) { 2014 && $y >= 0 && $y < $self->{h};
1627 $self->emit ("activate"); 2015
1628 } 2016 1
1629} 2017}
1630 2018
1631sub _draw { 2019sub _draw {
1632 my ($self) = @_; 2020 my ($self) = @_;
1633 2021
1634 local $self->{fg} = $self->{fg}; 2022 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1635
1636 if ($GRAB == $self) {
1637 $self->{fg} = $self->{active_fg};
1638 }
1639 2023
1640 glEnable GL_TEXTURE_2D; 2024 glEnable GL_TEXTURE_2D;
1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1642 glColor 0, 0, 0, 1; 2026 glColor 0, 0, 0, 1;
1643 2027
… …
1648 $self->SUPER::_draw; 2032 $self->SUPER::_draw;
1649} 2033}
1650 2034
1651############################################################################# 2035#############################################################################
1652 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
1653package CFClient::UI::CheckBox; 2073package CFClient::UI::CheckBox;
1654 2074
1655our @ISA = CFClient::UI::DrawBG::; 2075our @ISA = CFClient::UI::DrawBG::;
1656 2076
1657my @tex = 2077my @tex =
… …
1662 2082
1663sub new { 2083sub new {
1664 my $class = shift; 2084 my $class = shift;
1665 2085
1666 $class->SUPER::new ( 2086 $class->SUPER::new (
1667 padding => 2, 2087 padding_x => 2,
2088 padding_y => 2,
1668 fg => [1, 1, 1], 2089 fg => [1, 1, 1],
1669 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],
1670 state => 0, 2093 state => 0,
1671 can_hover => 1, 2094 can_hover => 1,
1672 @_ 2095 @_
1673 ) 2096 )
1674} 2097}
1675 2098
1676sub size_request { 2099sub size_request {
1677 my ($self) = @_; 2100 my ($self) = @_;
1678 2101
1679 ($self->{padding} * 2 + 6) x 2 2102 (6) x 2
1680} 2103}
1681 2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
1682sub button_down { 2113sub invoke_button_down {
1683 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
1684 2115
1685 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1686 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1687 $self->{state} = !$self->{state}; 2118 $self->toggle;
1688 $self->emit (changed => $self->{state}); 2119 } else {
2120 return 0
2121 }
2122
1689 } 2123 1
1690} 2124}
1691 2125
1692sub _draw { 2126sub _draw {
1693 my ($self) = @_; 2127 my ($self) = @_;
1694 2128
1695 $self->SUPER::_draw; 2129 $self->SUPER::_draw;
1696 2130
1697 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2131 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1698 2132
1699 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;
1700 2136
1701 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2137 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1702 2138
1703 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2139 my $tex = $self->{state} ? $tex[1] : $tex[0];
1704 2140
… …
1712package CFClient::UI::Image; 2148package CFClient::UI::Image;
1713 2149
1714our @ISA = CFClient::UI::Base::; 2150our @ISA = CFClient::UI::Base::;
1715 2151
1716use CFClient::OpenGL; 2152use CFClient::OpenGL;
1717use Carp qw/confess/;
1718 2153
1719our %loaded_images; 2154our %texture_cache;
1720 2155
1721sub new { 2156sub new {
1722 my $class = shift; 2157 my $class = shift;
1723 2158
1724 my $self = $class->SUPER::new (can_events => 0, @_); 2159 my $self = $class->SUPER::new (
2160 can_events => 0,
2161 @_,
2162 );
1725 2163
1726 $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";
1727 2166
1728 $loaded_images{$self->{image}} ||= 2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1729 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;
1730 2169
1731 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2170 Scalar::Util::weaken $texture_cache{$self->{path}};
1732 2171
1733 Scalar::Util::weaken $loaded_images{$self->{image}}; 2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1734
1735 $self->{aspect} = $tex->{w} / $tex->{h};
1736 2173
1737 $self 2174 $self
1738} 2175}
1739 2176
1740sub size_request { 2177sub size_request {
1741 my ($self) = @_; 2178 my ($self) = @_;
1742 2179
1743 ($self->{tex}->{w}, $self->{tex}->{h}) 2180 ($self->{tex}{w}, $self->{tex}{h})
1744} 2181}
1745 2182
1746sub _draw { 2183sub _draw {
1747 my ($self) = @_; 2184 my ($self) = @_;
1748 2185
… …
1857 my $ycut1 = max 0, min 1, $ycut; 2294 my $ycut1 = max 0, min 1, $ycut;
1858 my $ycut2 = max 0, min 1, $ycut - 1; 2295 my $ycut2 = max 0, min 1, $ycut - 1;
1859 2296
1860 my $h1 = $self->{h} * (1 - $ycut1); 2297 my $h1 = $self->{h} * (1 - $ycut1);
1861 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);
1862 2302
1863 glEnable GL_BLEND; 2303 glEnable GL_BLEND;
1864 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;
1865 glEnable GL_TEXTURE_2D; 2306 glEnable GL_TEXTURE_2D;
1866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2307 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1867 2308
1868 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2309 glBindTexture GL_TEXTURE_2D, $t1->{name};
1869 glBegin GL_QUADS; 2310 glBegin GL_QUADS;
… …
1884 2325
1885 if ($t3) { 2326 if ($t3) {
1886 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2327 glBindTexture GL_TEXTURE_2D, $t3->{name};
1887 glBegin GL_QUADS; 2328 glBegin GL_QUADS;
1888 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2329 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1889 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2330 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1890 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2331 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1891 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2332 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1892 glEnd; 2333 glEnd;
1893 } 2334 }
1894 2335
1895 glDisable GL_BLEND; 2336 glDisable GL_BLEND;
… …
1958 qw(s1_slider.png s1_slider_bg.png); 2399 qw(s1_slider.png s1_slider_bg.png);
1959 2400
1960sub new { 2401sub new {
1961 my $class = shift; 2402 my $class = shift;
1962 2403
1963 # range [value, low, high, page] 2404 # range [value, low, high, page, unit]
1964 2405
1965 # TODO: 0-width page 2406 # TODO: 0-width page
1966 # TODO: req_w/h are wrong with vertical 2407 # TODO: req_w/h are wrong with vertical
1967 # TODO: calculations are off 2408 # TODO: calculations are off
1968 my $self = $class->SUPER::new ( 2409 my $self = $class->SUPER::new (
1969 fg => [1, 1, 1], 2410 fg => [1, 1, 1],
1970 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],
1971 range => [0, 0, 100, 10], 2414 range => [0, 0, 100, 10, 0],
1972 req_w => $::WIDTH / 80, 2415 min_w => $::WIDTH / 80,
1973 req_h => $::WIDTH / 80, 2416 min_h => $::WIDTH / 80,
1974 vertical => 0, 2417 vertical => 0,
1975 can_hover => 1, 2418 can_hover => 1,
1976 inner_pad => 5, 2419 inner_pad => 0.02,
1977 @_ 2420 @_
1978 ); 2421 );
1979 2422
2423 $self->set_value ($self->{range}[0]);
2424 $self->update;
2425
1980 $self 2426 $self
1981} 2427}
1982 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
1983sub size_request { 2463sub size_request {
1984 my ($self) = @_; 2464 my ($self) = @_;
1985 2465
1986 my $w = $self->{req_w}; 2466 ($self->{req_w}, $self->{req_h})
1987 my $h = $self->{req_h};
1988
1989 $self->{vertical} ? ($h, $w) : ($w, $h)
1990} 2467}
1991 2468
1992sub button_down { 2469sub invoke_button_down {
1993 my ($self, $ev, $x, $y) = @_; 2470 my ($self, $ev, $x, $y) = @_;
1994 2471
1995 $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
1996 $self->mouse_motion ($ev, $x, $y); 2476 $self->invoke_mouse_motion ($ev, $x, $y)
1997} 2477}
1998 2478
1999sub mouse_motion { 2479sub invoke_mouse_motion {
2000 my ($self, $ev, $x, $y) = @_; 2480 my ($self, $ev, $x, $y) = @_;
2001 2481
2002 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
2003 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2520 my ($value, $lo, $hi, $page) = @{$self->{range}};
2521 my $range = ($hi - $page - $lo) || 1e-100;
2004 2522
2005 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2523 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2006 2524
2007 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2525 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2008 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2526 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2009 2527
2010 $x -= $inner_pad_px; # substract the padding 2528 $value = ($value - $lo) / $range;
2011 $x = $x * ($hi - $lo) / $inner_w + $lo; 2529 $value = $value * $self->{scale} + $self->{offset};
2012 $x = $lo if $x < $lo;
2013 $x = $hi - $page if $x > $hi - $page;
2014 $self->{range}[0] = $x;
2015 2530
2016 $self->emit (changed => $x); 2531 $self->{knob_x} = $value - $knob_w * 0.5;
2017 $self->update; 2532 $self->{knob_w} = $knob_w;
2018 } 2533 }
2019}
2020
2021# the inner_* stuff is for generating a padding for the slider handle,
2022# so that the handle doesn't leave the texture. This calculation isn't 100%
2023# correct propably, but it does the job for now
2024sub _calc_inner_pad_px {
2025 my ($self, $w) = @_;
2026 ($w / 100) * $self->{inner_pad} # % to pixels
2027}
2028
2029sub _draw {
2030 my ($self) = @_;
2031 2534
2032 $self->SUPER::_draw (); 2535 $self->SUPER::_draw ();
2033 2536
2034 my ($w, $h) = @$self{qw(w h)}; 2537 glScale $self->{w}, $self->{h};
2035 2538
2036 if ($self->{vertical}) { 2539 if ($self->{vertical}) {
2037 # draw a vertical slider like a rotated horizontal slider 2540 # draw a vertical slider like a rotated horizontal slider
2038 2541
2542 glTranslate 1, 0, 0;
2039 glRotate 90, 0, 0, 1; 2543 glRotate 90, 0, 0, 1;
2040 glTranslate 0, -$self->{w}, 0;
2041
2042 ($w, $h) = ($h, $w);
2043 } 2544 }
2044 2545
2045 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2546 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2046 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2547 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2047 2548
2048 my ($value, $lo, $hi, $page) = @{$self->{range}};
2049
2050 $hi = $value + 1 if $lo == $hi;
2051
2052 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2053 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2054
2055 $page = int $page * $inner_w / ($hi - $lo);
2056 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2057
2058 $w -= $page;
2059 $page &= ~1;
2060 glTranslate $page * 0.5, 0, 0;
2061 $page ||= 2;
2062
2063 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2064 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2065
2066 glEnable GL_TEXTURE_2D; 2549 glEnable GL_TEXTURE_2D;
2067 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2550 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2068 2551
2069 # draw background 2552 # draw background
2070 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2553 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2071 2554
2072 # draw handle 2555 # draw handle
2073 $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);
2074 2557
2075 glDisable GL_TEXTURE_2D; 2558 glDisable GL_TEXTURE_2D;
2076} 2559}
2077 2560
2078############################################################################# 2561#############################################################################
2079 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
2080package CFClient::UI::TextView; 2604package CFClient::UI::TextScroller;
2081 2605
2082our @ISA = CFClient::UI::HBox::; 2606our @ISA = CFClient::UI::HBox::;
2083 2607
2084use CFClient::OpenGL; 2608use CFClient::OpenGL;
2085 2609
2086sub new { 2610sub new {
2087 my $class = shift; 2611 my $class = shift;
2088 2612
2089 my $self = $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2090 fontsize => 1, 2614 fontsize => 1,
2091 can_events => 0, 2615 can_events => 1,
2616 indent => 0,
2092 #font => default_font 2617 #font => default_font
2093 @_, 2618 @_,
2094 2619
2095 layout => (new CFClient::Layout 1), 2620 layout => (new CFClient::Layout),
2096 par => [], 2621 par => [],
2097 height => 0, 2622 height => 0,
2098 children => [ 2623 children => [
2099 (new CFClient::UI::Empty expand => 1), 2624 (new CFClient::UI::Empty expand => 1),
2100 (new CFClient::UI::Slider vertical => 1), 2625 (new CFClient::UI::Slider vertical => 1),
… …
2111 2636
2112 $self->{fontsize} = $fontsize; 2637 $self->{fontsize} = $fontsize;
2113 $self->reflow; 2638 $self->reflow;
2114} 2639}
2115 2640
2116sub 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 {
2117 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) = @_;
2118 2679
2119 my $layout = $self->{layout}; 2680 my $layout = $self->{layout};
2120 2681
2682 $layout->set_font ($self->{font}) if $self->{font};
2683 $layout->set_foreground (@{$para->{fg}});
2121 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2684 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2122 $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});
2123 $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}}
2124 2693 );
2125 ($layout->size)[1] 2694
2695 $layout
2126} 2696}
2127 2697
2128sub reflow { 2698sub reflow {
2129 my ($self) = @_; 2699 my ($self) = @_;
2130 2700
2131 $self->{need_reflow}++; 2701 $self->{need_reflow}++;
2132 $self->update; 2702 $self->update;
2133} 2703}
2134 2704
2135sub 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 {
2136 my ($self, $w, $h) = @_; 2713 my ($self) = @_;
2137 2714
2138 $self->SUPER::size_allocate ($w, $h); 2715 my (undef, undef, @other) = @{ $self->{children} };
2716 $self->remove ($_) for @other;
2139 2717
2140 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2718 $self->{par} = [];
2141 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2719 $self->{height} = 0;
2142 $self->{layout}->set_width ($self->{children}[0]{w}); 2720 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2143
2144 $self->reflow;
2145} 2721}
2146 2722
2147sub add_paragraph { 2723sub add_paragraph {
2148 my ($self, $color, $text) = @_; 2724 my ($self, $color, $para, $indent) = @_;
2149 2725
2150 #TODO: intelligently "reformat" paragraph 2726 my ($text, @w) = ref $para ? @$para : $para;
2151 2727
2152 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 };
2153 2736
2154 $self->{height} += $height; 2737 $self->add (@w) if @w;
2738 push @{$self->{par}}, $para;
2155 2739
2156 push @{$self->{par}}, [$height, $color, $text]; 2740 $self->{need_reflow}++;
2741 $self->update;
2742}
2157 2743
2158 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2744sub scroll_to_bottom {
2159 $self->{children}[1]->update; 2745 my ($self) = @_;
2746
2747 $self->{scroll_to_bottom} = 1;
2748 $self->update;
2160} 2749}
2161 2750
2162sub update { 2751sub update {
2163 my ($self) = @_; 2752 my ($self) = @_;
2164 2753
… …
2166 2755
2167 return unless $self->{h} > 0; 2756 return unless $self->{h} > 0;
2168 2757
2169 delete $self->{texture}; 2758 delete $self->{texture};
2170 2759
2171 $ROOT->on_post_alloc ($self, sub { 2760 $ROOT->on_post_alloc ($self => sub {
2761 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2762
2172 if (delete $self->{need_reflow}) { 2763 if (delete $self->{need_reflow}) {
2173 my $height = 0; 2764 my $height = 0;
2174 2765
2175 $height += $_->[0] = $self->text_height ($_->[2])
2176 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 }
2177 2778
2178 $self->{height} = $height; 2779 $self->{height} = $height;
2179 2780
2180 $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]);
2181 2782
2182 delete $self->{texture}; 2783 delete $self->{texture};
2183 } 2784 }
2184 2785
2786 if (delete $self->{scroll_to_bottom}) {
2787 $self->{children}[1]->set_value (1e10);
2788 }
2789
2185 $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 {
2186 glClearColor 0, 0, 0, 0; 2791 glClearColor 0, 0, 0, 0;
2187 glClear GL_COLOR_BUFFER_BIT; 2792 glClear GL_COLOR_BUFFER_BIT;
2188 2793
2189 glEnable GL_TEXTURE_2D;
2190 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2191
2192 my $top = int $self->{children}[1]{range}[0]; 2794 my $top = int $self->{children}[1]{range}[0];
2193 2795
2194 my $y0 = $top; 2796 my $y0 = $top;
2195 my $y1 = $top + $self->{h}; 2797 my $y1 = $top + $H;
2196 2798
2197 my $y = 0; 2799 my $y = 0;
2198 2800
2199 my $layout = $self->{layout};
2200
2201 $layout->set_font ($self->{font}) if $self->{font};
2202
2203 for my $par (@{$self->{par}}) { 2801 for my $para (@{$self->{par}}) {
2204 my $h = $par->[0]; 2802 my $h = $para->{h};
2205 2803
2206 if ($y0 < $y + $h && $y < $y1) { 2804 if ($y0 < $y + $h && $y < $y1) {
2207 $layout->set_foreground (@{ $par->[1] });
2208 $layout->set_markup ($par->[2]);
2209 2805
2210 my ($W, $H) = $layout->size; 2806 my $layout = $self->get_layout ($para);
2211 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 }
2212 } 2822 }
2213 2823
2214 $y += $h; 2824 $y += $h;
2215 } 2825 }
2216
2217 glDisable GL_TEXTURE_2D;
2218 }; 2826 };
2219 }); 2827 });
2220} 2828}
2221 2829
2830sub reconfigure {
2831 my ($self) = @_;
2832
2833 $self->SUPER::reconfigure;
2834
2835 $_->{w} = 1e10 for @{ $self->{par} };
2836 $self->reflow;
2837}
2838
2222sub _draw { 2839sub _draw {
2223 my ($self) = @_; 2840 my ($self) = @_;
2224 2841
2225 glEnable GL_TEXTURE_2D; 2842 glEnable GL_TEXTURE_2D;
2226 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2843 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2227 glColor 1, 1, 1, 1; 2844 glColor 0, 0, 0, 1;
2228 $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});
2229 glDisable GL_TEXTURE_2D; 2846 glDisable GL_TEXTURE_2D;
2230 2847
2231 $self->{children}[1]->draw; 2848 $self->{children}[1]->draw;
2232
2233} 2849}
2234 2850
2235############################################################################# 2851#############################################################################
2236 2852
2237package CFClient::UI::Animator; 2853package CFClient::UI::Animator;
… …
2282 2898
2283sub new { 2899sub new {
2284 my $class = shift; 2900 my $class = shift;
2285 2901
2286 my $self = $class->SUPER::new ( 2902 my $self = $class->SUPER::new (
2287 state => 0, 2903 state => 0,
2288 connect_activate => \&toggle_flopper, 2904 on_activate => \&toggle_flopper,
2289 @_ 2905 @_
2290 ); 2906 );
2291 2907
2292 if ($self->{state}) {
2293 $self->{state} = 0;
2294 $self->toggle_flopper;
2295 }
2296
2297 $self 2908 $self
2298} 2909}
2299 2910
2300sub toggle_flopper { 2911sub toggle_flopper {
2301 my ($self) = @_; 2912 my ($self) = @_;
2302 2913
2303 # TODO: use animation 2914 $self->{other}->toggle_visibility;
2304 if ($self->{state} = !$self->{state}) {
2305 $CFClient::UI::ROOT->add ($self->{other});
2306 $self->{other}->move ($self->coord2global (0, $self->{h}));
2307 $self->emit ("open");
2308 } else {
2309 $CFClient::UI::ROOT->remove ($self->{other});
2310 $self->emit ("close");
2311 }
2312
2313 $self->emit (changed => $self->{state});
2314} 2915}
2315 2916
2316############################################################################# 2917#############################################################################
2317 2918
2318package CFClient::UI::Tooltip; 2919package CFClient::UI::Tooltip;
… …
2331} 2932}
2332 2933
2333sub set_tooltip_from { 2934sub set_tooltip_from {
2334 my ($self, $widget) = @_; 2935 my ($self, $widget) = @_;
2335 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
2336 $self->add (new CFClient::UI::Label 2949 $self->add (new CFClient::UI::Label
2337 markup => $widget->{tooltip}, 2950 markup => $tooltip,
2338 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2951 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2339 fontsize => 0.8, 2952 fontsize => 0.8,
2340 fg => [0, 0, 0, 1], 2953 fg => [0, 0, 0, 1],
2954 ellipsise => 0,
2341 font => ($widget->{tooltip_font} || $::FONT_PROP), 2955 font => ($widget->{tooltip_font} || $::FONT_PROP),
2342 ); 2956 );
2343} 2957}
2344 2958
2345sub size_request { 2959sub size_request {
2346 my ($self) = @_; 2960 my ($self) = @_;
… …
2348 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2349 2963
2350 ($w + 4, $h + 4) 2964 ($w + 4, $h + 4)
2351} 2965}
2352 2966
2353sub size_allocate { 2967sub invoke_size_allocate {
2354 my ($self, $w, $h) = @_; 2968 my ($self, $w, $h) = @_;
2355 2969
2356 $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 });
2357} 2989}
2358 2990
2359sub _draw { 2991sub _draw {
2360 my ($self) = @_; 2992 my ($self) = @_;
2361 2993
… …
2378 glVertex $w, $h; 3010 glVertex $w, $h;
2379 glVertex $w, 0; 3011 glVertex $w, 0;
2380 glEnd; 3012 glEnd;
2381 3013
2382 glTranslate 2 - 0.375, 2 - 0.375; 3014 glTranslate 2 - 0.375, 2 - 0.375;
3015
2383 $self->SUPER::_draw; 3016 $self->SUPER::_draw;
2384} 3017}
2385 3018
2386############################################################################# 3019#############################################################################
2387 3020
… …
2392use CFClient::OpenGL; 3025use CFClient::OpenGL;
2393 3026
2394sub new { 3027sub new {
2395 my $class = shift; 3028 my $class = shift;
2396 3029
2397 $class->SUPER::new ( 3030 my $self = $class->SUPER::new (
2398 aspect => 1, 3031 aspect => 1,
3032 can_events => 0,
2399 @_, 3033 @_,
2400 ) 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
2401} 3051}
2402 3052
2403sub size_request { 3053sub size_request {
2404 (32, 8) 3054 (32, 8)
2405} 3055}
2406 3056
3057sub update {
3058 my ($self) = @_;
3059
3060 return unless $self->{visible};
3061
3062 $self->SUPER::update;
3063}
3064
2407sub _draw { 3065sub _draw {
2408 my ($self) = @_; 3066 my ($self) = @_;
2409 3067
2410 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
2411 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3079 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2412 3080
2413 # TODO animation
2414 if ($tex) { 3081 if ($tex) {
2415 glEnable GL_TEXTURE_2D; 3082 glEnable GL_TEXTURE_2D;
2416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3083 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2417 glColor 1, 1, 1, 1; 3084 glColor 0, 0, 0, 1;
2418 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3085 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2419 glDisable GL_TEXTURE_2D; 3086 glDisable GL_TEXTURE_2D;
2420 } 3087 }
2421} 3088}
2422 3089
3090sub destroy {
3091 my ($self) = @_;
3092
3093 $self->{timer}->cancel
3094 if $self->{timer};
3095
3096 $self->SUPER::destroy;
3097}
3098
2423############################################################################# 3099#############################################################################
2424 3100
2425package CFClient::UI::InventoryItem; 3101package CFClient::UI::Buttonbar;
2426 3102
2427our @ISA = CFClient::UI::HBox::; 3103our @ISA = CFClient::UI::HBox::;
2428 3104
2429sub new { 3105# TODO: should actualyl wrap buttons and other goodies.
2430 my $class = shift;
2431
2432 my %args = @_;
2433
2434 my $item = delete $args{item};
2435
2436 my $desc = $item->{nrof} < 2
2437 ? $item->{name}
2438 : "$item->{nrof} $item->{name_pl}";
2439
2440
2441 my $self = $class->SUPER::new (
2442 can_hover => 1,
2443 can_events => 1,
2444 tooltip => (CFClient::UI::Label->escape ($desc)
2445 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2446 connect_button_down => sub {
2447 my ($self, $ev, $x, $y) = @_;
2448
2449 # todo: maybe put examine on 1? but should just be a tooltip :(
2450 if ($ev->{button} == 1) {
2451 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2452 } elsif ($ev->{button} == 2) {
2453 $::CONN->send ("apply $item->{tag}");
2454 } elsif ($ev->{button} == 3) {
2455 CFClient::UI::Menu->new (
2456 items => [
2457 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2458 [
2459 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2460 sub { $::CONN->send ("lock $item->{tag}") },
2461 ],
2462 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2463 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2464 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2465 ],
2466 )->popup ($ev);
2467 }
2468
2469 1
2470 },
2471 %args
2472 );
2473
2474 $self->add (new CFClient::UI::Face
2475 can_events => 0,
2476 face => $item->{face},
2477 anim => $item->{anim},
2478 animspeed => $item->{animspeed},
2479 );
2480
2481 $self->add (new CFClient::UI::Label
2482 can_events => 0,
2483 text => $desc,
2484 );
2485
2486 $self
2487}
2488
2489#############################################################################
2490
2491package CFClient::UI::Inventory;
2492
2493our @ISA = CFClient::UI::ScrolledWindow::;
2494
2495sub new {
2496 my $class = shift;
2497
2498 my $self = $class->SUPER::new (
2499 scrolled => (new CFClient::UI::VBox),
2500 @_,
2501 );
2502
2503 $self
2504}
2505
2506sub set_items {
2507 my ($self, $items) = @_;
2508
2509 $self->{scrolled}->clear;
2510 return unless $items;
2511
2512 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2513
2514 $self->{real_items} = \@items;
2515
2516 for my $item (@items) {
2517 my $desc = $item->{nrof} < 2
2518 ? $item->{name}
2519 : "$item->{nrof} $item->{name_pl}";
2520
2521 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2522 }
2523
2524# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2525}
2526
2527sub size_request {
2528 my ($self) = @_;
2529 ($self->{req_w}, $self->{req_h});
2530}
2531 3106
2532############################################################################# 3107#############################################################################
2533 3108
2534package CFClient::UI::Menu; 3109package CFClient::UI::Menu;
2535 3110
… …
2547 ); 3122 );
2548 3123
2549 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3124 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2550 3125
2551 for my $item (@{ $self->{items} }) { 3126 for my $item (@{ $self->{items} }) {
2552 my ($widget, $cb) = @$item; 3127 my ($widget, $cb, $tooltip) = @$item;
2553 3128
2554 # handle various types of items, only text for now 3129 # handle various types of items, only text for now
2555 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 {
2556 $widget = new CFClient::UI::Label 3145 $widget = new CFClient::UI::Label
2557 can_hover => 1, 3146 can_hover => 1,
2558 can_events => 1, 3147 can_events => 1,
2559 text => $widget; 3148 markup => $widget,
3149 tooltip => $tooltip;
3150 }
2560 } 3151 }
2561 3152
2562 $self->{item}{$widget} = $item; 3153 $self->{item}{$widget} = $item;
2563 3154
2564 $self->{vbox}->add ($widget); 3155 $self->{vbox}->add ($widget);
… …
2576 # maybe save $GRAB? must be careful about events... 3167 # maybe save $GRAB? must be careful about events...
2577 $GRAB = $self; 3168 $GRAB = $self;
2578 $self->{button} = $ev->{button}; 3169 $self->{button} = $ev->{button};
2579 3170
2580 $self->show; 3171 $self->show;
2581 $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);
2582} 3173}
2583 3174
2584sub mouse_motion { 3175sub invoke_mouse_motion {
2585 my ($self, $ev, $x, $y) = @_; 3176 my ($self, $ev, $x, $y) = @_;
2586 3177
2587 # TODO: should use vbox->find_widget or so 3178 # TODO: should use vbox->find_widget or so
2588 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3179 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2589 $self->{hover} = $self->{item}{$HOVER}; 3180 $self->{hover} = $self->{item}{$HOVER};
2590}
2591 3181
3182 0
3183}
3184
2592sub button_up { 3185sub invoke_button_up {
2593 my ($self, $ev, $x, $y) = @_; 3186 my ($self, $ev, $x, $y) = @_;
2594 3187
2595 if ($ev->{button} == $self->{button}) { 3188 if ($ev->{button} == $self->{button}) {
2596 undef $GRAB; 3189 undef $GRAB;
2597 $self->hide; 3190 $self->hide;
2598 3191
2599 $self->emit ("popdown"); 3192 $self->emit ("popdown");
2600 $self->{hover}[1]->() if $self->{hover}; 3193 $self->{hover}[1]->() if $self->{hover};
3194 } else {
3195 return 0
3196 }
3197
2601 } 3198 1
2602} 3199}
2603 3200
2604############################################################################# 3201#############################################################################
2605 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
2606package CFClient::UI::Statusbox; 3381package CFClient::UI::Statusbox;
2607 3382
2608our @ISA = CFClient::UI::VBox::; 3383our @ISA = CFClient::UI::VBox::;
2609 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
2610sub reorder { 3400sub reorder {
2611 my ($self) = @_; 3401 my ($self) = @_;
2612 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} };
2613 3408
2614 while (my ($k, $v) = each %{ $self->{item} }) { 3409 while (my ($k, $v) = each %{ $self->{item} }) {
2615 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3410 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2616 } 3411 }
2617 3412
… …
2620 my @items = sort { 3415 my @items = sort {
2621 $a->{pri} <=> $b->{pri} 3416 $a->{pri} <=> $b->{pri}
2622 or $b->{id} <=> $a->{id} 3417 or $b->{id} <=> $a->{id}
2623 } values %{ $self->{item} }; 3418 } values %{ $self->{item} };
2624 3419
3420 $self->{timer}->interval (1);
3421
2625 my $count = 10 + 1; 3422 my $count = 10 + 1;
2626 for my $item (@items) { 3423 for my $item (@items) {
2627 last unless --$count; 3424 last unless --$count;
2628 3425
2629 push @widgets, $item->{label} ||= do { 3426 my $label = $item->{label} ||= do {
2630 # TODO: doesn't handle markup well (read as: at all) 3427 # TODO: doesn't handle markup well (read as: at all)
2631 my $short = $item->{count} > 1 3428 my $short = $item->{count} > 1
2632 ? "<b>$item->{count} ×</b> $item->{text}" 3429 ? "<b>$item->{count} ×</b> $item->{text}"
2633 : $item->{text}; 3430 : $item->{text};
2634 3431
2635 for ($short) { 3432 for ($short) {
2636 s/^\s+//; 3433 s/^\s+//;
2637 s/\012.*/…/s; 3434 s/\s+/ /g;
2638 my $len = int 40 / $item->{fontsize};
2639 substr $_, $len, length, "…" if $len < length;
2640 } 3435 }
2641 3436
2642 new CFClient::UI::Label 3437 new CFClient::UI::Label
2643 markup => $short, 3438 markup => $short,
2644 tooltip => $item->{tooltip}, 3439 tooltip => $item->{tooltip},
2645 tooltip_font => $::FONT_PROP, 3440 tooltip_font => $::FONT_PROP,
2646 tooltip_width => 0.67, 3441 tooltip_width => 0.67,
2647 fontsize => $item->{fontsize}, 3442 fontsize => $item->{fontsize} || $self->{fontsize},
2648 color => $item->{color}, 3443 max_w => $::WIDTH * 0.44,
3444 fg => [@{ $item->{fg} }],
2649 can_events => 1, 3445 can_events => 1,
2650 can_hover => 1 3446 can_hover => 1
2651 }; 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;
2652 } 3460 }
2653 3461
2654 $self->clear; 3462 $self->clear;
2655 $self->SUPER::add (reverse @widgets); 3463 $self->SUPER::add (reverse @widgets);
2656} 3464}
… …
2659 my ($self, $text, %arg) = @_; 3467 my ($self, $text, %arg) = @_;
2660 3468
2661 $text =~ s/^\s+//; 3469 $text =~ s/^\s+//;
2662 $text =~ s/\s+$//; 3470 $text =~ s/\s+$//;
2663 3471
3472 return unless $text;
3473
2664 my $timeout = time + ((delete $arg{timeout}) || 60); 3474 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2665 3475
2666 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3476 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2667 3477
2668 if (my $item = $self->{item}{$group}) { 3478 if (my $item = $self->{item}{$group}) {
2669 if ($item->{text} eq $text) { 3479 if ($item->{text} eq $text) {
2670 $item->{count}++; 3480 $item->{count}++;
2671 } else { 3481 } else {
2672 $item->{count} = 1; 3482 $item->{count} = 1;
2673 $item->{text} = $item->{tooltip} = $text; 3483 $item->{text} = $item->{tooltip} = $text;
2674 } 3484 }
2675 $item->{id} = ++$self->{id}; 3485 $item->{id} += 0.2;#d#
2676 $item->{timeout} = $timeout; 3486 $item->{timeout} = $timeout;
2677 delete $item->{label}; 3487 delete $item->{label};
2678 } else { 3488 } else {
2679 $self->{item}{$group} = { 3489 $self->{item}{$group} = {
2680 id => ++$self->{id}, 3490 id => ++$self->{id},
2681 text => $text, 3491 text => $text,
2682 timeout => $timeout, 3492 timeout => $timeout,
2683 tooltip => $text, 3493 tooltip => $text,
2684 fontsize => 0.8,
2685 color => [0.8, 0.8, 0.8, 0.8], 3494 fg => [0.8, 0.8, 0.8, 0.8],
2686 pri => 0, 3495 pri => 0,
2687 count => 1, 3496 count => 1,
2688 %arg, 3497 %arg,
2689 }; 3498 };
2690 } 3499 }
2691 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
2692 $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;
2693} 3522}
2694 3523
2695############################################################################# 3524#############################################################################
2696 3525
2697package CFClient::UI::Root; 3526package CFClient::UI::Inventory;
2698 3527
2699our @ISA = CFClient::UI::Container::; 3528our @ISA = CFClient::UI::Table::;
2700
2701use CFClient::OpenGL;
2702 3529
2703sub new { 3530sub new {
2704 my $class = shift; 3531 my $class = shift;
2705 3532
2706 $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 => [],
2707 @_, 3578 @_,
2708 ) 3579 )
2709} 3580}
2710 3581
2711sub configure { 3582my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2712 my ($self, $x, $y, $w, $h) = @_;
2713 3583
2714 $self->{w} = $w; 3584my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2715 $self->{h} = $h; 3585 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2716} 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");
2717 3594
2718sub 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 {
2719 my ($self) = @_; 3668 my ($self, $spell) = @_;
2720 3669
2721 $self->size_allocate ($self->{w}, $self->{h}) 3670 $self->{spell}->{$spell->{name}} = $spell;
2722 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
2723} 3709}
2724 3710
2725sub size_request { 3711sub size_request {
2726 my ($self) = @_; 3712 my ($self) = @_;
2727 3713
2728 ($self->{w}, $self->{h}) 3714 ($self->{w}, $self->{h})
2729} 3715}
2730 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
2731sub size_allocate { 3731sub invoke_size_allocate {
2732 my ($self, $w, $h) = @_; 3732 my ($self, $w, $h) = @_;
2733
2734 my $old_w = $self->{old_w};
2735 my $old_h = $self->{old_h};
2736
2737 if ($old_w && $old_h) {
2738 for my $child ($self->children) {
2739 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2740 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2741 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2742 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2743 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2744 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2745 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2746 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2747 }
2748 }
2749 3733
2750 for my $child ($self->children) { 3734 for my $child ($self->children) {
2751 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)};
2752 3736
2753 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3737 $X = $child->{force_x} if exists $child->{force_x};
2754 $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
2755 $child->configure ($X, $Y, $W, $H); 3743 $child->configure ($X, $Y, $W, $H);
2756 } 3744 }
2757 3745
2758 $self->{old_w} = $w; 3746 1
2759 $self->{old_h} = $h;
2760} 3747}
2761 3748
2762sub coord2local { 3749sub coord2local {
2763 my ($self, $x, $y) = @_; 3750 my ($self, $x, $y) = @_;
2764 3751
… …
2772} 3759}
2773 3760
2774sub update { 3761sub update {
2775 my ($self) = @_; 3762 my ($self) = @_;
2776 3763
2777 $self->check_size;
2778 $::WANT_REFRESH++; 3764 $::WANT_REFRESH++;
2779} 3765}
2780 3766
2781sub add { 3767sub add {
2782 my ($self, $child) = @_; 3768 my ($self, @children) = @_;
2783 3769
2784 # integerise window positions 3770 $_->{is_toplevel} = 1
2785 $child->{x} = int $child->{x}; 3771 for @children;
2786 $child->{y} = int $child->{y};
2787 3772
2788 $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 }
2789} 3789}
2790 3790
2791sub on_refresh { 3791sub on_refresh {
2792 my ($self, $id, $cb) = @_; 3792 my ($self, $id, $cb) = @_;
2793 3793
… …
2806 while ($self->{refresh_hook}) { 3806 while ($self->{refresh_hook}) {
2807 $_->() 3807 $_->()
2808 for values %{delete $self->{refresh_hook}}; 3808 for values %{delete $self->{refresh_hook}};
2809 } 3809 }
2810 3810
2811 if ($self->{check_size}) { 3811 if ($self->{realloc}) {
2812 my @queue = ([], []); 3812 my %queue;
3813 my @queue;
3814 my $widget;
2813 3815
2814 for (;;) { 3816 outer:
2815 if ($self->{check_size}) { 3817 while () {
2816 # heuristic: check containers last 3818 if (my $realloc = delete $self->{realloc}) {
2817 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3819 for $widget (values %$realloc) {
2818 for values %{delete $self->{check_size}} 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 }
2819 } 3826 }
2820 3827
2821 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3828 while () {
3829 @queue or last outer;
2822 3830
2823 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3831 $widget = pop @{ $queue[-1] || [] }
2824 ? @$widget{qw(user_w user_h)} 3832 and last;
2825 : $widget->size_request;
2826
2827 if (delete $widget->{force_alloc}
2828 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2829 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2830 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}) {
2831 $widget->{req_w} = $w; 3852 $widget->{req_w} = $w;
2832 $widget->{req_h} = $h; 3853 $widget->{req_h} = $h;
2833 3854
2834 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3855 $self->{size_alloc}{$widget+0} = $widget;
2835 3856
2836 $widget->{parent}->check_size
2837 if $widget->{parent}; 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 }
2838 } 3864 }
3865
3866 delete $self->{realloc}{$widget+0};
2839 } 3867 }
2840 } 3868 }
2841 3869
2842 while ($self->{size_alloc}) { 3870 while (my $size_alloc = delete $self->{size_alloc}) {
2843 for (values %{delete $self->{size_alloc}}) { 3871 my @queue = sort { $b->{visible} <=> $a->{visible} }
2844 my ($widget, $w, $h) = @$_; 3872 values %$size_alloc;
3873
3874 while () {
3875 my $widget = pop @queue || last;
3876
3877 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2845 3878
2846 $w = 0 if $w < 0; 3879 $w = 0 if $w < 0;
2847 $h = 0 if $h < 0; 3880 $h = 0 if $h < 0;
2848 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
2849 $widget->{w} = $w; 3895 $widget->{w} = $w;
2850 $widget->{h} = $h; 3896 $widget->{h} = $h;
2851 $widget->size_allocate ($w, $h); 3897
2852 $widget->emit (size_allocate => $w, $h); 3898 $widget->emit (size_allocate => $w, $h);
3899 }
2853 } 3900 }
2854 } 3901 }
2855 3902
2856 while ($self->{post_alloc_hook}) { 3903 while ($self->{post_alloc_hook}) {
2857 $_->() 3904 $_->()
2858 for values %{delete $self->{post_alloc_hook}}; 3905 for values %{delete $self->{post_alloc_hook}};
2859 } 3906 }
2860 3907
3908
2861 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3909 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2862 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3910 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2863 glClear GL_COLOR_BUFFER_BIT; 3911 glClear GL_COLOR_BUFFER_BIT;
2864 3912
2865 glMatrixMode GL_PROJECTION; 3913 glMatrixMode GL_PROJECTION;
2866 glLoadIdentity; 3914 glLoadIdentity;
2867 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3915 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2868 glMatrixMode GL_MODELVIEW; 3916 glMatrixMode GL_MODELVIEW;
2869 glLoadIdentity; 3917 glLoadIdentity;
2870 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
2871 $self->_draw; 3926 $self->_draw;
2872} 3927}
2873 3928
2874############################################################################# 3929#############################################################################
2875 3930
2876package CFClient::UI; 3931package CFClient::UI;
2877 3932
2878$ROOT = new CFClient::UI::Root; 3933$ROOT = new CFClient::UI::Root;
2879$TOOLTIP = new CFClient::UI::Tooltip; 3934$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2880 3935
28811 39361
2882 3937

Diff Legend

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