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.196 by root, Fri May 12 00:16:34 2006 UTC vs.
Revision 1.344 by root, Sun Aug 13 16:29:36 2006 UTC

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

Diff Legend

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