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

Diff Legend

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