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

Diff Legend

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