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.179 by elmex, Fri Apr 28 05:17:21 2006 UTC vs.
Revision 1.434 by root, Wed Aug 22 21:32:09 2007 UTC

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

Diff Legend

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