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.200 by root, Sat May 13 00:27:09 2006 UTC vs.
Revision 1.351 by root, Sun Oct 1 12:08:58 2006 UTC

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

Diff Legend

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