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

Diff Legend

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