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.60 by root, Tue Apr 11 13:14:36 2006 UTC vs.
Revision 1.97 by root, Fri Apr 14 02:03:11 2006 UTC

1package CFClient::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6 6use List::Util ();
7use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9 7
10use CFClient; 8use CFClient;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
… …
45 43
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47 45
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49 47
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51 49
52 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab; 52 $grab->update if $grab;
55 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
70 } 68 }
71 69
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73} 71}
74 72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
78
79use SDL::OpenGL;
80
75sub new { 81sub new {
76 my $class = shift; 82 my $class = shift;
77 83
78 bless { @_ }, $class 84 my $self = bless {
85 x => 0,
86 y => 0,
87 z => 0,
88 w => -1,
89 h => -1,
90 @_
91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
79} 100}
80 101
81sub move { 102sub move {
82 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
83 $self->{x} = $x; 104 $self->{x} = $x;
… …
92sub size_request { 113sub size_request {
93 require Carp; 114 require Carp;
94 Carp::confess "size_request is abtract"; 115 Carp::confess "size_request is abtract";
95} 116}
96 117
118sub _size_allocate {
119 my ($self, $x, $y, $w, $h) = @_;
120
121 $self->{x} = int $x;
122 $self->{y} = int $y;
123
124 return unless $self->{w} != $w || $self->{h} != $h;
125
126 $self->{w} = int $w;
127 $self->{h} = int $h;
128
129 1
130}
131
97sub size_allocate { 132sub size_allocate {
98 my ($self, $w, $h) = @_; 133 my ($self, $x, $y, $w, $h) = @_;
99 134
100 $self->{w} = $w; 135 $self->_size_allocate ($x, $y, $w, $h);
101 $self->{h} = $h;
102} 136}
103 137
104# translate global koordinates to local coordinate system 138# translate global coordinates to local coordinate system
105sub translate { 139sub translate {
106 my ($self, $x, $y) = @_; 140 my ($self, $x, $y) = @_;
107 141
108 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
109} 143}
110 144
111sub focus_in { 145sub focus_in {
112 my ($self) = @_; 146 my ($self) = @_;
147
148 return if $FOCUS == $self;
149 return unless $self->{can_focus};
113 150
114 my $focus = $FOCUS; $FOCUS = $self; 151 my $focus = $FOCUS; $FOCUS = $self;
115 $focus->update if $focus; 152 $focus->update if $focus;
116 $FOCUS->update; 153 $FOCUS->update;
117} 154}
… …
125 $focus->update if $focus; #? 162 $focus->update if $focus; #?
126} 163}
127 164
128sub mouse_motion { } 165sub mouse_motion { }
129sub button_up { } 166sub button_up { }
130sub button_down { }
131sub key_down { } 167sub key_down { }
132sub key_up { } 168sub key_up { }
169
170sub button_down {
171 my ($self, $ev, $x, $y) = @_;
172
173 $self->focus_in;
174}
133 175
134sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 176sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
135sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 177sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
136sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 178sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
137sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 179sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
138sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 180sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
139 181
140sub draw { 182sub draw {
141 my ($self) = @_; 183 my ($self) = @_;
142 184
185 return unless $self->{h} && $self->{w};
186
143 glPushMatrix; 187 glPushMatrix;
144 glTranslate $self->{x}, $self->{y}, 0; 188 glTranslate $self->{x}, $self->{y}, 0;
145 $self->_draw; 189 $self->_draw;
146 if ($self == $HOVER) { 190 glPopMatrix;
147 glColor 1, 1, 1, 0.4; 191
192 if ($self == $HOVER && $self->{can_hover}) {
193 my ($x, $y) = @$self{qw(x y)};
194
195 glColor 0, 0, 1, 0.2;
148 glEnable GL_BLEND; 196 glEnable GL_BLEND;
197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
149 glBegin GL_QUADS; 198 glBegin GL_QUADS;
150 glVertex 0 , 0; 199 glVertex $x , $y;
151 glVertex $self->{w}, 0; 200 glVertex $x + $self->{w}, $y;
152 glVertex $self->{w}, $self->{h}; 201 glVertex $x + $self->{w}, $y + $self->{h};
153 glVertex 0 , $self->{h}; 202 glVertex $x , $y + $self->{h};
154 glEnd; 203 glEnd;
155 glDisable GL_BLEND; 204 glDisable GL_BLEND;
156 } 205 }
157 glPopMatrix;
158} 206}
159 207
160sub _draw { 208sub _draw {
161 my ($self) = @_; 209 my ($self) = @_;
162 210
163 warn "no draw defined for $self\n"; 211 warn "no draw defined for $self\n";
164}
165
166sub bbox {
167 my ($self) = @_;
168 my ($w, $h) = $self->size_request;
169 (
170 $self->{x},
171 $self->{y},
172 $self->{x} = $w,
173 $self->{y} = $h
174 )
175} 212}
176 213
177sub find_widget { 214sub find_widget {
178 my ($self, $x, $y) = @_; 215 my ($self, $x, $y) = @_;
179 216
… …
182 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 219 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
183 220
184 () 221 ()
185} 222}
186 223
187sub del_parent { $_[0]->{parent} = undef }
188
189sub set_parent { 224sub set_parent {
190 my ($self, $par) = @_; 225 my ($self, $par) = @_;
191 226
192 $self->{parent} = $par; 227 $self->{parent} = $par;
193 Scalar::Util::weaken $self->{parent}; 228 Scalar::Util::weaken $self->{parent};
… …
202 237
203 $self->{parent}->update 238 $self->{parent}->update
204 if $self->{parent}; 239 if $self->{parent};
205} 240}
206 241
242sub connect {
243 my ($self, $signal, $cb) = @_;
244
245 push @{ $self->{cb}{$signal} }, $cb;
246}
247
248sub emit {
249 my ($self, $signal, @args) = @_;
250
251 $_->($self, @args)
252 for @{$self->{cb}{$signal} || []};
253}
254
207sub DESTROY { 255sub DESTROY {
208 my ($self) = @_; 256 my ($self) = @_;
209 257
210 #$self->deactivate; 258 #$self->deactivate;
211} 259}
212 260
213############################################################################# 261#############################################################################
214 262
215package CFClient::Widget::Container; 263package CFClient::UI::DrawBG;
216 264
217our @ISA = CFClient::Widget::; 265our @ISA = CFClient::UI::Base::;
266
267use strict;
268use SDL::OpenGL;
218 269
219sub new { 270sub new {
271 my $class = shift;
272
273 # range [value, low, high, page]
274
275 $class->SUPER::new (
276 bg => [0, 0, 0, 0.2],
277 active_bg => [1, 1, 1, 0.5],
278 @_
279 )
280}
281
282sub _draw {
283 my ($self) = @_;
284
285 my ($w, $h) = @$self{qw(w h)};
286
287 glEnable GL_BLEND;
288 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
289 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
290
291 glBegin GL_QUADS;
292 glVertex 0 , 0;
293 glVertex 0 , $h;
294 glVertex $w, $h;
295 glVertex $w, 0;
296 glEnd;
297
298 glDisable GL_BLEND;
299}
300
301#############################################################################
302
303package CFClient::UI::Empty;
304
305our @ISA = CFClient::UI::Base::;
306
307sub size_request {
308 (0, 0)
309}
310
311sub draw { }
312
313#############################################################################
314
315package CFClient::UI::Container;
316
317our @ISA = CFClient::UI::Base::;
318
319sub new {
220 my ($class, @widgets) = @_; 320 my ($class, %arg) = @_;
221 321
322 my $children = delete $arg{children} || [];
323
222 my $self = $class->SUPER::new (children => []); 324 my $self = $class->SUPER::new (children => [], %arg);
223 $self->add ($_) for @widgets; 325 $self->add ($_) for @$children;
224 326
225 $self 327 $self
226} 328}
227 329
228sub add { 330sub add {
229 my ($self, $chld, $expand) = @_; 331 my ($self, $chld) = @_;
230 332
231 $chld->{expand} = $expand;
232 $chld->set_parent ($self); 333 $chld->set_parent ($self);
233 334
234 @{$self->{children}} = 335 $self->{children} = [
235 sort { $a->{z} <=> $b->{z} } 336 sort { $a->{z} <=> $b->{z} }
236 @{$self->{children}}, $chld; 337 @{$self->{children}}, $chld
338 ];
237 339
238 $self->size_allocate ($self->{w}, $self->{h}) 340 $self->{w} = $self->{h} = -1;
239 if $self->{w}; #TODO: check for "realised state" 341 $self->update;
240} 342}
241 343
242sub remove { 344sub remove {
243 my ($self, $widget) = @_; 345 my ($self, $widget) = @_;
244 346
245 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
246 348
247 $self->size_allocate ($self->{w}, $self->{h}); 349 $self->size_allocate (0, 0, $self->{w}, $self->{h});
248} 350}
249 351
250sub find_widget { 352sub find_widget {
251 my ($self, $x, $y) = @_; 353 my ($self, $x, $y) = @_;
252 354
… …
269 $_->draw for @{$self->{children}}; 371 $_->draw for @{$self->{children}};
270} 372}
271 373
272############################################################################# 374#############################################################################
273 375
274package CFClient::Widget::Bin; 376package CFClient::UI::Bin;
275 377
276our @ISA = CFClient::Widget::Container::; 378our @ISA = CFClient::UI::Container::;
379
380sub new {
381 my ($class, %arg) = @_;
382
383 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
384
385 $class->SUPER::new (children => [$child], %arg)
386}
387
388sub add {
389 my ($self, $widget) = @_;
390
391 $self->{children} = [];
392
393 $self->SUPER::add ($widget);
394}
395
396sub remove {
397 my ($self, $widget) = @_;
398
399 $self->SUPER::remove ($widget);
400
401 $self->{children} = [new CFClient::UI::Empty]
402 unless @{$self->{children}};
403}
277 404
278sub child { $_[0]->{children}[0] } 405sub child { $_[0]->{children}[0] }
279 406
280sub size_request { 407sub size_request {
281 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 408 $_[0]{children}[0]->size_request
282} 409}
283 410
284sub size_allocate { 411sub size_allocate {
285 my ($self, $w, $h) = @_; 412 my ($self, $x, $y, $w, $h) = @_;
286 413
287 $self->SUPER::size_allocate ($w, $h); 414 $self->_size_allocate ($x, $y, $w, $h) or return;
415
288 $self->{children}[0]->size_allocate ($w, $h) 416 $self->{children}[0]->size_allocate (0, 0, $w, $h);
289 if $self->{children}[0]
290} 417}
291 418
292############################################################################# 419#############################################################################
293 420
294package CFClient::Widget::Window; 421package CFClient::UI::Window;
295 422
296our @ISA = CFClient::Widget::Bin::; 423our @ISA = CFClient::UI::Bin::;
297 424
298use SDL::OpenGL; 425use SDL::OpenGL;
299 426
300sub new { 427sub new {
301 my ($class, $x, $y, $z, $w, $h) = @_; 428 my ($class, %arg) = @_;
302 429
303 my $self = $class->SUPER::new; 430 my $self = $class->SUPER::new (%arg);
304
305 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
306} 431}
307 432
308sub update { 433sub update {
309 my ($self) = @_; 434 my ($self) = @_;
310 435
436 # we want to do this delayed...
311 $self->render_chld; 437 $self->render_chld;
312 $self->SUPER::update; 438 $self->SUPER::update;
313} 439}
314 440
315sub render_chld { 441sub render_chld {
… …
320 $self->{w}, $self->{h}, sub { $self->child->draw } 446 $self->{w}, $self->{h}, sub { $self->child->draw }
321 ); 447 );
322} 448}
323 449
324sub size_allocate { 450sub size_allocate {
325 my ($self, $w, $h) = @_; 451 my ($self, $x, $y, $w, $h) = @_;
326 452
327 $self->{w} = $w; 453 $self->_size_allocate ($x, $y, $w, $h) or return;
328 $self->{h} = $h;
329 454
330 $self->child->size_allocate ($w, $h); 455 $self->child->size_allocate (0, 0, $w, $h);
331 456
332 $self->render_chld; 457 $self->render_chld;
333} 458}
334 459
335sub _draw { 460sub _draw {
… …
339 464
340 my $tex = $self->{texture} 465 my $tex = $self->{texture}
341 or return; 466 or return;
342 467
343 glEnable GL_BLEND; 468 glEnable GL_BLEND;
469 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
344 glEnable GL_TEXTURE_2D; 470 glEnable GL_TEXTURE_2D;
345 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
346 472
347 $tex->draw_quad (0, 0, $w, $h); 473 $tex->draw_quad (0, 0, $w, $h);
348 474
… …
350 glDisable GL_TEXTURE_2D; 476 glDisable GL_TEXTURE_2D;
351} 477}
352 478
353############################################################################# 479#############################################################################
354 480
355package CFClient::Widget::Frame; 481package CFClient::UI::Frame;
356 482
357our @ISA = CFClient::Widget::Bin::; 483our @ISA = CFClient::UI::Bin::;
358 484
359use SDL::OpenGL; 485use SDL::OpenGL;
360 486
361sub size_request { 487sub size_request {
362 my ($self) = @_; 488 my ($self) = @_;
… …
367 493
368 map { $_ + 4 } $chld->size_request; 494 map { $_ + 4 } $chld->size_request;
369} 495}
370 496
371sub size_allocate { 497sub size_allocate {
372 my ($self, $w, $h) = @_; 498 my ($self, $x, $y, $w, $h) = @_;
373 499
374 $self->{w} = $w; 500 $self->_size_allocate ($x, $y, $w, $h) or return;
375 $self->{h} = $h;
376 501
377 $self->child->size_allocate ($w - 4, $h - 4); 502 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
378 $self->child->move (2, 2);
379} 503}
380 504
381sub _draw { 505sub _draw {
382 my ($self) = @_; 506 my ($self) = @_;
383 507
… …
396 $chld->draw; 520 $chld->draw;
397} 521}
398 522
399############################################################################# 523#############################################################################
400 524
401package CFClient::Widget::FancyFrame; 525package CFClient::UI::FancyFrame;
402 526
403our @ISA = CFClient::Widget::Bin::; 527our @ISA = CFClient::UI::Bin::;
404 528
405use SDL::OpenGL; 529use SDL::OpenGL;
406 530
407my @tex = 531my @tex =
408 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
409 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 533 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
410 534
535sub new {
536 my $class = shift;
537
538 # TODO: user_x, user_y, overwrite moveto?
539
540 $class->SUPER::new (
541 bg => [1, 1, 1, 1],
542 border_bg => [1, 1, 1, 1],
543 border => $::FONTSIZE * 0.8,
544 @_
545 )
546}
547
411sub size_request { 548sub size_request {
412 my ($self) = @_; 549 my ($self) = @_;
413 550
551 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
552
414 my ($w, $h) = $self->SUPER::size_request; 553 my ($w, $h) = $self->SUPER::size_request;
415 554
416 $h += $tex[1]->{height}; 555 (
417 $h += $tex[4]->{height}; 556 $w + $self->{border} * 2,
418 $w += $tex[2]->{width}; 557 $h + $self->{border} * 2,
419 $w += $tex[3]->{width}; 558 )
420
421 ($w, $h)
422} 559}
423 560
424sub size_allocate { 561sub size_allocate {
425 my ($self, $w, $h) = @_; 562 my ($self, $x, $y, $w, $h) = @_;
426 563
427 $self->SUPER::size_allocate ($w, $h); 564 $self->_size_allocate ($x, $y, $w, $h) or return;
428 565
429 $h -= $tex[1]->{height}; 566 $h -= List::Util::max 0, $self->{border} * 2;
430 $h -= $tex[4]->{height}; 567 $w -= List::Util::max 0, $self->{border} * 2;
431 $w -= $tex[2]->{width};
432 $w -= $tex[3]->{width};
433 568
434 $h = $h < 0 ? 0 : $h; 569 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
435 $w = $w < 0 ? 0 : $w; 570}
436 571
437 $self->child->size_allocate ($w, $h); 572sub button_down {
438 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 573 my ($self, $ev, $x, $y) = @_;
574
575 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
576 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
577
578 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
579 my ($bw, $bh) = ($self->{w}, $self->{h});
580
581 $self->{motion} = sub {
582 my ($ev, $x, $y) = @_;
583
584 ($x, $y) = ($ev->motion_x, $ev->motion_y);
585
586 $self->{user_w} = $bw + $x - $ox;
587 $self->{user_h} = $bh + $y - $oy;
588 $self->update;
589 };
590
591 } elsif ($x >= 0 && $x < $self->{w}
592 && $y >= 0 && $y < $self->{border}) {
593
594 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
595 my ($bx, $by) = ($self->{x}, $self->{y});
596
597 $self->{motion} = sub {
598 my ($ev, $x, $y) = @_;
599
600 ($x, $y) = ($ev->motion_x, $ev->motion_y);
601
602 $self->move ($bx + $x - $ox, $by + $y - $oy);
603 $self->update;
604 };
605 }
606}
607
608sub button_up {
609 my ($self, $ev, $x, $y) = @_;
610
611 delete $self->{motion};
612}
613
614sub mouse_motion {
615 my ($self, $ev, $x, $y) = @_;
616
617 $self->{motion}->($ev, $x, $y) if $self->{motion};
439} 618}
440 619
441sub _draw { 620sub _draw {
442 my ($self) = @_; 621 my ($self) = @_;
443 622
444 my ($w, $h) = ($self->{w}, $self->{h}); 623 my ($w, $h ) = ($self->{w}, $self->{h});
445 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 624 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
446 625
447 glEnable GL_BLEND; 626 glEnable GL_BLEND;
627 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
448 glEnable GL_TEXTURE_2D; 628 glEnable GL_TEXTURE_2D;
449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
451 630
452 my $top = $tex[1]; 631 glColor @{ $self->{border_bg} };
453 $top->draw_quad (0, 0, $w, $top->{height}); 632 $tex[1]->draw_quad (0, 0, $w, $self->{border});
454 633 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
455 my $left = $tex[3]; 634 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
456 $left->draw_quad (0, $top->{height}, $left->{width}, $ch); 635 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
457
458 my $right = $tex[2];
459 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
460
461 my $bottom = $tex[4];
462 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
463 636
464 my $bg = $tex[0]; 637 my $bg = $tex[0];
465 glBindTexture GL_TEXTURE_2D, $bg->{name};
466 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
467 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
468 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
469 638
639 # TODO: repeat texture not scale
470 my $rep_x = $cw / $bg->{width}; 640 my $rep_x = $cw / $bg->{w};
471 my $rep_y = $ch / $bg->{height}; 641 my $rep_y = $ch / $bg->{h};
472 642
643 glColor @{ $self->{bg} };
473 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); 644 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
474 645
646 glDisable GL_TEXTURE_2D;
475 glDisable GL_BLEND; 647 glDisable GL_BLEND;
476 glDisable GL_TEXTURE_2D;
477 648
478 $self->child->draw; 649 $self->child->draw;
479
480} 650}
481 651
482############################################################################# 652#############################################################################
483 653
484package CFClient::Widget::Table; 654package CFClient::UI::Table;
485 655
486our @ISA = CFClient::Widget::Bin::; 656our @ISA = CFClient::UI::Base::;
657
658use List::Util qw(max sum);
487 659
488use SDL::OpenGL; 660use SDL::OpenGL;
661
662sub new {
663 my $class = shift;
664
665 $class->SUPER::new (
666 col_expand => [],
667 @_
668 )
669}
489 670
490sub add { 671sub add {
491 my ($self, $x, $y, $chld) = @_; 672 my ($self, $x, $y, $chld) = @_;
492 my $old_chld = $self->{children}[$y][$x];
493 673
494 $self->{children}[$y][$x] = $chld; 674 $self->{children}[$y][$x] = $chld;
495 $chld->set_parent ($self); 675 $chld->set_parent ($self);
676
677 $self->{w} = $self->{h} = -1;
496 $self->update; 678 $self->update;
497} 679}
498 680
499sub max_row_height { 681sub get_wh {
500 my ($self, $row) = @_; 682 my ($self) = @_;
501 683
502 my $hs = 0; 684 my (@w, @h);
503 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 685
686 for my $y (0 .. $#{$self->{children}}) {
504 my $c = $self->{children}->[$row]->[$xi]; 687 my $row = $self->{children}[$y]
505 if ($c) { 688 or next;
689
690 for my $x (0 .. $#$row) {
691 my $widget = $row->[$x]
692 or next;
506 my ($w, $h) = $c->size_request; 693 my ($w, $h) = $widget->size_request;
507 if ($hs < $h) { $hs = $h } 694
695 $w[$x] = max $w[$x], $w;
696 $h[$y] = max $h[$y], $h;
508 } 697 }
509 } 698 }
510 return $hs;
511}
512 699
513sub max_col_width { 700 (\@w, \@h)
701}
702
703sub size_request {
514 my ($self, $col) = @_; 704 my ($self) = @_;
515 705
706 my ($ws, $hs) = $self->get_wh;
707
708 (
709 (sum @$ws),
710 (sum @$hs),
711 )
712}
713
714sub size_allocate {
715 my ($self, $x, $y, $w, $h) = @_;
716
717 $self->_size_allocate ($x, $y, $w, $h) or return;
718
719 my ($ws, $hs) = $self->get_wh;
720
721 my $req_w = sum @$ws;
722 my $req_h = sum @$hs;
723
724 # TODO: nicer code && do row_expand
725 my @col_expand = @{$self->{col_expand}};
726 @col_expand = (1) x @$ws unless @col_expand;
727 my $col_expand = (sum @col_expand) || 1;
728
729 # linearly scale sizes
730 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
731 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
732
733 my $y;
734
735 for my $r (0 .. $#{$self->{children}}) {
736 my $row = $self->{children}[$r]
737 or next;
738
516 my $ws = 0; 739 my $x = 0;
517 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 740 my $row_h = $hs->[$r];
518 my $c = ($self->{children}->[$yi] || [])->[$col]; 741
519 if ($c) { 742 for my $c (0 .. $#$row) {
520 my ($w, $h) = $c->size_request; 743 my $col_w = $ws->[$c];
521 if ($ws < $w) { $ws = $w } 744
745 if (my $widget = $row->[$c]) {
746 $widget->size_allocate ($x, $y, $col_w, $row_h);
747 }
748
749 $x += $col_w;
522 } 750 }
751
752 $y += $row_h;
523 } 753 }
524 return $ws; 754
525} 755}
756
757sub find_widget {
758 my ($self, $x, $y) = @_;
759
760 $x -= $self->{x};
761 $y -= $self->{y};
762
763 my $res;
764
765 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
766 $res = $_->find_widget ($x, $y)
767 and return $res;
768 }
769
770 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
771}
772
773sub _draw {
774 my ($self) = @_;
775
776 for (grep $_, @{$self->{children}}) {
777 $_->draw for grep $_, @$_;
778 }
779}
780
781#############################################################################
782
783package CFClient::UI::HBox;
784
785# TODO: wrap into common Box base class
786
787our @ISA = CFClient::UI::Container::;
526 788
527sub size_request { 789sub size_request {
528 my ($self) = @_; 790 my ($self) = @_;
529 791
792 my @alloc = map [$_->size_request], @{$self->{children}};
793
794 (
795 (List::Util::sum map $_->[0], @alloc),
796 (List::Util::max map $_->[1], @alloc),
797 )
798}
799
800sub size_allocate {
801 my ($self, $x, $y, $w, $h) = @_;
802
803 $self->_size_allocate ($x, $y, $w, $h);
804
530 my ($hs, $ws) = (0, 0); 805 ($h, $w) = ($w, $h);
531 806
532 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 807 my $children = $self->{children};
533 $hs += $self->max_row_height ($yi);
534 }
535 808
536 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 809 my @h = map +($_->size_request)[0], @$children;
537 my $wm = 0; 810
538 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 811 my $req_h = List::Util::sum @h;
539 $wm += $self->max_col_width ($xi) 812
813 if ($req_h > $h) {
814 # ah well, not enough space
815 $_ *= $h / $req_h for @h;
816 } else {
817 my $exp = List::Util::sum map $_->{expand}, @$children;
818 $exp ||= 1;
819
820 for (0 .. $#$children) {
821 my $child = $children->[$_];
822
823 my $alloc_h = $h[$_];
824 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
825 $h[$_] = $alloc_h;
540 } 826 }
541 if ($ws < $wm) { $ws = $wm }
542 } 827 }
543
544 return ($ws, $hs);
545}
546
547sub _draw {
548 my ($self) = @_;
549 828
550 my $y = 0; 829 my $y = 0;
551 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 830 for (0 .. $#$children) {
831 my $child = $children->[$_];
552 my $x = 0; 832 my $h = $h[$_];
833 $child->size_allocate ($y, 0, $h, $w);
553 834
554 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 835 $y += $h;
555
556 my $c = $self->{children}->[$yi]->[$xi];
557 if ($c) {
558 $c->move ($x, $y, 0); #TODO: Move to size_request
559 $c->draw if $c;
560 }
561
562 $x += $self->max_col_width ($xi);
563 }
564
565 $y += $self->max_row_height ($yi);
566 } 836 }
567} 837}
568 838
569############################################################################# 839#############################################################################
570 840
571package CFClient::Widget::VBox; 841package CFClient::UI::VBox;
572 842
843# TODO: wrap into common Box base class
844
573our @ISA = CFClient::Widget::Container::; 845our @ISA = CFClient::UI::Container::;
574
575use SDL::OpenGL;
576 846
577sub size_request { 847sub size_request {
578 my ($self) = @_; 848 my ($self) = @_;
579 849
580 my @alloc = map [$_->size_request], @{$self->{children}}; 850 my @alloc = map [$_->size_request], @{$self->{children}};
… …
584 (List::Util::sum map $_->[1], @alloc), 854 (List::Util::sum map $_->[1], @alloc),
585 ) 855 )
586} 856}
587 857
588sub size_allocate { 858sub size_allocate {
589 my ($self, $w, $h) = @_; 859 my ($self, $x, $y, $w, $h) = @_;
590 860
591 $self->w ($w); 861 $self->_size_allocate ($x, $y, $w, $h);
592 $self->h ($h);
593 862
594 my $exp; 863 my $children = $self->{children};
595 my @oth; 864
596 # find expand widget 865 my @h = map +($_->size_request)[1], @$children;
597 for (@{$self->{children}}) { 866
598 if ($_->{expand}) { 867 my $req_h = List::Util::sum @h;
868
869 if ($req_h > $h) {
870 # ah well, not enough space
871 $_ *= $h / $req_h for @h;
872 } else {
873 my $exp = List::Util::sum map $_->{expand}, @$children;
599 $exp = $_; 874 $exp ||= 1;
600 last; 875
876 for (0 .. $#$children) {
877 my $child = $children->[$_];
878
879 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
601 } 880 }
602 push @oth, $_;
603 }
604
605 my ($ow, $oh);
606
607 # get sizes of other widgets
608 for (@oth) {
609 my ($w, $h) = $_->size_request;
610 $oh += $h;
611 if ($ow < $w) { $ow = $w }
612 } 881 }
613 882
614 my $y = 0; 883 my $y = 0;
615 for (@{$self->{children}}) { 884 for (0 .. $#$children) {
616 $_->move (0, $y); 885 my $child = $children->[$_];
617 886 my $h = $h[$_];
618 if ($_ == $exp) {
619 $_->size_allocate ($w, $h - $oh);
620 $y += $h - $oh;
621 } else {
622 my ($cw, $h) = $_->size_request;
623 $_->size_allocate ($w, $h); 887 $child->size_allocate (0, $y, $w, $h);
888
624 $y += $h; 889 $y += $h;
625 }
626 } 890 }
627} 891}
628 892
629############################################################################# 893#############################################################################
630 894
631package CFClient::Widget::Label; 895package CFClient::UI::Label;
632 896
633our @ISA = CFClient::Widget::; 897our @ISA = CFClient::UI::Base::;
634 898
635use SDL::OpenGL; 899use SDL::OpenGL;
636 900
637sub new { 901sub new {
638 my ($class, $x, $y, $z, $height, $text) = @_; 902 my ($class, %arg) = @_;
639 903
640 $height ||= $::FONTSIZE;
641
642 # TODO: color, and make height, xyz etc. optional
643 my $self = $class->SUPER::new ( 904 my $self = $class->SUPER::new (
644 x => $x, 905 fg => [1, 1, 1],
645 y => $y, 906 height => $::FONTSIZE,
646 z => $z, 907 text => "",
647 height => $height, 908 align => -1,
909 padding => 2,
648 layout => new CFClient::Layout, 910 layout => new CFClient::Layout,
911 %arg
649 ); 912 );
650 913
651 $self->set_text ($text); 914 $self->set_text ($self->{text});
652 915
653 $self 916 $self
917}
918
919sub escape_text {
920 local $_ = $_[1];
921
922 s/&/&amp;/g;
923 s/>/&gt;/g;
924 s/</&lt;/g;
925
926 $_[1]
654} 927}
655 928
656sub set_text { 929sub set_text {
657 my ($self, $text) = @_; 930 my ($self, $text) = @_;
658 931
659 $self->{text} = $text; 932 $self->{text} = $text;
660 $self->{layout}->set_markup ($text); 933 $self->{layout}->set_markup ($text);
661 934
662 delete $self->{texture}; 935 delete $self->{texture};
936# $self->{w} = $self->{h} = -1;
937 $self->update;
663} 938}
664 939
665sub get_text { 940sub get_text {
666 my ($self, $text) = @_; 941 my ($self, $text) = @_;
667 942
… …
670 945
671sub size_request { 946sub size_request {
672 my ($self) = @_; 947 my ($self) = @_;
673 948
674 $self->{layout}->set_width; 949 $self->{layout}->set_width;
950 $self->{layout}->set_height ($self->{height});
675 $self->{layout}->size 951 my ($w, $h) = $self->{layout}->size;
676# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 952
677# ( 953 (
678# $self->{texture}{width}, 954 $w + $self->{padding} * 2,
679# $self->{texture}{height}, 955 $h + $self->{padding} * 2,
680# ) 956 )
681# } else {
682# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
683#
684# ($w, $h)
685# }
686} 957}
687 958
688sub size_allocate { 959sub size_allocate {
689 my ($self, $w, $h) = @_; 960 my ($self, $x, $y, $w, $h) = @_;
690 961
691 $self->SUPER::size_allocate ($w, $h); 962 $self->_size_allocate ($x, $y, $w, $h) or return;
963
692 delete $self->{texture}; 964 delete $self->{texture};
965}
966
967sub update {
968 my ($self) = @_;
969
970 delete $self->{texture};
971 $self->SUPER::update;
693} 972}
694 973
695sub _draw { 974sub _draw {
696 my ($self) = @_; 975 my ($self) = @_;
697 976
698 my $tex = $self->{texture} ||= do { 977 my $tex = $self->{texture} ||= do {
699 $self->{layout}->set_width ($self->{w}); 978 $self->{layout}->set_width ($self->{w});
979 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
700 new_from_layout CFClient::Texture $self->{layout}; 980 new_from_layout CFClient::Texture $self->{layout}
701 }; 981 };
982
983 glEnable GL_BLEND;
984 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
985 glEnable GL_TEXTURE_2D;
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
987
988 glColor @{$self->{fg}};
989
990 my $x =
991 $self->{align} < 0 ? $self->{padding}
992 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
993 : ($self->{w} - $tex->{w}) * 0.5;
994
995 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;
996 $tex->draw_quad (0, 0);
997
998 glDisable GL_TEXTURE_2D;
999 glDisable GL_BLEND;
1000}
1001
1002#############################################################################
1003
1004package CFClient::UI::Entry;
1005
1006our @ISA = CFClient::UI::Label::;
1007
1008use SDL;
1009use SDL::OpenGL;
1010
1011sub new {
1012 my $class = shift;
1013
1014 $class->SUPER::new (
1015 fg => [1, 1, 1],
1016 bg => [0, 0, 0, 0.2],
1017 active_bg => [1, 1, 1, 0.5],
1018 active_fg => [0, 0, 0],
1019 can_hover => 1,
1020 can_focus => 1,
1021 @_
1022 )
1023}
1024
1025sub _set_text {
1026 my ($self, $text) = @_;
1027
1028 $self->{last_activity} = $::NOW;
1029
1030 $self->{text} = $text;
1031 $self->{layout}->set_width ($self->{w});
1032 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1033
1034 $text =~ s/./*/g if $self->{hidden};
1035
1036 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1037
1038 $text = substr $text, 0, $self->{cursor};
1039 utf8::encode $text;
1040
1041 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1042}
1043
1044sub size_request {
1045 my ($self) = @_;
1046
1047 my ($w, $h) = $self->SUPER::size_request;
1048
1049 ($w + 1, $h) # add 1 for cursor
1050}
1051
1052sub size_allocate {
1053 my ($self, $x, $y, $w, $h) = @_;
1054
1055 $self->SUPER::size_allocate ($x, $y, $w, $h);
1056
1057 $self->_set_text ($self->{text});
1058}
1059
1060sub set_text {
1061 my ($self, $text) = @_;
1062
1063 $self->{cursor} = length $text;
1064 $self->_set_text ($text);
1065 $self->update;
1066}
1067
1068sub key_down {
1069 my ($self, $ev) = @_;
1070
1071 my $mod = $ev->key_mod;
1072 my $sym = $ev->key_sym;
1073
1074 my $uni = $ev->key_unicode;
1075
1076 my $text = $self->get_text;
1077
1078 if ($sym == SDLK_BACKSPACE) {
1079 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1080 } elsif ($sym == SDLK_DELETE) {
1081 substr $text, $self->{cursor}, 1, "";
1082 } elsif ($sym == SDLK_LEFT) {
1083 --$self->{cursor} if $self->{cursor};
1084 } elsif ($sym == SDLK_RIGHT) {
1085 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1086 } elsif ($sym == SDLK_HOME) {
1087 $self->{cursor} = 0;
1088 } elsif ($sym == SDLK_END) {
1089 $self->{cursor} = length $text;
1090 } elsif ($uni) {
1091 substr $text, $self->{cursor}++, 0, chr $uni;
1092 }
1093
1094 $self->_set_text ($text);
1095 $self->update;
1096}
1097
1098sub focus_in {
1099 my ($self) = @_;
1100
1101 $self->{last_activity} = $::NOW;
1102
1103 $self->SUPER::focus_in;
1104}
1105
1106sub button_down {
1107 my ($self, $ev, $x, $y) = @_;
1108
1109 $self->SUPER::button_down ($ev, $x, $y);
1110
1111 my $idx = $self->{layout}->xy_to_index ($x, $y);
1112
1113 # byte-index to char-index
1114 my $text = $self->{text};
1115 utf8::encode $text;
1116 $self->{cursor} = length substr $text, 0, $idx;
1117
1118 $self->_set_text ($self->{text});
1119 $self->update;
1120}
1121
1122sub mouse_motion {
1123 my ($self, $ev, $x, $y) = @_;
1124# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1125}
1126
1127sub _draw {
1128 my ($self) = @_;
1129
1130 local $self->{fg} = $self->{fg};
1131
1132 if ($FOCUS == $self) {
1133 glColor @{$self->{active_bg}};
1134 $self->{fg} = $self->{active_fg};
1135 } else {
1136 glColor @{$self->{bg}};
1137 }
1138
1139 glEnable GL_BLEND;
1140 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1141 glBegin GL_QUADS;
1142 glVertex 0 , 0;
1143 glVertex 0 , $self->{h};
1144 glVertex $self->{w}, $self->{h};
1145 glVertex $self->{w}, 0;
1146 glEnd;
1147 glDisable GL_BLEND;
1148
1149 $self->SUPER::_draw;
1150
1151 #TODO: force update every cursor change :(
1152 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1153 glColor @{$self->{fg}};
1154 glBegin GL_LINES;
1155 glVertex $self->{cur_x}, $self->{cur_y};
1156 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1157 glEnd;
1158 }
1159}
1160
1161#############################################################################
1162
1163package CFClient::UI::Button;
1164
1165our @ISA = CFClient::UI::Label::;
1166
1167use SDL;
1168use SDL::OpenGL;
1169
1170my @tex =
1171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1172 qw(b1_button_active.png);
1173
1174sub new {
1175 my $class = shift;
1176
1177 $class->SUPER::new (
1178 padding => 4,
1179 fg => [1, 1, 1],
1180 bg => [1, 1, 1, 0.2],
1181 active_fg => [1, 1, 0],
1182 can_hover => 1,
1183 @_
1184 )
1185}
1186
1187sub button_up {
1188 my ($self, $ev, $x, $y) = @_;
1189
1190 if ($x >= 0 && $x < $self->{w}
1191 && $y >= 0 && $y < $self->{h}) {
1192 $self->emit ("activate");
1193 }
1194}
1195
1196sub _draw {
1197 my ($self) = @_;
1198
1199 local $self->{fg} = $self->{fg};
1200 my $tex = $tex[0];
702 1201
703 glEnable GL_BLEND; 1202 glEnable GL_BLEND;
704 glEnable GL_TEXTURE_2D; 1203 glEnable GL_TEXTURE_2D;
705 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1205
1206 if ($GRAB == $self) {
1207 $self->{fg} = $self->{active_fg};
1208 }
1209
1210 glBindTexture GL_TEXTURE_2D, $tex->{name};
706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
707 1212
708 glColor 1, 0, 0, 1; # TODO color 1213 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
709 1214
710 $tex->draw_quad (0, 0); 1215 glDisable GL_TEXTURE_2D;
711
712 glDisable GL_BLEND; 1216 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D;
714}
715 1217
716############################################################################# 1218 $self->SUPER::_draw;
1219}
717 1220
718package CFClient::Widget::Entry; 1221#############################################################################
719 1222
1223package CFClient::UI::CheckBox;
1224
720our @ISA = CFClient::Widget::Label::; 1225our @ISA = CFClient::UI::DrawBG::;
721 1226
722use SDL; 1227use SDL;
723use SDL::OpenGL; 1228use SDL::OpenGL;
724 1229
725sub key_down { 1230sub new {
1231 my $class = shift;
1232
1233 $class->SUPER::new (
1234 padding => 2,
1235 fg => [1, 1, 1],
1236 active_fg => [1, 1, 0],
1237 state => 0,
1238 can_hover => 1,
1239 @_
1240 )
1241}
1242
1243sub size_request {
726 my ($self, $ev) = @_; 1244 my ($self) = @_;
727 1245
728 my $mod = $ev->key_mod; 1246 ($self->{padding} * 2 + 6) x 2
729 my $sym = $ev->key_sym; 1247}
730 1248
731 my $uni = $ev->key_unicode; 1249sub size_allocate {
1250 my ($self, $x, $y, $w, $h) = @_;
732 1251
733 my $text = $self->get_text; 1252 $self->_size_allocate ($x, $y, $w, $h);
734
735 if ($sym == SDLK_BACKSPACE) {
736 substr $text, -1, 1, '';
737 } elsif ($uni) {
738 $text .= chr $uni;
739 }
740
741 $self->set_text ($text);
742} 1253}
743 1254
744sub button_down { 1255sub button_down {
1256 my ($self, $ev, $x, $y) = @_;
1257
1258 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1259 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1260 $self->{state} = !$self->{state};
1261 $self->emit (changed => $self->{state});
1262 }
1263}
1264
1265sub _draw {
745 my ($self, $ev) = @_; 1266 my ($self) = @_;
746 1267
747 $self->focus_in; 1268 $self->SUPER::_draw;
1269
1270 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1271
1272 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1273
1274 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1275
1276 glBegin GL_LINE_LOOP;
1277 glVertex 0 , 0;
1278 glVertex 0 , $s;
1279 glVertex $s, $s;
1280 glVertex $s, 0;
1281 glEnd;
1282
1283 if ($self->{state}) {
1284 glBegin GL_LINES;
1285 glVertex 0 , 0;
1286 glVertex $s, $s;
1287 glVertex $s, 0;
1288 glVertex 0 , $s;
1289 glEnd;
1290 }
1291}
1292
1293#############################################################################
1294
1295package CFClient::UI::Slider;
1296
1297use strict;
1298
1299use SDL::OpenGL;
1300
1301our @ISA = CFClient::UI::DrawBG::;
1302
1303sub new {
1304 my $class = shift;
1305
1306 # range [value, low, high, page]
1307
1308 # TODO: 0-width page
1309 # TODO: req_w/h are wrong with vertical
1310 # TODO: calculations are off
1311 my $self = $class->SUPER::new (
1312 fg => [1, 1, 1],
1313 active_fg => [0, 0, 0],
1314 range => [0, 0, 100, 10],
1315 req_w => 40,
1316 req_h => 13,
1317 vertical => 0,
1318 can_hover => 1,
1319 @_
1320 );
1321
1322 $self
1323}
1324
1325sub size_request {
1326 my ($self) = @_;
1327
1328 my $w = $self->{req_w};
1329 my $h = $self->{req_h};
1330
1331 $self->{vertical} ? ($h, $w) : ($w, $h)
1332}
1333
1334sub button_down {
1335 my ($self, $ev, $x, $y) = @_;
1336
1337 $self->SUPER::button_down ($ev, $x, $y);
1338 $self->mouse_motion ($ev, $x, $y);
748} 1339}
749 1340
750sub mouse_motion { 1341sub mouse_motion {
751 my ($self, $ev, $x, $y) = @_; 1342 my ($self, $ev, $x, $y) = @_;
752 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1343
1344 if ($GRAB == $self) {
1345 my ($value, $lo, $hi, $page) = @{$self->{range}};
1346
1347 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1348
1349 $x = $x * ($hi - $lo) / $w + $lo;
1350 $x = $lo if $x < $lo;
1351 $x = $hi - $page if $x > $hi - $page;
1352 $self->{range}[0] = $x;
1353
1354 $self->emit (changed => $x);
1355 $self->update;
1356 }
753} 1357}
754 1358
755sub _draw { 1359sub _draw {
756 my ($self) = @_; 1360 my ($self) = @_;
757 1361
758 if ($FOCUS == $self) { 1362 $self->SUPER::_draw ();
759 glColor 1, 1, 1; 1363
760 } else { 1364 my ($w, $h) = @$self{qw(w h)};
761 glColor 0.7, 0.7, 0.7; 1365
1366 if ($self->{vertical}) {
1367 # draw a vertical slider like a rotated horizontal slider
1368
1369 glRotate 90, 0, 0, 1;
1370 glTranslate 0, -$self->{w}, 0;
1371
1372 ($w, $h) = ($h, $w);
762 } 1373 }
1374
1375 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1376 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1377
1378 my ($value, $lo, $hi, $page) = @{$self->{range}};
1379
1380 $page = int $page * $w / ($hi - $lo);
1381 $value = int +($value - $lo) * $w / ($hi - $lo);
1382
1383 $w -= $page;
1384 $page &= ~1;
1385 glTranslate $page * 0.5, 0, 0;
1386 $page ||= 2;
1387
1388 glColor @$fg;
1389 glBegin GL_LINES;
1390 glVertex 0, 0; glVertex 0, $h;
1391 glVertex $w - 1, 0; glVertex $w - 1, $h;
1392 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1393 glEnd;
1394
1395 my $knob_a = $value - $page * 0.5;
1396 my $knob_b = $value + $page * 0.5;
763 1397
764 glBegin GL_QUADS; 1398 glBegin GL_QUADS;
765 glVertex 0 , 0; 1399 glColor @$fg;
766 glVertex 0 , $self->{h} - 1; 1400 glVertex $knob_a, 0;
767 glVertex $self->{w} - 1, $self->{h} - 1; 1401 glVertex $knob_a, $h;
768 glVertex $self->{w} - 1, 0; 1402 glVertex $knob_b, $h;
1403 glVertex $knob_b, 0;
1404
1405 if ($knob_a < $knob_b - 2) {
1406 glColor @$bg;
1407 glVertex $knob_a + 1, 1;
1408 glVertex $knob_a + 1, $h - 1;
1409 glVertex $knob_b - 1, $h - 1;
1410 glVertex $knob_b - 1, 1;
1411 }
769 glEnd; 1412 glEnd;
770
771 $self->SUPER::_draw;
772} 1413}
773 1414
774############################################################################# 1415#############################################################################
775 1416
1417package CFClient::UI::TextView;
1418
1419our @ISA = CFClient::UI::HBox::;
1420
1421use SDL::OpenGL;
1422
1423sub new {
1424 my $class = shift;
1425
1426 my $self = $class->SUPER::new (
1427 par => [],
1428 @_,
1429 children => [
1430 (new CFClient::UI::Empty expand => 1),
1431 (new CFClient::UI::Slider vertical => 1),
1432 ],
1433 );
1434
1435 $self
1436}
1437
1438sub add_paragraph {
1439 my ($self, $color, $text) = @_;
1440
1441 push @{$self->{par}}, [$color, $text];
1442 my $count = scalar @{$self->{par}};
1443 $self->{children}[1]{range} = [$count - 1, 0, $count, 1];
1444 $self->{children}[1]->update;
1445}
1446
1447sub _draw {
1448 my ($self) = @_;
1449
1450 my $par = $self->{par};
1451
1452 my $bottom = (scalar @$par) - 1;
1453
1454 my $w = $self->{children}[0]{w};
1455 my $y = $self->{h};
1456
1457 glEnable GL_BLEND;
1458 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1459 glEnable GL_TEXTURE_2D;
1460 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1461
1462 # TODO: everything!
1463 while ($y > 0 && $bottom >= 0) {
1464 my $par = $par->[$bottom--];
1465
1466 my $layout = new CFClient::Layout;
1467
1468 $layout->set_height ($::FONTSIZE);
1469 $layout->set_width ($w);
1470 $layout->set_text ($par->[1]);
1471 my $tex = new_from_layout CFClient::Texture $layout;
1472 $y -= $tex->{h};
1473
1474 glColor @{ $par->[0] };
1475 $tex->draw_quad (0, $y);
1476 }
1477
1478 glDisable GL_TEXTURE_2D;
1479 glDisable GL_BLEND;
1480}
1481
1482#############################################################################
1483
776package CFClient::Widget::MapWidget; 1484package CFClient::UI::MapWidget;
777 1485
778use strict; 1486use strict;
779 1487
780use List::Util qw(min max); 1488use List::Util qw(min max);
781 1489
782use SDL; 1490use SDL;
783use SDL::OpenGL; 1491use SDL::OpenGL;
784use SDL::OpenGL::Constants;
785 1492
786our @ISA = CFClient::Widget::; 1493our @ISA = CFClient::UI::Base::;
1494
1495sub new {
1496 my $class = shift;
1497
1498 $class->SUPER::new (
1499 z => -1,
1500 can_focus => 1,
1501 list => (glGenLists 1),
1502 @_
1503 )
1504}
787 1505
788sub key_down { 1506sub key_down {
789 print "MAPKEYDOWN\n"; 1507 print "MAPKEYDOWN\n";
790} 1508}
791 1509
792sub key_up { 1510sub key_up {
793} 1511}
794 1512
795sub size_request { 1513sub size_request {
796 ( 1514 (
797 1 + int $::WIDTH / 32, 1515 1 + 32 * int $::WIDTH / 32,
798 1 + int $::HEIGHT / 32, 1516 1 + 32 * int $::HEIGHT / 32,
799 ) 1517 )
800} 1518}
801 1519
1520sub update {
1521 my ($self) = @_;
1522
1523 $self->{need_update} = 1;
1524 $self->SUPER::update;
1525}
1526
802sub _draw { 1527sub draw {
803 my ($self) = @_; 1528 my ($self) = @_;
804 1529
805 my $mx = $::CONN->{mapx}; 1530 $self->{need_update}++;#d#
806 my $my = $::CONN->{mapy}; 1531 if (delete $self->{need_update}) {
1532 glNewList $self->{list}, GL_COMPILE;
807 1533
808 my $map = $::CONN->{map};
809
810 my ($xofs, $yofs);
811
812 my $sw = 1 + int $::WIDTH / 32; 1534 my $sw = int $::WIDTH / 32;
813 my $sh = 1 + int $::HEIGHT / 32; 1535 my $sh = int $::HEIGHT / 32;
814 1536
815 if ($::CONN->{mapw} > $sw) { 1537 if ($::MAP) {
816 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1538 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
817 } else {
818 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
819 }
820 1539
821 if ($::CONN->{maph} > $sh) { 1540 if ($::CFG->{fow_enable}) {
822 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1541 if ($::CFG->{fow_smooth}) { # smooth fog of war
823 } else { 1542 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
824 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1543 glConvolutionFilter2D
825 } 1544 GL_CONVOLUTION_2D,
826 1545 GL_ALPHA,
827 glEnable GL_TEXTURE_2D; 1546 3, 3,
828 glEnable GL_BLEND; 1547 GL_ALPHA, GL_FLOAT,
829 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1548 pack "f*",
830 1549 0.1, 0.1, 0.1,
831 my $sw4 = ($sw + 3) & ~3; 1550 0.1, 0.2, 0.1,
832 my $darkness = "\x00" x ($sw4 * $sh); 1551 0.1, 0.1, 0.1,
833 1552 ;
834 for my $x (0 .. $sw - 1) { 1553 glEnable GL_CONVOLUTION_2D;
835 my $row = $map->[$x + $xofs];
836 for my $y (0 .. $sh - 1) {
837
838 my $cell = $row->[$y + $yofs]
839 or next;
840
841 my $dark = $cell->[0];
842 if ($dark < 0) {
843 substr $darkness, $y * $sw4 + $x, 1, chr 224;
844 } else {
845 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
846 }
847
848 for my $num (grep $_, @$cell[1,2,3]) {
849 my $tex = $::CONN->{face}[$num]{texture} || next;
850 1554 }
851 my $w = $tex->{width};
852 my $h = $tex->{height};
853 1555
854 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1556 my $tex = new CFClient::Texture
1557 w => $w,
1558 h => $h,
1559 data => $data,
1560 internalformat => GL_ALPHA,
1561 format => GL_ALPHA;
1562
1563 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1564
1565 glEnable GL_BLEND;
1566 glEnable GL_TEXTURE_2D;
1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1568
1569 glColor +($::CFG->{fow_intensity}) x 3, 1;
1570 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1571
1572 glDisable GL_TEXTURE_2D;
1573 glDisable GL_BLEND;
855 } 1574 }
856 } 1575 }
857 }
858 1576
859# if (1) { # higher quality darkness 1577 glEndList;
860# $lighting =~ s/(.)/$1$1$1/gs;
861# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
862#
863# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
864#
865# $lighting = $pb->get_pixels;
866# $lighting =~ s/(.)../$1/gs;
867# } 1578 }
868 1579
869 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1580 glCallList $self->{list};
870 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
871 1581
872 $darkness = new CFClient::Texture 1582 if ($FOCUS != $self) {
873 width => $sw4, 1583 glColor 64/255, 64/255, 64/255;
874 height => $sh, 1584 glLogicOp GL_AND;
875 data => $darkness, 1585 glEnable GL_COLOR_LOGIC_OP;
876 internalformat => GL_ALPHA, 1586 glBegin GL_QUADS;
877 format => GL_ALPHA; 1587 glVertex 0, 0;
878 1588 glVertex 0, $::HEIGHT;
879 glColor 0.45, 0.45, 0.45, 1; 1589 glVertex $::WIDTH, $::HEIGHT;
880 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32); 1590 glVertex $::WIDTH, 0;
881 1591 glEnd;
882 glDisable GL_TEXTURE_2D; 1592 glDisable GL_COLOR_LOGIC_OP;
883 glDisable GL_BLEND; 1593 }
884} 1594}
885 1595
886my %DIR = ( 1596my %DIR = (
887 SDLK_KP8, [1, "north"], 1597 SDLK_KP8, [1, "north"],
888 SDLK_KP9, [2, "northeast"], 1598 SDLK_KP9, [2, "northeast"],
… …
904 1614
905 my $mod = $ev->key_mod; 1615 my $mod = $ev->key_mod;
906 my $sym = $ev->key_sym; 1616 my $sym = $ev->key_sym;
907 1617
908 if ($sym == SDLK_KP5) { 1618 if ($sym == SDLK_KP5) {
909 $::CONN->send ("command stay fire"); 1619 $::CONN->user_send ("command stay fire");
1620 } elsif ($sym == SDLK_a) {
1621 $::CONN->user_send ("command apply");
910 } elsif (exists $DIR{$sym}) { 1622 } elsif (exists $DIR{$sym}) {
911 if ($mod & KMOD_SHIFT) { 1623 if ($mod & KMOD_SHIFT) {
912 $self->{shft}++; 1624 $self->{shft}++;
913 $::CONN->send ("command fire $DIR{$sym}[0]"); 1625 $::CONN->user_send ("command fire $DIR{$sym}[0]");
914 } elsif ($mod & KMOD_CTRL) { 1626 } elsif ($mod & KMOD_CTRL) {
915 $self->{ctrl}++; 1627 $self->{ctrl}++;
916 $::CONN->send ("command run $DIR{$sym}[0]"); 1628 $::CONN->user_send ("command run $DIR{$sym}[0]");
917 } else { 1629 } else {
918 $::CONN->send ("command $DIR{$sym}[1]"); 1630 $::CONN->user_send ("command $DIR{$sym}[1]");
919 } 1631 }
920 } 1632 }
921} 1633}
922 1634
923sub key_up { 1635sub key_up {
… …
925 1637
926 my $mod = $ev->key_mod; 1638 my $mod = $ev->key_mod;
927 my $sym = $ev->key_sym; 1639 my $sym = $ev->key_sym;
928 1640
929 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1641 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
930 $::CONN->send ("command fire_stop"); 1642 $::CONN->user_send ("command fire_stop");
931 } 1643 }
932 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1644 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
933 $::CONN->send ("command run_stop"); 1645 $::CONN->user_send ("command run_stop");
934 } 1646 }
935} 1647}
936 1648
937############################################################################# 1649#############################################################################
938 1650
939package CFClient::Widget::Animator; 1651package CFClient::UI::Animator;
940 1652
941use SDL::OpenGL; 1653use SDL::OpenGL;
942 1654
943our @ISA = CFClient::Widget::Bin::; 1655our @ISA = CFClient::UI::Bin::;
944 1656
945sub moveto { 1657sub moveto {
946 my ($self, $x, $y) = @_; 1658 my ($self, $x, $y) = @_;
947 1659
948 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1660 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
976 glPopMatrix; 1688 glPopMatrix;
977} 1689}
978 1690
979############################################################################# 1691#############################################################################
980 1692
1693package CFClient::UI::Flopper;
1694
1695our @ISA = CFClient::UI::Button::;
1696
1697sub new {
1698 my $class = shift;
1699
1700 my $self = $class->SUPER::new (
1701 state => 0,
1702 connect_activate => \&toggle_flopper,
1703 @_
1704 );
1705
1706 if ($self->{state}) {
1707 $self->{state} = 0;
1708 $self->toggle_flopper;
1709 }
1710
1711 $self
1712}
1713
1714sub toggle_flopper {
1715 my ($self) = @_;
1716
1717 # TODO: use animation
1718 if ($self->{state} = !$self->{state}) {
1719 $CFClient::UI::TOPLEVEL->add ($self->{other});
1720 $self->{other}->move (
1721 ($::WIDTH - $self->{other}{w}) * 0.5,
1722 ($::HEIGHT - $self->{other}{h}) * 0.5,
1723 );
1724 } else {
1725 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1726 }
1727}
1728
1729#############################################################################
1730
981package CFClient::Widget::Toplevel; 1731package CFClient::UI::Toplevel;
982 1732
983our @ISA = CFClient::Widget::Container::; 1733our @ISA = CFClient::UI::Container::;
984 1734
985sub size_request { 1735sub size_request {
986 ($::WIDTH, $::HEIGHT) 1736 ($::WIDTH, $::HEIGHT)
987} 1737}
988 1738
989sub size_allocate { 1739sub size_allocate {
990 my ($self, $w, $h) = @_; 1740 my ($self, $x, $y, $w, $h) = @_;
991 1741
992 $self->SUPER::size_allocate ($w, $h); 1742 $self->_size_allocate ($x, $y, $w, $h);
993 1743
994 $_->size_allocate ($_->size_request) 1744 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
995 for @{$self->{children}}; 1745 for @{$self->{children}};
996} 1746}
997 1747
998sub translate { 1748sub translate {
999 my ($self, $x, $y) = @_; 1749 my ($self, $x, $y) = @_;
… …
1002} 1752}
1003 1753
1004sub update { 1754sub update {
1005 my ($self) = @_; 1755 my ($self) = @_;
1006 1756
1007 $self->size_allocate ($self->size_request); 1757 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1008 ::refresh (); 1758 ::refresh ();
1009} 1759}
1010 1760
1011sub add { 1761sub add {
1012 my ($self, $widget) = @_; 1762 my ($self, $widget) = @_;
1013 1763
1014 $self->SUPER::add ($widget); 1764 $self->SUPER::add ($widget);
1015 1765
1016 $widget->size_allocate ($widget->size_request); 1766 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1017} 1767}
1018 1768
1019sub draw { 1769sub draw {
1020 my ($self) = @_; 1770 my ($self) = @_;
1021 1771
1022 $self->_draw; 1772 $self->_draw;
1023} 1773}
1024 1774
1025############################################################################# 1775#############################################################################
1026 1776
1027package CFClient::Widget; 1777package CFClient::UI;
1028 1778
1029$TOPLEVEL = new CFClient::Widget::Toplevel; 1779$TOPLEVEL = new CFClient::UI::Toplevel;
1030 1780
10311 17811
1032 1782

Diff Legend

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