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.40 by root, Sun Apr 9 21:41:11 2006 UTC vs.
Revision 1.77 by root, Tue Apr 11 22:14:13 2006 UTC

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

Diff Legend

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