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.155 by root, Sun Apr 23 02:22:54 2006 UTC vs.
Revision 1.356 by root, Wed Dec 6 00:15:12 2006 UTC

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

Diff Legend

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