Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

X11 clipboard support #5547

Merged
merged 6 commits into from Apr 21, 2015
Merged

X11 clipboard support #5547

merged 6 commits into from Apr 21, 2015

Conversation

@aweinstock314
Copy link
Contributor

aweinstock314 commented Apr 6, 2015

Manual re-opening of #5479 (since it seems that GitHub disables re-opening with the same number after a rebase).

Review on Reviewable

@hoppipolla-critic-bot
Copy link

hoppipolla-critic-bot commented Apr 6, 2015

Critic review: https://critic.hoppipolla.co.uk/r/4534

This is an external review system which you may optionally use for the code review of your pull request.

In order to help critic track your changes, please do not make in-place history rewrites (e.g. via git rebase -i or git commit --amend) when updating this pull request.

@jdm
Copy link
Member

jdm commented Apr 6, 2015

@bors-servo
Copy link
Contributor

bors-servo commented Apr 8, 2015

The latest upstream changes (presumably #5527) made this pull request unmergeable. Please resolve the merge conflicts.

@aweinstock314
Copy link
Contributor Author

aweinstock314 commented Apr 21, 2015

It looks like servo/rust-xlib#36 has gone unmerged for a while, and #5566 seems to imply that rust-xlib is unmaintained/in the process of being replaced. Should I revise this to depend on https://github.com/Daggerbot/x11-rs (and submit a PR to x11-rs to add the clipboard-related constants)?

@jdm
Copy link
Member

jdm commented Apr 21, 2015

Until we actually transition to using rust-xlib everywhere, I'm in favour of continuing to add to it. I didn't notice that servo/rust-xlib#36 was now working on Travis; I'm going to go ahead and merge it.

@jdm
Copy link
Member

jdm commented Apr 21, 2015

Go ahead and squash this while rebasing!

@aweinstock314 aweinstock314 force-pushed the aweinstock314:x11-clipboard branch from 6432aaf to a3bdd71 Apr 21, 2015
@jdm
Copy link
Member

jdm commented Apr 21, 2015

@bors-servo
Copy link
Contributor

bors-servo commented Apr 21, 2015

📌 Commit 8e45f2e has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Apr 21, 2015

Testing commit 8e45f2e with merge bfd4513...

bors-servo pushed a commit that referenced this pull request Apr 21, 2015
Manual re-opening of #5479 (since it seems that GitHub disables re-opening with the same number after a rebase).

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5547)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 21, 2015

💔 Test failed - linux1

@aweinstock314 aweinstock314 force-pushed the aweinstock314:x11-clipboard branch from f544fbe to 658927f Apr 21, 2015
@bors-servo
Copy link
Contributor

bors-servo commented Apr 21, 2015

Testing commit d4f7ec5 with merge 98f6939...

@bors-servo
Copy link
Contributor

bors-servo commented Apr 21, 2015

💔 Test failed - linux2

@jdm
Copy link
Member

jdm commented Apr 21, 2015

@bors-servo
Copy link
Contributor

bors-servo commented Apr 21, 2015

📌 Commit 2d110e7 has been approved by jdm

bors-servo pushed a commit that referenced this pull request Apr 21, 2015
Manual re-opening of #5479 (since it seems that GitHub disables re-opening with the same number after a rebase).

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5547)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 21, 2015

Testing commit 2d110e7 with merge 86d7462...

@bors-servo
Copy link
Contributor

bors-servo commented Apr 21, 2015

💔 Test failed - linux1

@jdm
Copy link
Member

jdm commented Apr 21, 2015

Whoops. test-unit is broken by these changes; we probably need an optional constellation channel instead.

…he signature expected by the unit tests.
@jdm

This comment has been minimized.

Copy link

jdm commented on components/script/textinput.rs in cf6aef5 Apr 21, 2015

Why not move this into the previous block and skip the mutable, optional binding?

@aweinstock314
Copy link
Contributor Author

aweinstock314 commented Apr 21, 2015

I tried that, it won't allow borrowing self (for self.insert_string) since cc is already borrowed.

@jdm
Copy link
Member

jdm commented Apr 21, 2015

@bors-servo
Copy link
Contributor

bors-servo commented Apr 21, 2015

📌 Commit cf6aef5 has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Apr 21, 2015

Testing commit cf6aef5 with merge 9974ebb...

bors-servo pushed a commit that referenced this pull request Apr 21, 2015
Manual re-opening of #5479 (since it seems that GitHub disables re-opening with the same number after a rebase).

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5547)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 21, 2015

☀️ Test successful - android, gonk, linux1, linux2, mac1, mac2

@bors-servo bors-servo merged commit cf6aef5 into servo:master Apr 21, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.