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.190 by root, Mon May 8 22:17:38 2006 UTC vs.
Revision 1.362 by root, Sat Dec 9 21:26:46 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines