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.185 by root, Mon May 8 17:23:08 2006 UTC vs.
Revision 1.426 by root, Sat Aug 11 12:07:54 2007 UTC

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

Diff Legend

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