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

Diff Legend

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