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

Diff Legend

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