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

Diff Legend

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