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.208 by root, Mon May 15 22:52:17 2006 UTC vs.
Revision 1.367 by root, Fri Apr 27 00:59:14 2007 UTC

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

Diff Legend

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