ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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