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

Diff Legend

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