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

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

Diff Legend

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